Index: head/graphics/png/Makefile
===================================================================
--- head/graphics/png/Makefile	(revision 31040)
+++ head/graphics/png/Makefile	(revision 31041)
@@ -1,50 +1,51 @@
 # New ports collection makefile for:    PNG images library
 # ftp://ftp.libpng.org/pub/png/libpng.html
 # Date created:         5 Dec 1995
 # Whom:                 ache
 #
 # $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
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.libpng.org/pub/png/src/ \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lib${PORTNAME}
 DISTNAME=       lib${PKGNAME}
 
 PATCH_SITES=    ftp://ftp.libpng.org/pub/png/src/
 #PATCHFILES=
 
 MAINTAINER=     ache@FreeBSD.org
 
 INSTALLS_SHLIB=	yes
 SHLIB_VER=	4
 
 MAKE_ENV=	SHLIB_VER="${SHLIB_VER}"
 PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
 
 MAN3=           libpng.3 libpngpf.3
 MAN5=           png.5
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_MMX) && (${ARCH} == "i386")
 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."
 	@${ECHO_MSG}
 .endif
 
 do-configure:
 	${LN} -sf ${WRKSRC}/scripts/makefile.std ${WRKSRC}/Makefile
 
 .include <bsd.port.post.mk>

Property changes on: head/graphics/png/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.30
\ No newline at end of property
+1.31
\ No newline at end of property
Index: head/print/ghostscript-gnu/Makefile
===================================================================
--- head/print/ghostscript-gnu/Makefile	(revision 31040)
+++ head/print/ghostscript-gnu/Makefile	(revision 31041)
@@ -1,100 +1,100 @@
 # New ports collection makefile for:	ghostscript
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ghostscript
 PORTVERSION=	5.50
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
 		http://www.erdw.ethz.ch/~bonk/ftp/gs-driver-distrib/ \
 		http://www.ozemail.com.au/~geoffk/pdfencrypt/
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
 		${HP850_DRV} ${DECRYPT_PDF}
 
 MAINTAINER=	andreas@FreeBSD.org
 
 Y2K=		http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
 
 BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/graphics/jpeg:extract \
 		/nonexistent:${PORTSDIR}/graphics/png:extract \
 		unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 
 USE_XLIB=	yes
 EXTRACT_ONLY=	${GS_SOURCES}
 WRKSRC=		${WRKDIR}/gs5.50
 USE_GMAKE=	yes
 MAKEFILE=	unix-gcc.mak
 MAN1=		gs.1 pdf2dsc.1 pdf2ps.1 ps2ascii.1 ps2epsi.1 ps2pdf.1 ps2ps.1
 
 GS_SOURCES=	ghostscript-5.50.tar.gz
 GS_SOURCES+=	ghostscript-5.50gnu.tar.gz
 #  Note: the following two are real files that have symlinks with
 #  later version numbers pointing to them.  To avoid unnecessarily
 #  downloading distfiles, do not change these when upgrading the port
 #  unless the files really change.
 GS_FONTS_STD=	ghostscript-fonts-std-5.50.tar.gz
 GS_FONTS_OTHER=	ghostscript-fonts-other-5.50.tar.gz
 
 # Additional driver HP 850, see http://www.erdw.ethz.ch/~bonk/hp850/hp850.html
 HP850_DRV=	hp8xxs13.zip
 
 .if defined(A4)
 CFLAGS+=	-DA4
 .endif
 
 pre-fetch:
 .if !defined(A4)
 	@${ECHO_MSG} "Type \"make A4=yes\" if you want -DA4 for compilation."
 .else
 	@${ECHO_MSG} "Using -DA4 for compilation."
 .endif
 
 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
 
 do-configure:
 .if defined(BATCH)
 	@${SETENV} WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/configure.batch
 .else
 	@${SETENV} WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/configure
 .endif
 
 pre-build:
 	${MKDIR} ${WRKSRC}/obj
 
 pre-install:
 	@${MKDIR} ${PREFIX}/share/ghostscript ${PREFIX}/bin ${PREFIX}/man/man1
 	(cd ${PREFIX}/share/ghostscript ; \
 			${TAR} -xzf ${DISTDIR}/${GS_FONTS_STD})
 	(cd ${PREFIX}/share/ghostscript/fonts ; \
 			${TAR} -xzf ${DISTDIR}/${GS_FONTS_OTHER})
 
 # install the readme and license file of the hp8xxx driver as well
 post-install:
 	strip ${PREFIX}/bin/gs
 	${INSTALL_SCRIPT} ${WRKSRC}/unix-lpr.sh ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/lprsetup.sh ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/license.hp8 \
 		${PREFIX}/share/ghostscript/5.50/doc
 	${INSTALL_DATA} ${WRKSRC}/readme.hp8 \
 		${PREFIX}/share/ghostscript/5.50/doc
 .if defined(PDFENCRYPT)
 	${INSTALL_DATA} ${DISTDIR}/pdf_sec.ps ${PREFIX}/share/ghostscript/5.50
 .endif
 
 # encrypted PDF support.  can't be packaged due to export control issues.
 .if defined(PDFENCRYPT)
 MASTER_SITES+=	http://www.ozemail.com.au/~geoffk/pdfencrypt/
 DISTFILES+=	pdf_sec.ps
 RESTRICTED=	"Crypto; export controlled, RC4 in PostScript code included"
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/print/ghostscript-gnu/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.43
\ No newline at end of property
+1.44
\ No newline at end of property
Index: head/print/ghostscript5/Makefile
===================================================================
--- head/print/ghostscript5/Makefile	(revision 31040)
+++ head/print/ghostscript5/Makefile	(revision 31041)
@@ -1,65 +1,65 @@
 # New ports collection makefile for:	ghostscript
 # Date created:		11 December 1998
 # Whom:			giffunip
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ghostscript
 PORTVERSION=	5.10
 CATEGORIES=	print
 MASTER_SITES= ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/ \
 		${MASTER_SITE_GNU} \
 		ftp://ftp.cs.wisc.edu/ghost/gnu/gs510/
 MASTER_SITE_SUBDIR=	ghostscript
 DISTFILES=	${GS_SOURCES} ${PCL3_DRV}
 
 MAINTAINER=	ports@FreeBSD.org
 
 RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/Fontmap:${PORTSDIR}/print/gsfonts
 BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/graphics/jpeg:extract \
 		/nonexistent:${PORTSDIR}/graphics/png:extract
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 
 USE_XLIB=	yes
 EXTRACT_ONLY=	${GS_SOURCES} ${PCL3_DRV}
 WRKSRC=		${WRKDIR}/gs5.10
 
 MAKEFILE=	unix-gcc.mak
 MAKE_FLAGS=	prefix=${PREFIX} CFLAGS="${CFLAGS}" -f
 MAN1=		gs.1 pdf2dsc.1 pdf2ps.1 ps2ascii.1 ps2epsi.1 ps2pdf.1 gs-hpdj.1
 
 GS_SOURCES=	ghostscript-5.10.tar.gz
 
 # Additional driver for HP PCL3 Printers
 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
 	@${PATCH} -d ${WRKSRC} --forward --quiet -E < ${WRKSRC}/zmedia2.c-5.10.diff
 
 do-configure:
 	@(cd ${WRKSRC}; ${SH} tar_cat )
 
 post-install:
 	@strip ${PREFIX}/bin/gs
 	@${MKDIR} ${PREFIX}/libexec/lpr
 	${INSTALL_SCRIPT} ${WRKSRC}/pj-gs.sh ${PREFIX}/libexec/lpr
 	${INSTALL_SCRIPT} ${WRKSRC}/sysvlp.sh ${PREFIX}/libexec/lpr
 	${INSTALL_SCRIPT} ${WRKSRC}/if-hpdj ${PREFIX}/libexec/lpr
 .if defined(PDFENCRYPT)
 	${INSTALL_DATA} ${DISTDIR}/pdf_sec.ps ${PREFIX}/share/ghostscript/5.10
 .endif
 
 # encrypted PDF support.  can't be packaged due to export control issues.
 .if defined(PDFENCRYPT)
 MASTER_SITES+=  http://www.ozemail.com.au/~geoffk/pdfencrypt/
 DISTFILES+=     pdf_sec.ps
 RESTRICTED=     "Crypto; export controlled, RC4 in PostScript code included"
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/print/ghostscript5/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.42
\ No newline at end of property
+1.43
\ No newline at end of property
Index: head/print/ghostscript55/Makefile
===================================================================
--- head/print/ghostscript55/Makefile	(revision 31040)
+++ head/print/ghostscript55/Makefile	(revision 31041)
@@ -1,100 +1,100 @@
 # New ports collection makefile for:	ghostscript
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ghostscript
 PORTVERSION=	5.50
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
 		http://www.erdw.ethz.ch/~bonk/ftp/gs-driver-distrib/ \
 		http://www.ozemail.com.au/~geoffk/pdfencrypt/
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
 		${HP850_DRV} ${DECRYPT_PDF}
 
 MAINTAINER=	andreas@FreeBSD.org
 
 Y2K=		http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
 
 BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/graphics/jpeg:extract \
 		/nonexistent:${PORTSDIR}/graphics/png:extract \
 		unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 
 USE_XLIB=	yes
 EXTRACT_ONLY=	${GS_SOURCES}
 WRKSRC=		${WRKDIR}/gs5.50
 USE_GMAKE=	yes
 MAKEFILE=	unix-gcc.mak
 MAN1=		gs.1 pdf2dsc.1 pdf2ps.1 ps2ascii.1 ps2epsi.1 ps2pdf.1 ps2ps.1
 
 GS_SOURCES=	ghostscript-5.50.tar.gz
 GS_SOURCES+=	ghostscript-5.50gnu.tar.gz
 #  Note: the following two are real files that have symlinks with
 #  later version numbers pointing to them.  To avoid unnecessarily
 #  downloading distfiles, do not change these when upgrading the port
 #  unless the files really change.
 GS_FONTS_STD=	ghostscript-fonts-std-5.50.tar.gz
 GS_FONTS_OTHER=	ghostscript-fonts-other-5.50.tar.gz
 
 # Additional driver HP 850, see http://www.erdw.ethz.ch/~bonk/hp850/hp850.html
 HP850_DRV=	hp8xxs13.zip
 
 .if defined(A4)
 CFLAGS+=	-DA4
 .endif
 
 pre-fetch:
 .if !defined(A4)
 	@${ECHO_MSG} "Type \"make A4=yes\" if you want -DA4 for compilation."
 .else
 	@${ECHO_MSG} "Using -DA4 for compilation."
 .endif
 
 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
 
 do-configure:
 .if defined(BATCH)
 	@${SETENV} WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/configure.batch
 .else
 	@${SETENV} WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/configure
 .endif
 
 pre-build:
 	${MKDIR} ${WRKSRC}/obj
 
 pre-install:
 	@${MKDIR} ${PREFIX}/share/ghostscript ${PREFIX}/bin ${PREFIX}/man/man1
 	(cd ${PREFIX}/share/ghostscript ; \
 			${TAR} -xzf ${DISTDIR}/${GS_FONTS_STD})
 	(cd ${PREFIX}/share/ghostscript/fonts ; \
 			${TAR} -xzf ${DISTDIR}/${GS_FONTS_OTHER})
 
 # install the readme and license file of the hp8xxx driver as well
 post-install:
 	strip ${PREFIX}/bin/gs
 	${INSTALL_SCRIPT} ${WRKSRC}/unix-lpr.sh ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/lprsetup.sh ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/license.hp8 \
 		${PREFIX}/share/ghostscript/5.50/doc
 	${INSTALL_DATA} ${WRKSRC}/readme.hp8 \
 		${PREFIX}/share/ghostscript/5.50/doc
 .if defined(PDFENCRYPT)
 	${INSTALL_DATA} ${DISTDIR}/pdf_sec.ps ${PREFIX}/share/ghostscript/5.50
 .endif
 
 # encrypted PDF support.  can't be packaged due to export control issues.
 .if defined(PDFENCRYPT)
 MASTER_SITES+=	http://www.ozemail.com.au/~geoffk/pdfencrypt/
 DISTFILES+=	pdf_sec.ps
 RESTRICTED=	"Crypto; export controlled, RC4 in PostScript code included"
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/print/ghostscript55/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.43
\ No newline at end of property
+1.44
\ No newline at end of property
Index: head/print/ghostscript7/Makefile
===================================================================
--- head/print/ghostscript7/Makefile	(revision 31040)
+++ head/print/ghostscript7/Makefile	(revision 31041)
@@ -1,100 +1,100 @@
 # New ports collection makefile for:	ghostscript
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ghostscript
 PORTVERSION=	5.50
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
 		http://www.erdw.ethz.ch/~bonk/ftp/gs-driver-distrib/ \
 		http://www.ozemail.com.au/~geoffk/pdfencrypt/
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
 		${HP850_DRV} ${DECRYPT_PDF}
 
 MAINTAINER=	andreas@FreeBSD.org
 
 Y2K=		http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
 
 BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/graphics/jpeg:extract \
 		/nonexistent:${PORTSDIR}/graphics/png:extract \
 		unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 
 USE_XLIB=	yes
 EXTRACT_ONLY=	${GS_SOURCES}
 WRKSRC=		${WRKDIR}/gs5.50
 USE_GMAKE=	yes
 MAKEFILE=	unix-gcc.mak
 MAN1=		gs.1 pdf2dsc.1 pdf2ps.1 ps2ascii.1 ps2epsi.1 ps2pdf.1 ps2ps.1
 
 GS_SOURCES=	ghostscript-5.50.tar.gz
 GS_SOURCES+=	ghostscript-5.50gnu.tar.gz
 #  Note: the following two are real files that have symlinks with
 #  later version numbers pointing to them.  To avoid unnecessarily
 #  downloading distfiles, do not change these when upgrading the port
 #  unless the files really change.
 GS_FONTS_STD=	ghostscript-fonts-std-5.50.tar.gz
 GS_FONTS_OTHER=	ghostscript-fonts-other-5.50.tar.gz
 
 # Additional driver HP 850, see http://www.erdw.ethz.ch/~bonk/hp850/hp850.html
 HP850_DRV=	hp8xxs13.zip
 
 .if defined(A4)
 CFLAGS+=	-DA4
 .endif
 
 pre-fetch:
 .if !defined(A4)
 	@${ECHO_MSG} "Type \"make A4=yes\" if you want -DA4 for compilation."
 .else
 	@${ECHO_MSG} "Using -DA4 for compilation."
 .endif
 
 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
 
 do-configure:
 .if defined(BATCH)
 	@${SETENV} WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/configure.batch
 .else
 	@${SETENV} WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/configure
 .endif
 
 pre-build:
 	${MKDIR} ${WRKSRC}/obj
 
 pre-install:
 	@${MKDIR} ${PREFIX}/share/ghostscript ${PREFIX}/bin ${PREFIX}/man/man1
 	(cd ${PREFIX}/share/ghostscript ; \
 			${TAR} -xzf ${DISTDIR}/${GS_FONTS_STD})
 	(cd ${PREFIX}/share/ghostscript/fonts ; \
 			${TAR} -xzf ${DISTDIR}/${GS_FONTS_OTHER})
 
 # install the readme and license file of the hp8xxx driver as well
 post-install:
 	strip ${PREFIX}/bin/gs
 	${INSTALL_SCRIPT} ${WRKSRC}/unix-lpr.sh ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/lprsetup.sh ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/license.hp8 \
 		${PREFIX}/share/ghostscript/5.50/doc
 	${INSTALL_DATA} ${WRKSRC}/readme.hp8 \
 		${PREFIX}/share/ghostscript/5.50/doc
 .if defined(PDFENCRYPT)
 	${INSTALL_DATA} ${DISTDIR}/pdf_sec.ps ${PREFIX}/share/ghostscript/5.50
 .endif
 
 # encrypted PDF support.  can't be packaged due to export control issues.
 .if defined(PDFENCRYPT)
 MASTER_SITES+=	http://www.ozemail.com.au/~geoffk/pdfencrypt/
 DISTFILES+=	pdf_sec.ps
 RESTRICTED=	"Crypto; export controlled, RC4 in PostScript code included"
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/print/ghostscript7/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.43
\ No newline at end of property
+1.44
\ No newline at end of property