Index: head/print/transfig/Makefile
===================================================================
--- head/print/transfig/Makefile	(revision 375555)
+++ head/print/transfig/Makefile	(revision 375556)
@@ -1,40 +1,39 @@
 # Created by: chuckr@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	transfig
 PORTVERSION=	3.2.5e
 PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	SF/mcj/mcj-source/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Tools to convert Xfig .fig files
 
 RUN_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm
-LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
 USES=		alias imake
 CFLAGS+=	-Wno-return-type
 USE_GHOSTSCRIPT_RUN=	yes
 USE_XORG=	xpm
 
-CFLAGS+=	-I${LOCALBASE}/include/libpng15
 MAKE_ARGS+=	INSTALLFLAGS="${COPY}" \
 		INSTPGMFLAGS="${STRIP} ${_BINOWNGRP} -m ${BINMODE}" \
 		INSTBINFLAGS="${_BINOWNGRP} -m ${BINMODE}" \
 		INSTDATFLAGS="${_SHROWNGRP} -m ${SHAREMODE}" \
 		INSTMANFLAGS="${_MANOWNGRP} -m ${MANMODE}"
 
 post-install:
 	for i in hr_HR hu_HU pl_PL ro_RO; do \
 		${LN} -sf cs_CZ.ps ${STAGEDIR}${PREFIX}/lib/X11/fig2dev/$${i}.ps; \
 	done
 	for i in ja ja_JP.EUC ja_JP.eucJP ja_JP ja_JP.ujis ; do \
 		${LN} -sf japanese.ps ${STAGEDIR}${PREFIX}/lib/X11/fig2dev/$${i}.ps; \
 	done
 	for i in ko ko_KR.EUC ko_KR.eucKR ko_KR ko_KR.ujis; do \
 		${LN} -sf korean.ps ${STAGEDIR}${PREFIX}/lib/X11/fig2dev/$${i}.ps; \
 	done
 
 .include <bsd.port.mk>
Index: head/print/transfig/files/patch-fig2dev_Imakefile
===================================================================
--- head/print/transfig/files/patch-fig2dev_Imakefile	(revision 375555)
+++ head/print/transfig/files/patch-fig2dev_Imakefile	(revision 375556)
@@ -1,71 +1,71 @@
 --- fig2dev/Imakefile.orig	Thu Oct 27 09:56:02 2005
 +++ fig2dev/Imakefile
 @@ -34,7 +34,7 @@
  XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled
  XCOMM and installed xfig.
  
 -XFIGLIBDIR =	/usr/local/lib/X11/xfig
 +XFIGLIBDIR =	$(LIBDIR)/xfig
  
  XCOMM ******
  XCOMM If your system doesn't have the strerror() function (has sys_errlist) then
 @@ -53,7 +53,7 @@
  XCOMM inline functions. With the "INLINE" keyword, you should notice that
  XCOMM the display will be a bit faster in complex figures
  
 -XCOMM USEINLINE = -DUSE_INLINE
 +USEINLINE = -DUSE_INLINE
  
  XCOMM ****************
  XCOMM Change RGB if necessary, to point to your rgb.txt color database
 @@ -74,9 +74,9 @@
  XCOMM file are in different places
  
  #ifdef USEPNG
 -PNGLIBDIR = $(USRLIBDIR)
 +PNGLIBDIR = ${LOCALBASE}/lib
  ZLIBDIR = $(USRLIBDIR)
 -PNGINC = -I/usr/include/X11
-+PNGINC = -I${LOCALBASE}/include/libpng
++PNGINC = -I${LOCALBASE}/include
  #endif
  
  XCOMM ****************
 @@ -92,7 +92,7 @@
  
  #ifdef USEXPM
  XPMLIBDIR = $(USRLIBDIR)
 -XPMINC = -I/usr/include/X11
 +XPMINC = -I$(INCDIR)/X11
  #endif
  
  XCOMM ****************
 @@ -141,7 +141,7 @@
  
  #ifdef I18N
  I18N_DEFS = -DI18N 
 -FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
 +FIG2DEV_LIBDIR = $(LIBDIR)/fig2dev
  I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=$(FIG2DEV_LIBDIR) -DFIG2DEV_LIBDIR_STR=\\\"$(FIG2DEV_LIBDIR)\\\"
  
  #endif /* I18N */
 @@ -188,11 +188,7 @@
  INCLUDES = -I..
  
  LOCAL_LIBRARIES = $(LIBTRANSFIG)
 -#if defined(NetBSDArchitecture) || defined(FreeBSDArchitecture)
 -SYS_LIBRARIES = $(PNGLIBS) $(XPMLIBS) -lm -lcompat
 -#else
  SYS_LIBRARIES = $(PNGLIBS) $(XPMLIBS) -lm
 -#endif
  DEPLIBS = $(LIBTRANSFIG)
  
  #if !(defined(SunOSPlatform) && (OSMajorVersion>=5))
 @@ -229,7 +225,7 @@
  	else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR)/bitmaps ); fi ; \
  	echo Copying bitmap files for tk to $(DESTDIR)$(XFIGLIBDIR)/bitmaps ; \
  	for f in * ; do \
 -	      $(INSTALL) -c $$f $(DESTDIR)$(XFIGLIBDIR)/bitmaps ; \
 +	      $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) $$f $(DESTDIR)$(XFIGLIBDIR)/bitmaps ; \
  	done) ; 
  
  install.all::
Index: head/print/transfig/files/patch-fig2dev_dev_Imakefile
===================================================================
--- head/print/transfig/files/patch-fig2dev_dev_Imakefile	(revision 375555)
+++ head/print/transfig/files/patch-fig2dev_dev_Imakefile	(revision 375556)
@@ -1,10 +1,10 @@
 --- fig2dev/dev/Imakefile.orig	Tue Sep 30 08:48:08 2003
 +++ fig2dev/dev/Imakefile
 @@ -23,6 +23,7 @@
  #ifdef USE_PNG
  READPNGS=readpng.c
  READPNGO=readpng.o
-+DEPEND_DEFINES=-I${LOCALBASE}/include/libpng DependDefines
++DEPEND_DEFINES=-I${LOCALBASE}/include DependDefines
  #endif
  
  #ifdef USE_XPM