Import of pkgsrc-2014Q1

This commit is contained in:
2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions

View File

@@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.5 2013/06/04 22:16:58 tron Exp $
# $NetBSD: Makefile,v 1.8 2014/02/12 23:18:29 tron Exp $
DISTNAME= ghostscript-${GS_VERSION}
PKGNAME= ${DISTNAME:S/ghostscript/ghostscript-agpl/}
PKGREVISION= 4
PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ghostscript/}
MASTER_SITES+= http://ghostscript.com/releases/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ghostscript/} \
http://downloads.ghostscript.com/public/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -23,10 +23,11 @@ CONFLICTS+= ghostscript-afpl-[0-9]*
CONFLICTS+= ghostscript-esp{,-nox11}-[0-9]*
CONFLICTS+= ghostscript-gnu{,-nox11,-x11}-[0-9]*
USE_LANGUAGES+= c c++
USE_LANGUAGES= c c++
USE_TOOLS+= gmake perl:run lex pkg-config
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-system-libtiff
CONFIGURE_ARGS+= --disable-cups
UNLIMIT_RESOURCES+= datasize # gsromfs1.c
BUILD_TARGET= so
@@ -89,8 +90,9 @@ post-extract:
${MKDIR} ${WRKSRC}/bin
${MKDIR} ${WRKSRC}/obj
${RM} -rf ${WRKSRC}/freetype
${RM} -rf ${WRKSRC}/jbig2dec
${RM} -rf ${WRKSRC}/jpeg
# ${RM} -rf ${WRKSRC}/lcms2
${RM} -rf ${WRKSRC}/lcms2
${RM} -rf ${WRKSRC}/libpng
${RM} -rf ${WRKSRC}/zlib
@@ -103,10 +105,14 @@ post-extract:
post-install:
${LN} -sf gsc ${DESTDIR}${PREFIX}/bin/gs
.include "../../devel/libidn/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
#.include "../../graphics/lcms2/buildlink3.mk"
.include "../../graphics/jbig2dec/buildlink3.mk"
.include "../../graphics/lcms2/buildlink3.mk"
#.include "../../graphics/openjpeg15/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../print/libpaper/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile.common,v 1.1 2013/03/16 22:25:21 dholland Exp $
# $NetBSD: Makefile.common,v 1.3 2013/09/03 06:39:12 adam Exp $
# used by print/ghostscript-agpl/Makefile
# used by fonts/ghostscript-cidfonts/Makefile
# used by fonts/ghostscript-cidfonts-ryumin/Makefile
GS_VERSION= 9.07
GS_VERSION= 9.10

View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.1 2013/03/16 22:25:21 dholland Exp $
@comment $NetBSD: PLIST,v 1.4 2013/12/27 16:42:46 gdt Exp $
bin/dvipdf
bin/eps2eps
bin/font2c
@@ -35,15 +35,12 @@ include/ghostscript/ierrors.h
lib/libgs.so
lib/libgs.so.9
lib/libgs.so.${PKGVERSION}
${PLIST.cups}libexec/cups/filter/gstopxl
${PLIST.cups}libexec/cups/filter/gstoraster
man/de/man1/dvipdf.1
man/de/man1/eps2eps.1
man/de/man1/font2c.1
man/de/man1/gsnd.1
man/de/man1/pdf2dsc.1
man/de/man1/pdf2ps.1
man/de/man1/pdfopt.1
man/de/man1/printafm.1
man/de/man1/ps2ascii.1
man/de/man1/ps2pdf.1
@@ -64,7 +61,6 @@ man/man1/gslp.1
man/man1/gsnd.1
man/man1/pdf2dsc.1
man/man1/pdf2ps.1
man/man1/pdfopt.1
man/man1/pf2afm.1
man/man1/pfbtopfa.1
man/man1/printafm.1
@@ -77,9 +73,6 @@ man/man1/ps2pdf14.1
man/man1/ps2pdfwr.1
man/man1/ps2ps.1
man/man1/wftopfa.1
${PLIST.cups}share/cups/model/pxlcolor.ppd
${PLIST.cups}share/cups/model/pxlmono.ppd
${PLIST.cups}share/examples/cups/gstoraster.convs
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CIDFSubst/DroidSansFallback.ttf
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CIDFont/ArtifexBullet
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/CMap/78-EUC-H
@@ -263,6 +256,10 @@ ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Decoding/FCO_Wingdin
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Decoding/Latin1
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Decoding/StandardEncoding
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Decoding/Unicode
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Encoding/CEEncoding
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Encoding/ExpertEncoding
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Encoding/ExpertSubsetEncoding
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Encoding/NotDefEncoding
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Encoding/Wingdings
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Font/CenturySchL-Bold
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Font/CenturySchL-BoldItal
@@ -299,6 +296,7 @@ ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Font/URWPalladioL-Bo
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Font/URWPalladioL-BoldItal
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Font/URWPalladioL-Ital
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Font/URWPalladioL-Roma
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/IdiomSet/Pscript5Idiom
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Init/FAPIcidfmap
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Init/FAPIconfig
${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/Init/FAPIfontmap

View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.4 2013/06/04 22:16:58 tron Exp $
# $NetBSD: buildlink3.mk,v 1.5 2014/02/12 23:18:29 tron Exp $
BUILDLINK_TREE+= ghostscript-agpl
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ghostscript-agpl
GHOSTSCRIPT_AGPL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ghostscript-agpl+= ghostscript-agpl>=8.63nb1
BUILDLINK_ABI_DEPENDS.ghostscript-agpl+= ghostscript-agpl>=9.07nb4
BUILDLINK_ABI_DEPENDS.ghostscript-agpl+= ghostscript-agpl>=9.10nb1
BUILDLINK_PKGSRCDIR.ghostscript-agpl?= ../../print/ghostscript-agpl
.include "../../graphics/png/buildlink3.mk"

View File

@@ -1,14 +1,11 @@
$NetBSD: distinfo,v 1.1 2013/03/16 22:25:21 dholland Exp $
$NetBSD: distinfo,v 1.3 2013/09/03 06:39:12 adam Exp $
SHA1 (ghostscript-9.07.tar.bz2) = 550a85e73b7213d8ae41ea06523661638b4bc1a2
RMD160 (ghostscript-9.07.tar.bz2) = 704750aa367650b74135dc4f8a3caeccb8d1b0d6
Size (ghostscript-9.07.tar.bz2) = 27776111 bytes
SHA1 (patch-af) = 79af4d253001f879f1b5d3ef93584ae7300361de
SHA1 (patch-ah) = 35d6e3a4623bb28e59526f61a3062874cc363429
SHA1 (patch-ai) = 8a3de7e097d3d893a0de4ea2936acf192f770c65
SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c
SHA1 (patch-al) = 86489b704c60320385794c3eb68170d9b9f1f6cc
SHA1 (patch-base_gdevpng.c) = 24120e26bd2a846f6d4c8ab9753dfe91f151343f
SHA1 (ghostscript-9.10.tar.bz2) = 89527d45f97b6cf028ad8ca4bfa07c64462390e8
RMD160 (ghostscript-9.10.tar.bz2) = c30b94918d5eeed8d8b50c6ee9e339541004ded8
Size (ghostscript-9.10.tar.bz2) = 30983380 bytes
SHA1 (patch-af) = a1cbc0b9724e3ca43e3cedb6c6e619adfed59068
SHA1 (patch-ah) = db74a482e22771414f223a97dd71df5215553d85
SHA1 (patch-ai) = e83a732559094ea8b683a171219388d5087c816f
SHA1 (patch-al) = b4d06da288a608d65cdb014b0f2384406089afe3
SHA1 (patch-base_gserrors_h) = ce75cfb7528871842a3bd35e18a6d91c89823909
SHA1 (patch-configure.ac) = 20733b52f41353bad47a0ce55f16eaab769e2b27
SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 207a22833f6e7026feea0bfc3f7411d228f03e6e

View File

@@ -1,7 +1,7 @@
# $NetBSD: options.mk,v 1.1 2013/03/16 22:25:21 dholland Exp $
# $NetBSD: options.mk,v 1.3 2013/12/27 16:42:46 gdt Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ghostscript
PKG_SUPPORTED_OPTIONS= x11 cups debug fontconfig disable-compile-inits
PKG_SUPPORTED_OPTIONS= x11 debug fontconfig disable-compile-inits
PKG_SUGGESTED_OPTIONS= x11 fontconfig
.include "../../mk/bsd.options.mk"
@@ -19,28 +19,6 @@ CONFIGURE_ARGS+= --with-x
CONFIGURE_ARGS+= --without-x
.endif
PLIST_VARS+= cups
.if !empty(PKG_OPTIONS:Mcups)
CONFIGURE_ARGS+= --enable-cups
PLIST.cups= yes
INSTALL_TARGET+= install-cups
CUPS_CONFDIR?= ${PKG_SYSCONFBASEDIR}/cups
CUPS_EGDIR= ${PREFIX}/share/examples/cups
CONF_FILES+= ${CUPS_EGDIR}/gstoraster.convs ${CUPS_CONFDIR}/gstoraster.convs
SUBST_CLASSES+= cupsetc
SUBST_STAGE.cupsetc= post-extract
SUBST_MESSAGE.cupsetc= Fixing CUPS etc directory path to install as example
SUBST_FILES.cupsetc= cups/cups.mak
SUBST_SED.cupsetc= -e 's|$$(CUPSSERVERROOT)|${CUPS_EGDIR}|g'
.include "../../print/cups/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-cups
.endif
.if !empty(PKG_OPTIONS:Mdebug)
CONFIGURE_ARGS+= --enable-debug
.endif
@@ -53,7 +31,7 @@ CONFIGURE_ARGS+= --disable-fontconfig
# Please note the same if condition is in post-extract: target in Makefile
.if !empty(PKG_OPTIONS:Mdisable-compile-inits)
CONFIGURE_ARGS+= --disable-compile-inits
CONFIGURE_ARGS+= --disable-compile-inits
PLIST.no_cidfmap= YES
.else
PLIST.cidfmap= YES

View File

@@ -1,4 +1,4 @@
$NetBSD: patch-af,v 1.1 2013/03/16 22:25:21 dholland Exp $
$NetBSD: patch-af,v 1.2 2013/08/22 21:07:08 adam Exp $
(From the log for revision 1.4 of print/ghostscript/patches/patch-af)
date: 2008/11/13 17:36:54; author: chuck; state: Exp; lines: +22 -4
@@ -14,9 +14,9 @@ XXX: this still leaves the issue of libgs.so (et al.) being hardwired
in PLIST, instead of using libgs.dylib (et al.). i'm not sure of
the best way to fix that. at least it compiles now....
--- base/unix-dll.mak.orig 2012-08-08 17:01:36.000000000 +0900
+++ base/unix-dll.mak 2012-10-10 10:03:50.000000000 +0900
@@ -59,13 +59,12 @@
--- base/unix-dll.mak.orig 2013-08-21 14:06:40.000000000 +0000
+++ base/unix-dll.mak
@@ -64,11 +64,11 @@ GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE)$
# MacOS X
@@ -24,28 +24,26 @@ the best way to fix that. at least it compiles now....
-#GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT)
-#GS_SONAME_MAJOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT)
-#GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT)
-#LDFLAGS_SO=-dynamiclib -flat_namespace
+#Darwin#GS_SOEXT=dylib
+#Darwin#GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT)
+#Darwin#GS_SONAME_MAJOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT)
+#Darwin#GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT)
#LDFLAGS_SO=-dynamiclib -flat_namespace
-LDFLAGS_SO_MAC=-dynamiclib -install_name $(GS_SONAME_MAJOR_MINOR)
-#LDFLAGS_SO=-dynamiclib -install_name $(FRAMEWORK_NAME)
+#Darwin#LDFLAGS_SO=-dynamiclib -install_name $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
#LDFLAGS_SO_MAC=-dynamiclib -install_name $(GS_SONAME_MAJOR_MINOR)
#LDFLAGS_SO=-dynamiclib -install_name $(FRAMEWORK_NAME)
GS_SO=$(BINDIR)/$(GS_SONAME)
GS_SO_MAJOR=$(BINDIR)/$(GS_SONAME_MAJOR)
@@ -86,11 +85,11 @@
@@ -91,11 +91,11 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR)
# Build the small Ghostscript loaders, with Gtk+ and without
$(GSSOC_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
$(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \
- -L$(BINDIR) -l$(GS)
+ -L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS)
- -L$(BINDIR) -l$(GS_SO_BASE)
+ -L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS_SO_BASE)
$(GSSOX_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
$(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \
- -L$(BINDIR) -l$(GS) $(SOC_LIBS)
+ -L$(BINDIR) -l$(GS) -Wl,-R$(PREFIX)/lib -l$(GS) $(SOC_LIBS)
- -L$(BINDIR) -l$(GS_SO_BASE) $(SOC_LIBS)
+ -L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS_SO_BASE) $(SOC_LIBS)
# ------------------------- Recursive make targets ------------------------- #

View File

@@ -1,30 +1,8 @@
$NetBSD: patch-ah,v 1.1 2013/03/16 22:25:21 dholland Exp $
(1) First chunk to fix the X11_TYPE=native problem, which
freetype2 in /usr/X11R7/ is way old, and work around to
use ghostscript-provided freetype2.
(2) Second chunk existed from old days, and no idea, sorry (mef@).
$NetBSD: patch-ah,v 1.2 2013/08/22 21:07:08 adam Exp $
--- configure.orig 2012-08-08 17:04:57.000000000 +0900
+++ configure
@@ -3786,13 +3786,13 @@
;;
*BSD)
if test $ac_cv_c_compiler_gnu = yes; then
- CC_OPT_FLAGS_TO_TRY="-O2"
+ CC_OPT_FLAGS_TO_TRY="-O2 -I./freetype/include"
CC_DBG_FLAGS_TO_TRY="-g -O0"
fi
;;
Darwin*)
if test $ac_cv_c_compiler_gnu = yes; then
- CC_OPT_FLAGS_TO_TRY="-O2"
+ CC_OPT_FLAGS_TO_TRY="-O2 -I./freetype/include"
CC_DBG_FLAGS_TO_TRY="-g -O0"
fi
SET_DT_SONAME=""
@@ -5331,7 +5331,7 @@
@@ -5524,7 +5524,7 @@
fi
if test x$with_libpaper != xno; then

View File

@@ -1,12 +1,11 @@
$NetBSD: patch-ai,v 1.1 2013/03/16 22:25:21 dholland Exp $
$NetBSD: patch-ai,v 1.2 2013/08/22 21:07:08 adam Exp $
replace BSD/Linux specific "qd" printf format specifier by "lld",
should fix build problem on Solaris reported by Joern Clausen
per PR pkg/40664
Replace BSD/Linux specific "qd" printf format specifier by "lld",
should fix build problem on Solaris reported by Joern Clausen per PR pkg/40664
--- base/mkromfs.c.orig 2009-02-13 12:20:54.000000000 +0100
+++ base/mkromfs.c
@@ -1033,7 +1033,7 @@
@@ -2302,7 +2302,7 @@
#endif
fprintf(out,"\n#include \"stdint_.h\"\n");
fprintf(out,"\n#include \"time_.h\"\n\n");

View File

@@ -1,14 +0,0 @@
$NetBSD: patch-aj,v 1.1 2013/03/16 22:25:21 dholland Exp $
http://bugs.ghostscript.com/show_bug.cgi?id=690883
--- base/gxpcolor.h.orig 2009-09-14 10:49:17.000000000 +0200
+++ base/gxpcolor.h 2009-09-14 10:49:42.000000000 +0200
@@ -18,6 +18,7 @@
#ifndef gxpcolor_INCLUDED
# define gxpcolor_INCLUDED
+#include "gxdcolor.h"
#include "gspcolor.h"
#include "gxcspace.h"
#include "gxdevice.h"

View File

@@ -1,8 +1,8 @@
$NetBSD: patch-al,v 1.1 2013/03/16 22:25:21 dholland Exp $
$NetBSD: patch-al,v 1.2 2013/08/22 21:07:08 adam Exp $
--- base/unixlink.mak.orig 2010-02-18 12:08:31.000000000 +0000
+++ base/unixlink.mak
@@ -50,7 +50,7 @@ $(GS_A): $(obj_tr) $(ECHOGS_XE) $(INT_AR
@@ -51,7 +51,7 @@ $(GS_A): $(obj_tr) $(ECHOGS_XE) $(INT_AR
# which has limited environment space.
ldt_tr=$(PSOBJ)ldt.tr
$(GS_XE): $(ld_tr) $(ECHOGS_XE) $(XE_ALL) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ)

View File

@@ -1,25 +0,0 @@
$NetBSD: patch-base_gdevpng.c,v 1.1 2013/03/16 22:25:21 dholland Exp $
The patch was included in patches/patch-ak:
revision 1.5
date: 2011/01/15 14:08:10; author: wiz; state: Exp; lines: +194 -29
Fix build with png-1.5. Patch from John Bowler in private mail.
and 'fix for build with png-1.5' is now included in upstream in different
shape, so some left out is here:
--- base/gdevpng.c.orig 2011-08-05 20:12:20.000000000 +0900
+++ base/gdevpng.c 2011-08-22 19:04:12.000000000 +0900
@@ -40,8 +40,11 @@
/*
* libpng versions 1.0.3 and later allow disabling access to the stdxxx
* files while retaining support for FILE * I/O.
+ *
+ * This is a misunderstanding - this is a build time option for libpng,
+ * it has no effect on a user of libpng.
*/
-#define PNG_NO_CONSOLE_IO
+/*#define PNG_NO_CONSOLE_IO*/
/*
* Earlier libpng versions require disabling FILE * I/O altogether.
* This produces a compiler warning about no prototype for png_init_io.

View File

@@ -1,15 +0,0 @@
$NetBSD: patch-configure.ac,v 1.1 2013/03/16 22:25:21 dholland Exp $
See patch-ah (configure)
--- base/configure.ac.orig 2011-08-05 20:12:20.000000000 +0900
+++ base/configure.ac 2011-08-22 19:10:30.000000000 +0900
@@ -514,7 +514,7 @@
fi
if test x$with_libpaper != xno; then
- LIBS="$LIBS -lpaper"
+ LIBS="$LIBS -L${LPLIBDIR} -Wl,-R${LPLIBDIR} -lpaper"
AC_DEFINE(USE_LIBPAPER, 1, [Using libpaper])
CFLAGS="$CFLAGS -DUSE_LIBPAPER"
fi