From fca93a81535a72c577a9c9e534449e55e85c9fb8 Mon Sep 17 00:00:00 2001
From: Ying-Chieh Liao <ijliao@FreeBSD.org>
Date: Fri, 12 Oct 2001 04:02:59 +0000
Subject: [PATCH] back out last commit

---
 print/ghostscript-afpl/Makefile | 18 +++++++++---------
 print/ghostscript-gnu/Makefile  | 18 +++++++++---------
 print/ghostscript-gpl/Makefile  | 18 +++++++++---------
 print/ghostscript7/Makefile     | 18 +++++++++---------
 print/ghostscript8/Makefile     | 18 +++++++++---------
 5 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index 9181916ec4a9..93f2ef443480 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -142,27 +142,27 @@ post-extract:
 #
 # for HP8XX driver
 	${ECHO_MSG} ">>>   extracting ${HP8XX_DRV} ..."
-	${TAR} -C ${WRKSRC}/src -xzf ${_DISTDIR}/${HP8XX_DRV}
+	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP8XX_DRV}
 # for HPDJ driver
 	${ECHO_MSG} ">>>   extracting ${HPDJ_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${HPDJ_SRC}
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPDJ_SRC}
 	${TAR} -C ${WRKSRC}/src -xf ${WRKSRC}/${HPDJ_NAME}/${HPDJ}.tar
 # for PCL3 driver
 	${ECHO_MSG} ">>>   extracting ${PCL3_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${PCL3_SRC}
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${PCL3_SRC}
 	${LN} -sf ${PCL3_NAME} ${WRKSRC}/pcl3
 	${TAR} -C ${WRKSRC}/${PCL3_NAME} -xf \
 		${WRKSRC}/${PCL3_NAME}/${PCL3}.tar
 # for HP DeskJet 970 driver
 	${ECHO_MSG} ">>>   extracting ${HP970_DRV} ..."
-	${CP} ${_DISTDIR}/${HP970_DRV} ${WRKSRC}/src
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${HP970_DRV} ${WRKSRC}/src
 	${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV}
 # for gimp-print
 	${ECHO_MSG} ">>>   extracting ${GPRINT_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${GPRINT_SRC}
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GPRINT_SRC}
 # for HPinkjet driver
 	${ECHO_MSG} ">>>   extracting ${HPIJS_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${HPIJS_SRC}
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPIJS_SRC}
 	${LN} -sf ${HPIJS_NAME} ${WRKSRC}/hpijs
 
 post-patch:
@@ -235,8 +235,8 @@ pre-install:
 	${ECHO_MSG} ">>>   creating ghostscript destdir ..."
 	${MKDIR} ${DATADIR}
 	${ECHO_MSG} ">>>   extracting ghostscript fonts..."
-	${TAR} -C ${DATADIR} -xzf ${_DISTDIR}/${GS_FONTS_STD}
-	${TAR} -C ${DATADIR} -xzf ${_DISTDIR}/${GS_FONTS_OTHER}
+	${TAR} -C ${DATADIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GS_FONTS_STD}
+	${TAR} -C ${DATADIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GS_FONTS_OTHER}
 
 post-install:
 	${ECHO_MSG} ">>> in post-install ..."
@@ -305,7 +305,7 @@ post-install:
 .endfor
 # for reading encrypted PDFs
 	${ECHO_MSG} ">>> installing support for encrypted PDF files ..."
-	${INSTALL_DATA} ${_DISTDIR}/${DECRYPT_PDF} \
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DECRYPT_PDF} \
 		${DATADIR}/${PORTVERSION}/lib
 #
 # now NOPORTDOCS dependend stuff
diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index ebe758e80978..2004052a20e8 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -139,27 +139,27 @@ post-extract:
 #
 # for HP8XX driver
 	${ECHO_MSG} ">>>   extracting ${HP8XX_DRV} ..."
-	${TAR} -C ${WRKSRC}/src -xzf ${_DISTDIR}/${HP8XX_DRV}
+	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP8XX_DRV}
 # for HPDJ driver
 	${ECHO_MSG} ">>>   extracting ${HPDJ_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${HPDJ_SRC}
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPDJ_SRC}
 	${TAR} -C ${WRKSRC}/src -xf ${WRKSRC}/${HPDJ_NAME}/${HPDJ}.tar
 # for PCL3 driver
 	${ECHO_MSG} ">>>   extracting ${PCL3_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${PCL3_SRC}
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${PCL3_SRC}
 	${LN} -sf ${PCL3_NAME} ${WRKSRC}/pcl3
 	${TAR} -C ${WRKSRC}/${PCL3_NAME} -xf \
 		${WRKSRC}/${PCL3_NAME}/${PCL3}.tar
 # for HP DeskJet 970 driver
 	${ECHO_MSG} ">>>   extracting ${HP970_DRV} ..."
-	${CP} ${_DISTDIR}/${HP970_DRV} ${WRKSRC}/src
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${HP970_DRV} ${WRKSRC}/src
 	${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV}
 # for gimp-print
 	${ECHO_MSG} ">>>   extracting ${GPRINT_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${GPRINT_SRC}
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GPRINT_SRC}
 # for HPinkjet driver
 	${ECHO_MSG} ">>>   extracting ${HPIJS_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${HPIJS_SRC}
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPIJS_SRC}
 	${LN} -sf ${HPIJS_NAME} ${WRKSRC}/hpijs
 
 post-patch:
@@ -228,8 +228,8 @@ pre-install:
 	${ECHO_MSG} ">>>   creating ghostscript destdir ..."
 	${MKDIR} ${DATADIR}
 	${ECHO_MSG} ">>>   extracting ghostscript fonts..."
-	${TAR} -C ${DATADIR} -xzf ${_DISTDIR}/${GS_FONTS_STD}
-	${TAR} -C ${DATADIR} -xzf ${_DISTDIR}/${GS_FONTS_OTHER}
+	${TAR} -C ${DATADIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GS_FONTS_STD}
+	${TAR} -C ${DATADIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GS_FONTS_OTHER}
 
 post-install:
 	${ECHO_MSG} ">>> in post-install ..."
@@ -298,7 +298,7 @@ post-install:
 .endfor
 # for reading encrypted PDFs
 	${ECHO_MSG} ">>> installing support for encrypted PDF files ..."
-	${INSTALL_DATA} ${_DISTDIR}/${DECRYPT_PDF} \
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DECRYPT_PDF} \
 		${DATADIR}/${PORTVERSION}/lib
 #
 # now NOPORTDOCS dependend stuff
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 9181916ec4a9..93f2ef443480 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -142,27 +142,27 @@ post-extract:
 #
 # for HP8XX driver
 	${ECHO_MSG} ">>>   extracting ${HP8XX_DRV} ..."
-	${TAR} -C ${WRKSRC}/src -xzf ${_DISTDIR}/${HP8XX_DRV}
+	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP8XX_DRV}
 # for HPDJ driver
 	${ECHO_MSG} ">>>   extracting ${HPDJ_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${HPDJ_SRC}
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPDJ_SRC}
 	${TAR} -C ${WRKSRC}/src -xf ${WRKSRC}/${HPDJ_NAME}/${HPDJ}.tar
 # for PCL3 driver
 	${ECHO_MSG} ">>>   extracting ${PCL3_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${PCL3_SRC}
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${PCL3_SRC}
 	${LN} -sf ${PCL3_NAME} ${WRKSRC}/pcl3
 	${TAR} -C ${WRKSRC}/${PCL3_NAME} -xf \
 		${WRKSRC}/${PCL3_NAME}/${PCL3}.tar
 # for HP DeskJet 970 driver
 	${ECHO_MSG} ">>>   extracting ${HP970_DRV} ..."
-	${CP} ${_DISTDIR}/${HP970_DRV} ${WRKSRC}/src
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${HP970_DRV} ${WRKSRC}/src
 	${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV}
 # for gimp-print
 	${ECHO_MSG} ">>>   extracting ${GPRINT_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${GPRINT_SRC}
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GPRINT_SRC}
 # for HPinkjet driver
 	${ECHO_MSG} ">>>   extracting ${HPIJS_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${HPIJS_SRC}
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPIJS_SRC}
 	${LN} -sf ${HPIJS_NAME} ${WRKSRC}/hpijs
 
 post-patch:
@@ -235,8 +235,8 @@ pre-install:
 	${ECHO_MSG} ">>>   creating ghostscript destdir ..."
 	${MKDIR} ${DATADIR}
 	${ECHO_MSG} ">>>   extracting ghostscript fonts..."
-	${TAR} -C ${DATADIR} -xzf ${_DISTDIR}/${GS_FONTS_STD}
-	${TAR} -C ${DATADIR} -xzf ${_DISTDIR}/${GS_FONTS_OTHER}
+	${TAR} -C ${DATADIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GS_FONTS_STD}
+	${TAR} -C ${DATADIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GS_FONTS_OTHER}
 
 post-install:
 	${ECHO_MSG} ">>> in post-install ..."
@@ -305,7 +305,7 @@ post-install:
 .endfor
 # for reading encrypted PDFs
 	${ECHO_MSG} ">>> installing support for encrypted PDF files ..."
-	${INSTALL_DATA} ${_DISTDIR}/${DECRYPT_PDF} \
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DECRYPT_PDF} \
 		${DATADIR}/${PORTVERSION}/lib
 #
 # now NOPORTDOCS dependend stuff
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index ebe758e80978..2004052a20e8 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -139,27 +139,27 @@ post-extract:
 #
 # for HP8XX driver
 	${ECHO_MSG} ">>>   extracting ${HP8XX_DRV} ..."
-	${TAR} -C ${WRKSRC}/src -xzf ${_DISTDIR}/${HP8XX_DRV}
+	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP8XX_DRV}
 # for HPDJ driver
 	${ECHO_MSG} ">>>   extracting ${HPDJ_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${HPDJ_SRC}
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPDJ_SRC}
 	${TAR} -C ${WRKSRC}/src -xf ${WRKSRC}/${HPDJ_NAME}/${HPDJ}.tar
 # for PCL3 driver
 	${ECHO_MSG} ">>>   extracting ${PCL3_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${PCL3_SRC}
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${PCL3_SRC}
 	${LN} -sf ${PCL3_NAME} ${WRKSRC}/pcl3
 	${TAR} -C ${WRKSRC}/${PCL3_NAME} -xf \
 		${WRKSRC}/${PCL3_NAME}/${PCL3}.tar
 # for HP DeskJet 970 driver
 	${ECHO_MSG} ">>>   extracting ${HP970_DRV} ..."
-	${CP} ${_DISTDIR}/${HP970_DRV} ${WRKSRC}/src
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${HP970_DRV} ${WRKSRC}/src
 	${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV}
 # for gimp-print
 	${ECHO_MSG} ">>>   extracting ${GPRINT_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${GPRINT_SRC}
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GPRINT_SRC}
 # for HPinkjet driver
 	${ECHO_MSG} ">>>   extracting ${HPIJS_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${HPIJS_SRC}
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPIJS_SRC}
 	${LN} -sf ${HPIJS_NAME} ${WRKSRC}/hpijs
 
 post-patch:
@@ -228,8 +228,8 @@ pre-install:
 	${ECHO_MSG} ">>>   creating ghostscript destdir ..."
 	${MKDIR} ${DATADIR}
 	${ECHO_MSG} ">>>   extracting ghostscript fonts..."
-	${TAR} -C ${DATADIR} -xzf ${_DISTDIR}/${GS_FONTS_STD}
-	${TAR} -C ${DATADIR} -xzf ${_DISTDIR}/${GS_FONTS_OTHER}
+	${TAR} -C ${DATADIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GS_FONTS_STD}
+	${TAR} -C ${DATADIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GS_FONTS_OTHER}
 
 post-install:
 	${ECHO_MSG} ">>> in post-install ..."
@@ -298,7 +298,7 @@ post-install:
 .endfor
 # for reading encrypted PDFs
 	${ECHO_MSG} ">>> installing support for encrypted PDF files ..."
-	${INSTALL_DATA} ${_DISTDIR}/${DECRYPT_PDF} \
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DECRYPT_PDF} \
 		${DATADIR}/${PORTVERSION}/lib
 #
 # now NOPORTDOCS dependend stuff
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 9181916ec4a9..93f2ef443480 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -142,27 +142,27 @@ post-extract:
 #
 # for HP8XX driver
 	${ECHO_MSG} ">>>   extracting ${HP8XX_DRV} ..."
-	${TAR} -C ${WRKSRC}/src -xzf ${_DISTDIR}/${HP8XX_DRV}
+	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP8XX_DRV}
 # for HPDJ driver
 	${ECHO_MSG} ">>>   extracting ${HPDJ_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${HPDJ_SRC}
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPDJ_SRC}
 	${TAR} -C ${WRKSRC}/src -xf ${WRKSRC}/${HPDJ_NAME}/${HPDJ}.tar
 # for PCL3 driver
 	${ECHO_MSG} ">>>   extracting ${PCL3_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${PCL3_SRC}
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${PCL3_SRC}
 	${LN} -sf ${PCL3_NAME} ${WRKSRC}/pcl3
 	${TAR} -C ${WRKSRC}/${PCL3_NAME} -xf \
 		${WRKSRC}/${PCL3_NAME}/${PCL3}.tar
 # for HP DeskJet 970 driver
 	${ECHO_MSG} ">>>   extracting ${HP970_DRV} ..."
-	${CP} ${_DISTDIR}/${HP970_DRV} ${WRKSRC}/src
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${HP970_DRV} ${WRKSRC}/src
 	${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV}
 # for gimp-print
 	${ECHO_MSG} ">>>   extracting ${GPRINT_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${GPRINT_SRC}
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GPRINT_SRC}
 # for HPinkjet driver
 	${ECHO_MSG} ">>>   extracting ${HPIJS_SRC} ..."
-	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${HPIJS_SRC}
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPIJS_SRC}
 	${LN} -sf ${HPIJS_NAME} ${WRKSRC}/hpijs
 
 post-patch:
@@ -235,8 +235,8 @@ pre-install:
 	${ECHO_MSG} ">>>   creating ghostscript destdir ..."
 	${MKDIR} ${DATADIR}
 	${ECHO_MSG} ">>>   extracting ghostscript fonts..."
-	${TAR} -C ${DATADIR} -xzf ${_DISTDIR}/${GS_FONTS_STD}
-	${TAR} -C ${DATADIR} -xzf ${_DISTDIR}/${GS_FONTS_OTHER}
+	${TAR} -C ${DATADIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GS_FONTS_STD}
+	${TAR} -C ${DATADIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GS_FONTS_OTHER}
 
 post-install:
 	${ECHO_MSG} ">>> in post-install ..."
@@ -305,7 +305,7 @@ post-install:
 .endfor
 # for reading encrypted PDFs
 	${ECHO_MSG} ">>> installing support for encrypted PDF files ..."
-	${INSTALL_DATA} ${_DISTDIR}/${DECRYPT_PDF} \
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DECRYPT_PDF} \
 		${DATADIR}/${PORTVERSION}/lib
 #
 # now NOPORTDOCS dependend stuff