summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-05-03 04:50:05 +0000
committerjlam <jlam@pkgsrc.org>2001-05-03 04:50:05 +0000
commit686141d09d9f1c52bb12051573607ce976b9d1f9 (patch)
tree647d7e4152334114201c3fc84c1996fdf973c02e /print
parent7d38afded2801c3f8822cfe441848dc94f5f8696 (diff)
downloadpkgsrc-686141d09d9f1c52bb12051573607ce976b9d1f9.tar.gz
Directly fetch and extract jpeg sources, rather than the funky reachover
extraction into the jpeg package's directory. This is less error-prone, and guarantees less random breakage in the ghostscript packages if we modify or upgrade the jpeg package.
Diffstat (limited to 'print')
-rw-r--r--print/ghostscript-nox11/Makefile.common22
-rw-r--r--print/ghostscript-nox11/distinfo5
2 files changed, 14 insertions, 13 deletions
diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
index 3a625dbc909..0579f814de0 100644
--- a/print/ghostscript-nox11/Makefile.common
+++ b/print/ghostscript-nox11/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2001/05/02 21:47:05 jlam Exp $
+# $NetBSD: Makefile.common,v 1.10 2001/05/03 04:50:05 jlam Exp $
DISTNAME= ghostscript-${GS_VERS}
GS_VERS= 6.01
@@ -15,11 +15,16 @@ DEPENDS+= ja-vflib-lib-2.*:../../japanese/vflib-lib
DEPENDS+= watanabe-vfont-19930318:../../fonts/watanabe_vfont
DEPENDS+= png>=1.0.6:../../graphics/png
+GS_SOURCES= ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+= ${GS_SOURCES}
+
# Adobe's JPEG implementation in their PDF/PS documents is non-standard,
# so we can't use an already installed libjpeg.so.
#
-GS_SOURCES= ${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+= ${GS_SOURCES}
+MASTER_SITES+= ftp://ftp.uu.net/graphics/jpeg/
+JPEG_SOURCES= jpegsrc.v6b.tar.gz
+DISTFILES+= ${JPEG_SOURCES}
+EXTRACT_LIST+= ${JPEG_SOURCES}
# VFlib & Japanese PDF patch
PATCH_SITES= http://www.sat.t.u-tokyo.ac.jp/~hideyuki/Ghostscript/
@@ -127,7 +132,7 @@ MAKE_ENV+= MAKEOBJDIR="."
# FPU_TYPE=-1 means that floating point is always much slower than
# fixed point.
#
-FPU_TYPE= 1
+FPU_TYPE?= 1
MAKE_ENV+= FPU_TYPE=${FPU_TYPE}
.if defined(USE_X11)
@@ -159,8 +164,7 @@ post-extract:
${CP} gdevprsc.c gdevprsc.mak ${WRKSRC}/src
${RM} -f ${WRKSRC}/jpeg
- ${LN} -s ${BUILD_ROOT}/graphics/jpeg/${WRKDIR:T}/jpeg-6b \
- ${WRKSRC}/jpeg
+ ${LN} -sf ${WRKDIR}/jpeg-6b ${WRKSRC}/jpeg
${RM} -f ${WRKSRC}/lib/${PDF_SEC}
${LN} -s ${_DISTDIR}/${PDF_SEC} ${WRKSRC}/lib/${PDF_SEC}
${MV} ${WRKSRC}/lib/fixmswrd.pl ${WRKSRC}/lib/fixmswrd.pl.in
@@ -173,9 +177,6 @@ post-patch:
< ${WRKDIR}/dmp_site.ps.bak > ${WRKDIR}/dmp_site.ps
do-configure:
- if [ ! -e ${BUILD_ROOT}/graphics/jpeg/${WRKDIR:T}/jpeg-6b ]; then \
- cd ../../graphics/jpeg && ${MAKE} extract; \
- fi
#
# Append build rules for extra drivers to contrib.mak
#
@@ -217,7 +218,4 @@ post-install:
${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/cpem.doc ${DOC_DIR}/${MJC_DRV}
${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/MJ700V2C.FAQ ${DOC_DIR}/${MJC_DRV}
-pre-clean:
- @cd ../../graphics/jpeg && ${MAKE} clean
-
.include "../../mk/bsd.pkg.mk"
diff --git a/print/ghostscript-nox11/distinfo b/print/ghostscript-nox11/distinfo
index 146fe442d4d..2e60f7718c5 100644
--- a/print/ghostscript-nox11/distinfo
+++ b/print/ghostscript-nox11/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 12:41:50 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/05/03 04:50:05 jlam Exp $
SHA1 (ghostscript/ghostscript-6.01.tar.bz2) = 405a8ab16453a8c3f846eae2aa4abbea6a093300
Size (ghostscript/ghostscript-6.01.tar.bz2) = 2974476 bytes
+SHA1 (ghostscript/jpegsrc.v6b.tar.gz) = 7079f0d6c42fad0cfba382cf6ad322add1ace8f9
+Size (ghostscript/jpegsrc.v6b.tar.gz) = 613261 bytes
SHA1 (ghostscript/pdf_sec.ps) = e185f12cb8764ce2d7d32931c6dbd5e05df8722f
Size (ghostscript/pdf_sec.ps) = 11158 bytes
SHA1 (ghostscript/hpdj-2.6.tar.gz) = 1767295652292ab00b6859cf6699939be44e49e7
@@ -47,3 +49,4 @@ SHA1 (patch-at) = 47fa47098098ca3db32543a94b21c63a19bac0ba
SHA1 (patch-au) = 07c99b2988c34396901594ab635a209e08766303
SHA1 (patch-av) = 87f3c9e01a4e2fa63c75c348b1a5ec2be07948a5
SHA1 (patch-aw) = 9855cacc48db068f87aa37568b198e22e6c391a0
+SHA1 (patch-bug-workaround) = 99f4e197b35a8f33b8a1219a38f6d9fc2c307eb6