No feedback at all, so here's a resubmission. This version uses the
(patched) jasper library included in the disftile to simplify ongoing
work on ghostscript 8.56.
Please test and/or comment.
Ciao,
Kili
NOTE: the patch is relative to print/ghostscript, not print/ghostscript/gnu.
Use the pdf_sec.ps shipped with ghostcript 8.54, which has the minor
advance of actually working.
DIST_SUBDIR and Makefile.inc are obsolete now, so drop them.
Use included (and patched) jasper to simplify the update to gs 8.56.
Bump the PKGNAME.
Index: ghostscript/Makefile.inc
===================================================================
RCS file: ghostscript/Makefile.inc
diff -N ghostscript/Makefile.inc
--- ghostscript/Makefile.inc 9 Jul 2003 10:04:53 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-# $OpenBSD: Makefile.inc,v 1.6 2003/07/09 10:04:53 kevlo Exp $
-#
-GS_SITES+=
ftp://ftp.mirror.ac.uk/sites/mirror.cs.wisc.edu/pub/mirrors/ghost/${DIR}/
-GS_SITES+= ftp://ftp.fh-koblenz.de/pub/Ghostscript/${DIR}/
-
-PDF_SITES= http://www.users.dircon.co.uk/~typhoon/ghostscript/
Index: ghostscript/gnu/Makefile
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- ghostscript/gnu/Makefile 1 Jan 2007 22:54:46 -0000 1.48
+++ ghostscript/gnu/Makefile 22 Apr 2007 21:17:15 -0000
@@ -4,35 +4,29 @@ COMMENT= "GNU PostScript interpreter"
VERSION= 8.54
DISTNAME= ghostscript-${VERSION}-gpl
-PKGNAME= ${DISTNAME:S,-gpl,,}p0
+PKGNAME= ${DISTNAME:S,-gpl,,}p1
CATEGORIES= print lang
SHARED_LIBS= gs 9.0
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ghostscript/}
-MASTER_SITES1= ${PDF_SITES}
HOMEPAGE= http://www.cs.wisc.edu/~ghost/
-GS_SOURCES= ${DISTNAME}${EXTRACT_SUFX}
-DISTFILES= ${GS_SOURCES} pdf_sec.ps:1
-EXTRACT_ONLY= ${GS_SOURCES}
-
FLAVOR_STRING= ${FLAVOR_EXT:S/-/,/g}
SUBST_VARS= VERSION FLAVOR_STRING
-DIST_SUBDIR= gs
# GPL
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
-WANTLIB= m c z jasper jpeg png
+WANTLIB= m c z jpeg png
RUN_DEPENDS= :ghostscript-fonts-*:print/ghostscript/gnu-fonts
-LIB_DEPENDS= ::graphics/png ::graphics/jpeg ::graphics/jasper
+LIB_DEPENDS= ::graphics/png ::graphics/jpeg
BASE_FLAGS= INSTALL_PROGRAM='${INSTALL_SCRIPT}' \
INSTALL_DATA='${INSTALL_DATA}' \
@@ -106,8 +100,7 @@ MAKE_FLAGS= ${BASE_FLAGS}
CFLAGS+= -DSYS_TYPES_HAS_STDINT_TYPES
INCPATHS= -I${LOCALBASE}/include \
- -I${LOCALBASE}/include/libpng \
- -I${LOCALBASE}/include/jasper
+ -I${LOCALBASE}/include/libpng
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
@@ -116,8 +109,6 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} ${INCPA
LIBS=-ljpeg
-# The pdf_sec.ps non-stub version has been moved to a separate package
-
FLAVORS= a4 gtk no_x11
FLAVOR?=
@@ -161,7 +152,7 @@ post-extract:
find ${WRKDIST} -name '*.orig' -type f | xargs -r rm
pre-configure:
- rm -rf ${WRKDIST}/{jasper,jpeg,libpng,zlib}
+ rm -rf ${WRKDIST}/{jpeg,libpng,zlib}
pre-build:
mkdir -p ${WRKDIST}/obj
@@ -193,6 +184,5 @@ post-install:
ln -sf ps2pdf.1 ps2pdf13.1 && \
ln -sf ps2pdf.1 ps2pdf14.1 && \
ln -sf ps2ps.1 eps2eps.1
- ${INSTALL_DATA} ${FULLDISTDIR}/pdf_sec.ps ${PREFIX}/${PDFDIR}
.include <bsd.port.mk>
Index: ghostscript/gnu/distinfo
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- ghostscript/gnu/distinfo 5 Apr 2007 16:20:18 -0000 1.7
+++ ghostscript/gnu/distinfo 22 Apr 2007 21:17:15 -0000
@@ -1,10 +1,5 @@
-MD5 (gs/ghostscript-8.54-gpl.tar.gz) = 1qt/a1zna+ML4D7pCTiM1Q==
-MD5 (gs/pdf_sec.ps) = ks1q9bTXIZ6R5huDUfD3xA==
-RMD160 (gs/ghostscript-8.54-gpl.tar.gz) = SiqkPPhGksqnoLnjACNRRoU0GRM=
-RMD160 (gs/pdf_sec.ps) = 77jgGo+2qZ2GNdNTYFeMRafBwuk=
-SHA1 (gs/ghostscript-8.54-gpl.tar.gz) = T02ivaRgnKpAILG7sQFBm4Ou9ws=
-SHA1 (gs/pdf_sec.ps) = 4YXxLLh2TOLX0ykxxtvV4F34ci8=
-SHA256 (gs/ghostscript-8.54-gpl.tar.gz) =
g3nPRKN+Uvkg3BriHIE1UMFH9XCQ0sZ24KbgBYS3kuo=
-SHA256 (gs/pdf_sec.ps) = RVlh0F0dAtfq+aVZ9+9JdPsQ+09Pz/rHaGWgNayo9r8=
-SIZE (gs/ghostscript-8.54-gpl.tar.gz) = 14932756
-SIZE (gs/pdf_sec.ps) = 11158
+MD5 (ghostscript-8.54-gpl.tar.gz) = 1qt/a1zna+ML4D7pCTiM1Q==
+RMD160 (ghostscript-8.54-gpl.tar.gz) = SiqkPPhGksqnoLnjACNRRoU0GRM=
+SHA1 (ghostscript-8.54-gpl.tar.gz) = T02ivaRgnKpAILG7sQFBm4Ou9ws=
+SHA256 (ghostscript-8.54-gpl.tar.gz) =
g3nPRKN+Uvkg3BriHIE1UMFH9XCQ0sZ24KbgBYS3kuo=
+SIZE (ghostscript-8.54-gpl.tar.gz) = 14932756
Index: ghostscript/gnu/patches/patch-src_jasper_mak
===================================================================
RCS file: ghostscript/gnu/patches/patch-src_jasper_mak
diff -N ghostscript/gnu/patches/patch-src_jasper_mak
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ghostscript/gnu/patches/patch-src_jasper_mak 22 Apr 2007 21:17:15
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/jasper.mak.orig Mon Mar 13 17:18:19 2006
++++ src/jasper.mak Sun Apr 22 20:39:01 2007
+@@ -159,7 +159,7 @@ JAS_EXCF_=\
+ $(D_)EXCLUDE_PNG_SUPPORT$(_D_)1$(_D)
+
+ # define our specific compiler
+-JAS_CC=$(CC_) $(CFLAGS) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_)
$(JAS_EXCF_)
++JAS_CC=$(CC) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_)
$(CFLAGS)
+ JASO_=$(O_)$(JASOBJ)
+
+ # switch in the selected .dev
Index: ghostscript/gnu/patches/patch-src_lib_mak
===================================================================
RCS file: ghostscript/gnu/patches/patch-src_lib_mak
diff -N ghostscript/gnu/patches/patch-src_lib_mak
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ghostscript/gnu/patches/patch-src_lib_mak 22 Apr 2007 21:17:15 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/lib.mak.orig Mon May 15 21:00:31 2006
++++ src/lib.mak Sun Apr 22 20:45:37 2007
+@@ -25,7 +25,7 @@ GLO_=$(O_)$(GLOBJ)
+ GLI_=$(GLGENDIR) $(II)$(GLSRCDIR)
+ GLF_=
+ GLCCFLAGS=$(I_)$(GLI_)$(_I) $(GLF_)
+-GLCC=$(CC_) $(GLCCFLAGS)
++GLCC=$(CC) $(GLCCFLAGS) $(CCFLAGS)
+ GLICCCC=$(CC_) $(I_)$(GLI_) $(II)$(ICCI_)$(_I) $(ICCCF_) $(GLF_)
+ GLJCC=$(CC_) $(I_)$(GLI_) $(II)$(JI_)$(_I) $(JCF_) $(GLF_)
+ GLZCC=$(CC_) $(I_)$(GLI_) $(II)$(ZI_)$(_I) $(ZCF_) $(GLF_)
--
Outlook Express ist wie ein Tamagotchi. Du musst es hegen und pflegen , dann
produziert es viel Mist, den du wieder wegräumen musst, damit sich outlook
wohlfühlt.
-- WoKo in dag°
