--- texlive-2007/texk/web2c/pdftexdir/Makefile.in.orig	2007-06-21 20:06:30.073669653 -0400
+++ texlive-2007/texk/web2c/pdftexdir/Makefile.in	2007-06-21 20:06:43.009584879 -0400
@@ -20,8 +20,8 @@
 LIBPNGDIR=../../../libs/libpng
 LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
 
-ZLIBDIR=../../../libs/zlib
-ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
+ZLIBDIR=
+ZLIBSRCDIR=
 
 LIBXPDFDIR=../../../libs/xpdf
 LIBXPDFSRCDIR=$(srcdir)/$(LIBXPDFDIR)
--- texlive-2007/texk/web2c/pdftexdir/ptexlib.h.orig	2007-06-21 20:07:37.746531903 -0400
+++ texlive-2007/texk/web2c/pdftexdir/ptexlib.h	2007-06-21 20:05:40.014606804 -0400
@@ -38,7 +38,9 @@
 /* avl */
 #  include "avlstuff.h"
 
+#ifndef __linux__
 #  include "openbsd-compat.h"
+#endif
 
 /* pdftexlib type declarations */
 typedef struct {
--- texlive-2007/texk/web2c/pdftexdir/epdf.h.orig	2007-06-21 22:27:08.039209770 -0400
+++ texlive-2007/texk/web2c/pdftexdir/epdf.h	2007-06-21 22:27:32.643343920 -0400
@@ -44,7 +44,9 @@
 
 #include <web2c/pdftexdir/ptexmac.h>
 
+#ifndef __linux__
 #include "openbsd-compat.h"
+#endif
 
 /* #-define pdfbufsize      pdfbufmax */
 
--- texlive-2007/texk/web2c/pdftexdir/pdftexlib.mk.orig	2007-06-21 22:35:56.779153576 -0400
+++ texlive-2007/texk/web2c/pdftexdir/pdftexlib.mk	2007-06-21 22:36:08.106453176 -0400
@@ -23,7 +23,7 @@
 LIBPNGDIR=../../libs/libpng
 LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
 LIBPNGDEP = @LIBPNGDEP@
-LDLIBPNG = @LDLIBPNG@
+LDLIBPNG = -lpng
 
 $(LIBPNGDIR)/libpng.a: $(LIBPNGSRCDIR)/*.c
 	cd $(LIBPNGDIR) && $(MAKE) $(common_makeargs) libpng.a
--- texlive-2007/texk/web2c/pdftexdir/utils.c.orig	2007-06-22 00:33:15.216284121 -0400
+++ texlive-2007/texk/web2c/pdftexdir/utils.c	2007-06-22 00:33:32.948057443 -0400
@@ -20,7 +20,9 @@
 $Id: //depot/Build/source.development/TeX/texk/web2c/pdftexdir/utils.c#24 $
 */
 
+#ifndef __linux__
 #include "openbsd-compat.h"
+#endif
 #ifdef HAVE_ASPRINTF            /* asprintf is not defined in openbsd-compat.h, but in stdio.h */
 #  include <stdio.h>
 #endif
--- texlive-2007/texk/web2c/pdftexdir/pdftex.mk.orig	2007-08-04 10:13:10.000000000 +0200
+++ texlive-2007/texk/web2c/pdftexdir/pdftex.mk	2007-08-04 10:14:24.000000000 +0200
@@ -32,7 +32,7 @@
 
 # Making pdftex
 pdftex: pdftexd.h $(pdftex_o) $(pdftexextra_o) $(pdftexlibsdep)
-	@CXXHACKLINK@ $(pdftex_o) $(pdftexextra_o) $(pdftexlibs) $(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@ $(ADDLDFLAGS)
+	@CXXHACKLINK@ $(pdftex_o) $(pdftexextra_o) $(pdftexlibs) $(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@ $(ADDLDFLAGS) -lpng
 
 # C file dependencies.
 $(pdftex_c) pdftexcoerce.h pdftexd.h: pdftex.p $(web2c_texmf) $(srcdir)/$(pdftexdir)/pdftex.defines $(srcdir)/$(pdftexdir)/pdftex.h