Create ${WRKSRC} --> ${WRKDIR}/libpng sysmlink and use it in ghostscript ports

instead of hardcoded ${WRKSRC}/libpng-png.version.number.

5 files changed, 8 insertions, 7 deletions

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 0e3a9046f332..367e46fe9e16 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -5,8 +5,6 @@
 #
 # $FreeBSD$
 #
-# PLEASE update print/ghostscript5 (there's a symlink that uses a hardwired
-# png version number) when updating this port.  Thank you.
 
 PORTNAME=	png
 PORTVERSION=    1.0.8
@@ -36,8 +34,11 @@ MAN5=           png.5
 MAKE_ENV+=	USE_MMX=yes
 .endif
 
-.if !defined(WITH_MMX) && (${ARCH} == "i386")
 post-extract:
+# Please don't delete the following line - this link used by ghostscript* ports
+	@${LN} -sf ${WRKSRC} ${WRKDIR}/libpng
+#
+.if !defined(WITH_MMX) && (${ARCH} == "i386")
 	@${ECHO_MSG}
 	@${ECHO_MSG} " If you have a CPU with MMX instruction set (Pentium/P55C and higher) you can"
 	@${ECHO_MSG} " try to add \"-DWITH_MMX\" to build libpng with MMX-optimized assembler routines."
diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index 3b009132e9fc..016ebd6893d5 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -55,7 +55,7 @@ pre-fetch:
 
 post-extract:
 	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b ${WRKSRC}/jpeg
-	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/png/work/libpng-* ${WRKSRC}/libpng
+	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/png/work/libpng ${WRKSRC}/libpng
 	${MV} ${WRKSRC}/devs.mak ${WRKSRC}/devs.mak.bak
 	cd ${WRKSRC} && unzip -Lao ${DISTDIR}/${HP850_DRV}
 	${MV} ${WRKSRC}/devs.mak.bak ${WRKSRC}/devs.mak
diff --git a/print/ghostscript5/Makefile b/print/ghostscript5/Makefile
index 92e6e52b858b..234a2e97175e 100644
--- a/print/ghostscript5/Makefile
+++ b/print/ghostscript5/Makefile
@@ -36,7 +36,7 @@ PCL3_DRV=	hpdj-2.6.tar.gz
 
 post-extract:
 	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b ${WRKSRC}/jpeg
-	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/png/work/libpng-1.0.7 ${WRKSRC}/libpng
+	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/png/work/libpng ${WRKSRC}/libpng
 	# additional PCL3  driver
 	@${TAR} -xf ${WRKDIR}/hpdj-2.6/hpdj.tar -C ${WRKSRC}
 	@${CAT} ${WRKSRC}/devs.mak-5.10.add >> ${WRKSRC}/devs.mak
diff --git a/print/ghostscript55/Makefile b/print/ghostscript55/Makefile
index 3b009132e9fc..016ebd6893d5 100644
--- a/print/ghostscript55/Makefile
+++ b/print/ghostscript55/Makefile
@@ -55,7 +55,7 @@ pre-fetch:
 
 post-extract:
 	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b ${WRKSRC}/jpeg
-	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/png/work/libpng-* ${WRKSRC}/libpng
+	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/png/work/libpng ${WRKSRC}/libpng
 	${MV} ${WRKSRC}/devs.mak ${WRKSRC}/devs.mak.bak
 	cd ${WRKSRC} && unzip -Lao ${DISTDIR}/${HP850_DRV}
 	${MV} ${WRKSRC}/devs.mak.bak ${WRKSRC}/devs.mak
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 3b009132e9fc..016ebd6893d5 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -55,7 +55,7 @@ pre-fetch:
 
 post-extract:
 	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b ${WRKSRC}/jpeg
-	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/png/work/libpng-* ${WRKSRC}/libpng
+	${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/png/work/libpng ${WRKSRC}/libpng
 	${MV} ${WRKSRC}/devs.mak ${WRKSRC}/devs.mak.bak
 	cd ${WRKSRC} && unzip -Lao ${DISTDIR}/${HP850_DRV}
 	${MV} ${WRKSRC}/devs.mak.bak ${WRKSRC}/devs.mak