svn commit: r375556 - in head/print/transfig: . files

[Antoine Brodin]

Author: antoine
Date: Thu Dec 25 13:53:36 2014
New Revision: 375556
URL: https://svnweb.freebsd.org/changeset/ports/375556
QAT: https://qat.redports.org/buildarchive/r375556/

Log:
  Properly support png 1.5

Modified:
  head/print/transfig/Makefile
  head/print/transfig/files/patch-fig2dev_Imakefile
  head/print/transfig/files/patch-fig2dev_dev_Imakefile

Modified: head/print/transfig/Makefile
==============================================================================
--- head/print/transfig/Makefile	Thu Dec 25 13:49:11 2014	(r375555)
+++ head/print/transfig/Makefile	Thu Dec 25 13:53:36 2014	(r375556)
@@ -12,14 +12,13 @@ MAINTAINER=	pi at 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}" \

Modified: head/print/transfig/files/patch-fig2dev_Imakefile
==============================================================================
--- head/print/transfig/files/patch-fig2dev_Imakefile	Thu Dec 25 13:49:11 2014	(r375555)
+++ head/print/transfig/files/patch-fig2dev_Imakefile	Thu Dec 25 13:53:36 2014	(r375556)
@@ -26,7 +26,7 @@
 +PNGLIBDIR = ${LOCALBASE}/lib
  ZLIBDIR = $(USRLIBDIR)
 -PNGINC = -I/usr/include/X11
-+PNGINC = -I${LOCALBASE}/include/libpng
++PNGINC = -I${LOCALBASE}/include
  #endif
  
  XCOMM ****************

Modified: head/print/transfig/files/patch-fig2dev_dev_Imakefile
==============================================================================
--- head/print/transfig/files/patch-fig2dev_dev_Imakefile	Thu Dec 25 13:49:11 2014	(r375555)
+++ head/print/transfig/files/patch-fig2dev_dev_Imakefile	Thu Dec 25 13:53:36 2014	(r375556)
@@ -4,7 +4,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