summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorantoine <antoine@FreeBSD.org>2014-12-25 13:53:36 +0000
committerantoine <antoine@FreeBSD.org>2014-12-25 13:53:36 +0000
commit93296ade8aeaf1b0acea6a94c5cc883c464c92f9 (patch)
tree3e4b02f0af2eb97980f2f537f72879bdf02f5df7
parentc7949d14ec6b8d8da844c76376509e01b1415d48 (diff)
downloadFreeBSD-ports-93296ade8aeaf1b0acea6a94c5cc883c464c92f9.zip
FreeBSD-ports-93296ade8aeaf1b0acea6a94c5cc883c464c92f9.tar.gz
Properly support png 1.5
-rw-r--r--print/transfig/Makefile3
-rw-r--r--print/transfig/files/patch-fig2dev_Imakefile2
-rw-r--r--print/transfig/files/patch-fig2dev_dev_Imakefile2
3 files changed, 3 insertions, 4 deletions
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 00e4b3c..934b502 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -12,14 +12,13 @@ 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}" \
diff --git a/print/transfig/files/patch-fig2dev_Imakefile b/print/transfig/files/patch-fig2dev_Imakefile
index b9f1a4a..6a268d9 100644
--- a/print/transfig/files/patch-fig2dev_Imakefile
+++ b/print/transfig/files/patch-fig2dev_Imakefile
@@ -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 ****************
diff --git a/print/transfig/files/patch-fig2dev_dev_Imakefile b/print/transfig/files/patch-fig2dev_dev_Imakefile
index 7f1d9ef..b11e407 100644
--- a/print/transfig/files/patch-fig2dev_dev_Imakefile
+++ b/print/transfig/files/patch-fig2dev_dev_Imakefile
@@ -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
OpenPOWER on IntegriCloud