pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/print Add x11 option to the various ghostscript packag...
details: https://anonhg.NetBSD.org/pkgsrc/rev/8097f73dba4b
branches: trunk
changeset: 504364:8097f73dba4b
user: wiz <wiz%pkgsrc.org@localhost>
date: Fri Dec 09 20:30:16 2005 +0000
description:
Add x11 option to the various ghostscript packages, and get rid
of the separate ghostscript*x11* packages.
diffstat:
print/Makefile | 6 +-
print/ghostscript-esp-nox11/DESCR | 10 -
print/ghostscript-esp-nox11/Makefile | 11 -
print/ghostscript-esp/Makefile | 106 ++++-
print/ghostscript-esp/Makefile.common | 106 -----
print/ghostscript-esp/options.mk | 14 +
print/ghostscript-gnu-nox11/DESCR | 7 -
print/ghostscript-gnu-nox11/Makefile | 9 -
print/ghostscript-gnu-x11/DESCR | 8 -
print/ghostscript-gnu-x11/Makefile | 22 -
print/ghostscript-gnu/Makefile | 96 ++++-
print/ghostscript-gnu/Makefile.common | 93 ----
print/ghostscript-gnu/options.mk | 14 +
print/ghostscript-nox11/DESCR | 6 -
print/ghostscript-nox11/Makefile | 7 -
print/ghostscript-nox11/Makefile.common | 305 ---------------
print/ghostscript-nox11/PLIST | 327 ----------------
print/ghostscript-nox11/distinfo | 82 ----
print/ghostscript-nox11/files/devs.nox11 | 186 ---------
print/ghostscript-nox11/files/devs.x11 | 16 -
print/ghostscript-nox11/patches/patch-ab | 12 -
print/ghostscript-nox11/patches/patch-ac | 21 -
print/ghostscript-nox11/patches/patch-ad | 51 --
print/ghostscript-nox11/patches/patch-ae | 57 --
print/ghostscript-nox11/patches/patch-af | 26 -
print/ghostscript-nox11/patches/patch-ag | 25 -
print/ghostscript-nox11/patches/patch-ah | 229 -----------
print/ghostscript-nox11/patches/patch-ai | 23 -
print/ghostscript-nox11/patches/patch-aj | 24 -
print/ghostscript-nox11/patches/patch-ak | 384 -------------------
print/ghostscript-nox11/patches/patch-al | 40 -
print/ghostscript-nox11/patches/patch-am | 13 -
print/ghostscript-nox11/patches/patch-an | 12 -
print/ghostscript-nox11/patches/patch-ao | 31 -
print/ghostscript-nox11/patches/patch-ap | 36 -
print/ghostscript-nox11/patches/patch-aq | 30 -
print/ghostscript-nox11/patches/patch-ar | 15 -
print/ghostscript-nox11/patches/patch-as | 13 -
print/ghostscript-nox11/patches/patch-at | 139 ------
print/ghostscript-nox11/patches/patch-au | 22 -
print/ghostscript-nox11/patches/patch-av | 32 -
print/ghostscript-nox11/patches/patch-aw | 72 ---
print/ghostscript-nox11/patches/patch-ay | 13 -
print/ghostscript-nox11/patches/patch-az | 32 -
print/ghostscript-nox11/patches/patch-ba | 42 --
print/ghostscript-nox11/patches/patch-bb | 10 -
print/ghostscript-nox11/patches/patch-bc | 18 -
print/ghostscript-nox11/patches/patch-bd | 31 -
print/ghostscript-nox11/patches/patch-be | 22 -
print/ghostscript-nox11/patches/patch-bug-workaround | 23 -
print/ghostscript/Makefile | 306 ++++++++++++++-
print/ghostscript/PLIST | 327 ++++++++++++++++
print/ghostscript/distinfo | 82 ++++
print/ghostscript/files/devs.nox11 | 186 +++++++++
print/ghostscript/files/devs.x11 | 16 +
print/ghostscript/options.mk | 17 +
print/ghostscript/patches/patch-ab | 12 +
print/ghostscript/patches/patch-ac | 21 +
print/ghostscript/patches/patch-ad | 51 ++
print/ghostscript/patches/patch-ae | 57 ++
print/ghostscript/patches/patch-af | 26 +
print/ghostscript/patches/patch-ag | 25 +
print/ghostscript/patches/patch-ah | 229 +++++++++++
print/ghostscript/patches/patch-ai | 23 +
print/ghostscript/patches/patch-aj | 24 +
print/ghostscript/patches/patch-ak | 384 +++++++++++++++++++
print/ghostscript/patches/patch-al | 40 +
print/ghostscript/patches/patch-am | 13 +
print/ghostscript/patches/patch-an | 12 +
print/ghostscript/patches/patch-ao | 31 +
print/ghostscript/patches/patch-ap | 36 +
print/ghostscript/patches/patch-aq | 30 +
print/ghostscript/patches/patch-ar | 15 +
print/ghostscript/patches/patch-as | 13 +
print/ghostscript/patches/patch-at | 139 ++++++
print/ghostscript/patches/patch-au | 22 +
print/ghostscript/patches/patch-av | 32 +
print/ghostscript/patches/patch-aw | 72 +++
print/ghostscript/patches/patch-ay | 13 +
print/ghostscript/patches/patch-az | 32 +
print/ghostscript/patches/patch-ba | 42 ++
print/ghostscript/patches/patch-bb | 10 +
print/ghostscript/patches/patch-bc | 18 +
print/ghostscript/patches/patch-bd | 31 +
print/ghostscript/patches/patch-be | 22 +
print/ghostscript/patches/patch-bug-workaround | 23 +
86 files changed, 2645 insertions(+), 2716 deletions(-)
diffs (truncated from 5733 to 300 lines):
diff -r 2a70517daea0 -r 8097f73dba4b print/Makefile
--- a/print/Makefile Fri Dec 09 20:28:59 2005 +0000
+++ b/print/Makefile Fri Dec 09 20:30:16 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.139 2005/11/29 22:39:48 minskim Exp $
+# $NetBSD: Makefile,v 1.140 2005/12/09 20:30:16 wiz Exp $
#
COMMENT= Desktop publishing
@@ -36,11 +36,7 @@
SUBDIR+= ghostscript
SUBDIR+= ghostscript-afpl
SUBDIR+= ghostscript-esp
-SUBDIR+= ghostscript-esp-nox11
SUBDIR+= ghostscript-gnu
-SUBDIR+= ghostscript-gnu-nox11
-SUBDIR+= ghostscript-gnu-x11
-SUBDIR+= ghostscript-nox11
SUBDIR+= gimp-print
SUBDIR+= gimp-print-cups
SUBDIR+= gimp-print-escputil
diff -r 2a70517daea0 -r 8097f73dba4b print/ghostscript-esp-nox11/DESCR
--- a/print/ghostscript-esp-nox11/DESCR Fri Dec 09 20:28:59 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-Ghostscript is the well-known PostScript interpreter which is available for
-all common and most esoteric platforms and supports many different printers
-and some displays.
-
-This package contains ESP Ghostscript, which is a separately maintained
-distribution of GNU Ghostscript and distributed under the terms of the GNU
-Public License. ESP Ghostscript incorporates the CUPS raster printer
-driver and a large number of contributed Ghostscript printer drivers.
-
-This package is built without support for X11 displays.
diff -r 2a70517daea0 -r 8097f73dba4b print/ghostscript-esp-nox11/Makefile
--- a/print/ghostscript-esp-nox11/Makefile Fri Dec 09 20:28:59 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2005/11/27 17:05:56 adrianp Exp $
-
-.include "../../print/ghostscript-esp/Makefile.common"
-
-PKGNAME= ghostscript-esp-nox11-${GS_VERS}
-PKGREVISION= 1
-COMMENT= ESP/CUPS Postscript interpreter without X11 drivers
-
-CONFIGURE_ARGS+= --without-x
-
-.include "../../mk/bsd.pkg.mk"
diff -r 2a70517daea0 -r 8097f73dba4b print/ghostscript-esp/Makefile
--- a/print/ghostscript-esp/Makefile Fri Dec 09 20:28:59 2005 +0000
+++ b/print/ghostscript-esp/Makefile Fri Dec 09 20:30:16 2005 +0000
@@ -1,12 +1,108 @@
-# $NetBSD: Makefile,v 1.11 2005/11/27 17:05:29 adrianp Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/09 20:30:16 wiz Exp $
-.include "Makefile.common"
-
+DISTNAME= espgs-${GS_VERS}-source
PKGNAME= ghostscript-esp-${GS_VERS}
PKGREVISION= 1
+BASEGS_VERS= 8.15
+GS_VERS= ${BASEGS_VERS}.1
+CATEGORIES= print
+ESP_SITES= http://ftp.easysw.com/pub/ghostscript/ \
+ ftp://ftp.easysw.com/pub/ghostscript/ \
+ ftp://ftp2.easysw.com/pub/ghostscript/ \
+ ftp://ftp3.easysw.com/pub/ghostscript/ \
+ http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/ghostscript/ \
+ ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/ghostscript/ \
+ ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/ \
+ http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/
+MASTER_SITES= ${ESP_SITES:=${GS_VERS}/}
+EXTRACT_SUFX= .tar.bz2
+
+MAINTAINER= jlam%NetBSD.org@localhost
COMMENT= ESP/CUPS Postscript interpreter
+HOMEPAGE= http://www.cups.org/ghostscript.html
+
+CONFLICTS+= ghostscript{,-nox11}-[0-9]*
+CONFLICTS+= ghostscript-afpl-[0-9]*
+CONFLICTS+= ghostscript-esp{,-nox11}-[0-9]*
+CONFLICTS+= ghostscript-gnu{,-nox11,-x11}-[0-9]*
+
+DEPENDS+= ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts
+
+WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//}
+USE_PKGINSTALL= yes
+USE_TOOLS+= gmake pkg-config
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --enable-cups
+CONFIGURE_ARGS+= --with-ijs
+CONFIGURE_ARGS+= --without-omni
+CONFIGURE_ARGS+= --with-drivers=ALL
+
+DIST_SUBDIR= ghostscript
+GS_SRCS= ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+= ${GS_SRCS}
+EXTRACT_ONLY= ${GS_SRCS}
+
+# Adobe's JPEG implementation in their PDF/PS documents is non-standard,
+# so we can't use an already installed libjpeg.so.
+#
+JPEG_SRCS= jpegsrc.v6b.tar.gz
+JPEG_WRKSRC= ${WRKDIR}/jpeg-6b
+SITES_${JPEG_SRCS}= ftp://ftp.uu.net/graphics/jpeg/
+DISTFILES+= ${JPEG_SRCS}
+EXTRACT_ONLY+= ${JPEG_SRCS}
+
+.include "options.mk"
+
+.include "../../mk/bsd.prefs.mk"
-CONFIGURE_ARGS+= --with-x
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+GCC_REQD+= 3.0
+.endif
+
+.if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4")
+CFLAGS+= -DA4
+.endif
+CFLAGS+= -DHAVE_MKSTEMP=1
+
+REPLACE_PERL= lib/fixmswrd.pl
+
+CUPS_CONFDIR?= ${PKG_SYSCONFBASEDIR}/cups
+CUPS_EGDIR= ${PREFIX}/share/examples/cups
+CUPS_MODEL_DIR= ${PREFIX}/share/cups/model
+DOCDIR= ${PREFIX}/share/doc/ghostscript
+
+PLIST_SUBST+= GS_VERS=${BASEGS_VERS:Q}
+
+CONF_FILES= ${CUPS_EGDIR}/pstoraster.convs ${CUPS_CONFDIR}/pstoraster.convs
+
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
+.include "../../print/gimp-print-lib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+post-extract:
+ ${MKDIR} ${WRKSRC}/bin
+ ${MKDIR} ${WRKSRC}/obj
+ ${RM} -f ${WRKSRC}/jpeg
+ ${LN} -s ${JPEG_WRKSRC} ${WRKSRC}/jpeg
+
+post-install:
+ ${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/cups/filter
+ ${INSTALL_SCRIPT} ${WRKSRC}/pstoraster/pstopxl \
+ ${PREFIX}/libexec/cups/filter
+ ${INSTALL_SCRIPT} ${WRKSRC}/pstoraster/pstoraster \
+ ${PREFIX}/libexec/cups/filter
+ ${INSTALL_DATA_DIR} ${CUPS_MODEL_DIR}
+ ${INSTALL_DATA} ${WRKSRC}/pstoraster/pxlcolor.ppd ${CUPS_MODEL_DIR}
+ ${INSTALL_DATA} ${WRKSRC}/pstoraster/pxlmono.ppd ${CUPS_MODEL_DIR}
+ ${INSTALL_DATA_DIR} ${CUPS_EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/pstoraster/pstoraster.convs ${CUPS_EGDIR}
+
+SUBST_CLASSES+= ps2epsi-sh
+SUBST_MESSAGE.ps2epsi-sh= "Fixing ps2epsi shell."
+SUBST_FILES.ps2epsi-sh= lib/ps2epsi
+SUBST_SED.ps2epsi-sh= -e 's|/bin/sh|${SH}|'
+SUBST_STAGE.ps2epsi-sh= post-patch
+
.include "../../mk/bsd.pkg.mk"
diff -r 2a70517daea0 -r 8097f73dba4b print/ghostscript-esp/Makefile.common
--- a/print/ghostscript-esp/Makefile.common Fri Dec 09 20:28:59 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-# $NetBSD: Makefile.common,v 1.27 2005/12/05 20:50:52 rillig Exp $
-
-DISTNAME= espgs-${GS_VERS}-source
-BASEGS_VERS= 8.15
-GS_VERS= ${BASEGS_VERS}.1
-CATEGORIES= print
-ESP_SITES= http://ftp.easysw.com/pub/ghostscript/ \
- ftp://ftp.easysw.com/pub/ghostscript/ \
- ftp://ftp2.easysw.com/pub/ghostscript/ \
- ftp://ftp3.easysw.com/pub/ghostscript/ \
- http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/ghostscript/ \
- ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/ghostscript/ \
- ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/ \
- http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/
-MASTER_SITES= ${ESP_SITES:=${GS_VERS}/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= jlam%NetBSD.org@localhost
-HOMEPAGE= http://www.cups.org/ghostscript.html
-
-CONFLICTS+= ghostscript{,-nox11}-[0-9]*
-CONFLICTS+= ghostscript-afpl-[0-9]*
-CONFLICTS+= ghostscript-esp{,-nox11}-[0-9]*
-CONFLICTS+= ghostscript-gnu{,-nox11,-x11}-[0-9]*
-
-DEPENDS+= ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts
-
-WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//}
-USE_PKGINSTALL= yes
-USE_TOOLS+= gmake pkg-config
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --enable-cups
-CONFIGURE_ARGS+= --with-ijs
-CONFIGURE_ARGS+= --without-omni
-CONFIGURE_ARGS+= --with-drivers=ALL
-
-DIST_SUBDIR= ghostscript
-GS_SRCS= ${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+= ${GS_SRCS}
-EXTRACT_ONLY= ${GS_SRCS}
-
-# Adobe's JPEG implementation in their PDF/PS documents is non-standard,
-# so we can't use an already installed libjpeg.so.
-#
-JPEG_SRCS= jpegsrc.v6b.tar.gz
-JPEG_WRKSRC= ${WRKDIR}/jpeg-6b
-SITES_${JPEG_SRCS}= ftp://ftp.uu.net/graphics/jpeg/
-DISTFILES+= ${JPEG_SRCS}
-EXTRACT_ONLY+= ${JPEG_SRCS}
-
-DISTINFO_FILE= ${.CURDIR}/../ghostscript-esp/distinfo
-FILESDIR= ${.CURDIR}/../ghostscript-esp/files
-PATCHDIR= ${.CURDIR}/../ghostscript-esp/patches
-PLIST_SRC= ${.CURDIR}/../ghostscript-esp/PLIST
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+= 3.0
-.endif
-
-.if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4")
-CFLAGS+= -DA4
-.endif
-CFLAGS+= -DHAVE_MKSTEMP=1
-
-REPLACE_PERL= lib/fixmswrd.pl
-
-CUPS_CONFDIR?= ${PKG_SYSCONFBASEDIR}/cups
-CUPS_EGDIR= ${PREFIX}/share/examples/cups
-CUPS_MODEL_DIR= ${PREFIX}/share/cups/model
-DOCDIR= ${PREFIX}/share/doc/ghostscript
-
-PLIST_SUBST+= GS_VERS=${BASEGS_VERS:Q}
-
-CONF_FILES= ${CUPS_EGDIR}/pstoraster.convs ${CUPS_CONFDIR}/pstoraster.convs
-
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../print/cups/buildlink3.mk"
-.include "../../print/gimp-print-lib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-
-post-extract:
- ${MKDIR} ${WRKSRC}/bin
- ${MKDIR} ${WRKSRC}/obj
- ${RM} -f ${WRKSRC}/jpeg
- ${LN} -s ${JPEG_WRKSRC} ${WRKSRC}/jpeg
-
-post-install:
- ${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/cups/filter
- ${INSTALL_SCRIPT} ${WRKSRC}/pstoraster/pstopxl \
- ${PREFIX}/libexec/cups/filter
- ${INSTALL_SCRIPT} ${WRKSRC}/pstoraster/pstoraster \
- ${PREFIX}/libexec/cups/filter
- ${INSTALL_DATA_DIR} ${CUPS_MODEL_DIR}
- ${INSTALL_DATA} ${WRKSRC}/pstoraster/pxlcolor.ppd ${CUPS_MODEL_DIR}
- ${INSTALL_DATA} ${WRKSRC}/pstoraster/pxlmono.ppd ${CUPS_MODEL_DIR}
- ${INSTALL_DATA_DIR} ${CUPS_EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/pstoraster/pstoraster.convs ${CUPS_EGDIR}
-
-SUBST_CLASSES+= ps2epsi-sh
-SUBST_MESSAGE.ps2epsi-sh= "Fixing ps2epsi shell."
-SUBST_FILES.ps2epsi-sh= lib/ps2epsi
-SUBST_SED.ps2epsi-sh= -e 's|/bin/sh|${SH}|'
-SUBST_STAGE.ps2epsi-sh= post-patch
diff -r 2a70517daea0 -r 8097f73dba4b print/ghostscript-esp/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/ghostscript-esp/options.mk Fri Dec 09 20:30:16 2005 +0000
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2005/12/09 20:30:16 wiz Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.ghostscript-esp
+PKG_SUPPORTED_OPTIONS= x11
+PKG_SUGGESTED_OPTIONS= x11
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mx11)
+CONFIGURE_ARGS+= --with-x
+.include "../../mk/x11.buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-x
+.endif
diff -r 2a70517daea0 -r 8097f73dba4b print/ghostscript-gnu-nox11/DESCR
--- a/print/ghostscript-gnu-nox11/DESCR Fri Dec 09 20:28:59 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-Ghostscript is the well-known PostScript interpreter which is available for
Home |
Main Index |
Thread Index |
Old Index