svn commit: r316733 - in head/print: . ghostscript9-agpl ghostscript9-agpl-nox11 ghostscript9-agpl/files
Hiroki Sato
hrs at FreeBSD.org
Sun Apr 28 16:59:31 UTC 2013
Author: hrs
Date: Sun Apr 28 16:59:29 2013
New Revision: 316733
URL: http://svnweb.freebsd.org/changeset/ports/316733
Log:
Add print/ghostscript9-agpl{,-nox11}. Ghostscript 9.x has released under
GNU Affero GPL version 3 since 9.07 while print/ghostscript9 (version 9.06)
was under GNU GPL version 3. The difference between the two licenses is
whether SaaS loophole is closed or not. For more detail, see
http://www.gnu.org/licenses/why-affero-gpl.html.
Added:
head/print/ghostscript9-agpl/
- copied from r316307, head/print/ghostscript9/
head/print/ghostscript9-agpl-nox11/
- copied from r316307, head/print/ghostscript9-nox11/
head/print/ghostscript9-agpl/files/patch-contrib__gomni.c (contents, props changed)
Modified:
head/print/Makefile
head/print/ghostscript9-agpl-nox11/Makefile
head/print/ghostscript9-agpl/Makefile
head/print/ghostscript9-agpl/distinfo
head/print/ghostscript9-agpl/files/patch-base-Makefile.in
head/print/ghostscript9-agpl/files/patch-base-unix-gcc.mak
head/print/ghostscript9-agpl/pkg-plist
Modified: head/print/Makefile
==============================================================================
--- head/print/Makefile Sun Apr 28 16:13:10 2013 (r316732)
+++ head/print/Makefile Sun Apr 28 16:59:29 2013 (r316733)
@@ -80,6 +80,8 @@
SUBDIR += ghostscript8
SUBDIR += ghostscript8-nox11
SUBDIR += ghostscript9
+ SUBDIR += ghostscript9-agpl
+ SUBDIR += ghostscript9-agpl-nox11
SUBDIR += ghostscript9-nox11
SUBDIR += ghostview
SUBDIR += gimp-gutenprint
Modified: head/print/ghostscript9-agpl-nox11/Makefile
==============================================================================
--- head/print/ghostscript9-nox11/Makefile Tue Apr 23 05:11:57 2013 (r316307)
+++ head/print/ghostscript9-agpl-nox11/Makefile Sun Apr 28 16:59:29 2013 (r316733)
@@ -1,12 +1,7 @@
-# New ports collection makefile for: ghostscript9-nox11
-# Date created: 7 June 2011
-# Whom: hrs
-#
# $FreeBSD$
-#
OPTIONS_UNSET= X11
-MASTERDIR= ${.CURDIR}/../ghostscript9
+MASTERDIR= ${.CURDIR}/../ghostscript9-agpl
.include "${MASTERDIR}/Makefile"
Modified: head/print/ghostscript9-agpl/Makefile
==============================================================================
--- head/print/ghostscript9/Makefile Tue Apr 23 05:11:57 2013 (r316307)
+++ head/print/ghostscript9-agpl/Makefile Sun Apr 28 16:59:29 2013 (r316733)
@@ -1,15 +1,14 @@
# $FreeBSD$
PORTNAME= ghostscript
-PORTVERSION= 9.06
-PORTREVISION= 1
+PORTVERSION= 9.07
CATEGORIES= print
MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \
SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs${PORTVERSION:S/.//}/:gs_srcs \
http://www.humblesoft.com/pub/:epag
MASTER_SITE_SUBDIR= ghostscript/:gs_srcs
-PKGNAMESUFFIX= 9
+PKGNAMESUFFIX= 9-agpl
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:gs_srcs ${EPAG_SRCS}:epag
DIST_SUBDIR= ${PORTNAME}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
@@ -18,7 +17,7 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xpf - ${EX
MAINTAINER= doceng at FreeBSD.org
COMMENT= Ghostscript 9.x PostScript interpreter
-LICENSE= GPLv3
+LICENSE= AGPLv3
LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \
idn:${PORTSDIR}/dns/libidn \
@@ -29,8 +28,9 @@ LIB_DEPENDS= expat:${PORTSDIR}/textproc/
lcms2:${PORTSDIR}/graphics/lcms2
RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
-CONFLICTS_INSTALL= gambc-[0-9]* ghostscript[78]-[0-9]* \
- ghostscript[78]-*-[0-9]*
+CONFLICTS_INSTALL= gambc-[0-9]* ghostscript[789]-[0-9]* \
+ ghostscript[78]-*-[0-9]* \
+ ghostscript9-nox11-[0-9]*
USE_BZIP2= yes
USE_GMAKE= yes
@@ -55,7 +55,7 @@ CONFIGURE_ARGS= --disable-compile-inits
--without-jasper \
--with-drivers=""
CPPFLAGS+= -DUPD_SIGNAL=0 -I. \
- -I${WRKSRC}/lcms/include \
+ -I${WRKSRC}/lcms2/include \
-I${LOCALBASE}/include/libpng \
-I${WRKSRC}/openjpeg/libopenjpeg \
-I${WRKSRC}/openjpeg \
@@ -69,8 +69,8 @@ SUB_FILES= pkg-message
SUB_LIST= DATADIR=${DATADIR} PORTVERSION=${PORTVERSION}
PKGMESSAGE= ${WRKDIR}/pkg-message
-OPTIONS_DEFINE= A4SIZE CUPS FONTCONFIG ICONV LIBPAPER GTK2 X11
-OPTIONS_DEFAULT= CUPS FONTCONFIG ICONV LIBPAPER X11
+OPTIONS_DEFINE= DOCS A4SIZE CUPS FONTCONFIG ICONV LIBPAPER GTK2 X11
+OPTIONS_DEFAULT= CUPS FONTCONFIG ICONV LIBPAPER X11
A4SIZE_DESC= Set A4 (not Letter) as the default paper size
FONTCONFIG_DESC=Enable fontconfig support
NO_OPTIONS_SORT=yes
@@ -88,7 +88,7 @@ MLINKS= gslp.1 gsbj.1 \
ps2pdf.1 ps2pdf14.1 \
ps2ps.1 eps2eps.1
-EXCLUDE_DIRS= freetype jbig2dec jpeg expat jasper lcms lcms2 libpng tiff zlib
+EXCLUDE_DIRS= freetype jbig2dec jpeg expat jasper lcms libpng tiff zlib
.include "Makefile.drivers"
.include <bsd.port.pre.mk>
@@ -205,7 +205,7 @@ post-install:
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}
-.if !defined(NOPORTDOCS)
+.if !empty(PORT_OPTIONS:MDOCS)
post-install: post-install-docs
.endif
Modified: head/print/ghostscript9-agpl/distinfo
==============================================================================
--- head/print/ghostscript9/distinfo Tue Apr 23 05:11:57 2013 (r316307)
+++ head/print/ghostscript9-agpl/distinfo Sun Apr 28 16:59:29 2013 (r316733)
@@ -1,4 +1,4 @@
-SHA256 (ghostscript/ghostscript-9.06.tar.bz2) = 05acd1b576899572ef8ecbc25637cf73cbd0be267e651732db3012db33088e04
-SIZE (ghostscript/ghostscript-9.06.tar.bz2) = 29246039
+SHA256 (ghostscript/ghostscript-9.07.tar.bz2) = 1e3ee857743bad34280a1186bd92bb486cd847ccd1a838919f82bc96f6687410
+SIZE (ghostscript/ghostscript-9.07.tar.bz2) = 27776111
SHA256 (ghostscript/epag-3.09.tar.gz) = ad10eca44c781a5851d5a8993dcd95b2e2b99392cbf2c8372a5a658f3b991b3b
SIZE (ghostscript/epag-3.09.tar.gz) = 12858
Modified: head/print/ghostscript9-agpl/files/patch-base-Makefile.in
==============================================================================
--- head/print/ghostscript9/files/patch-base-Makefile.in Tue Apr 23 05:11:57 2013 (r316307)
+++ head/print/ghostscript9-agpl/files/patch-base-Makefile.in Sun Apr 28 16:59:29 2013 (r316733)
@@ -1,6 +1,6 @@
---- base/Makefile.in.orig 2012-02-08 17:48:48.000000000 +0900
-+++ base/Makefile.in 2012-02-13 11:01:06.000000000 +0900
-@@ -48,9 +48,8 @@
+--- base/Makefile.in.orig 2013-02-14 16:58:13.000000000 +0900
++++ base/Makefile.in 2013-04-28 01:42:43.000000000 +0900
+@@ -49,9 +49,8 @@
# the directories also define the default search path for the
# initialization files (gs_*.ps) and the fonts.
@@ -12,7 +12,7 @@
INSTALL_SHARED = @INSTALL_SHARED@
prefix = @prefix@
-@@ -201,7 +200,7 @@
+@@ -204,7 +203,7 @@
# some older JPEG streams that violate the standard. If the JPEG
# library built from local sources, the patch will be applied.
@@ -21,7 +21,7 @@
JPEG_NAME=jpeg
# Define the directory where the PNG library sources are stored,
-@@ -209,12 +208,12 @@
+@@ -212,12 +211,12 @@
# You may need to change this if the libpng version changes.
# See png.mak for more information.
@@ -36,7 +36,7 @@
TIFFSRCDIR=@LIBTIFFDIR@
TIFFPLATFORM=unix
TIFFCONFIG_SUFFIX=
-@@ -223,7 +222,7 @@
+@@ -226,7 +225,7 @@
# Define the directory where the zlib sources are stored.
# See zlib.mak for more information.
@@ -45,7 +45,7 @@
ZSRCDIR=@ZLIBDIR@
#ZLIB_NAME=gz
ZLIB_NAME=z
-@@ -250,7 +249,7 @@
+@@ -253,7 +252,7 @@
JPX_LIB=@JPX_DECODER@
SHARE_JPX=@SHARE_JPX@
JPXSRCDIR=@JPXDIR@
@@ -54,7 +54,7 @@
# uncomment the following three lines and one of the last two to
# compile in the Luratech lwf_jp2 codec
-@@ -330,7 +329,7 @@
+@@ -328,7 +327,7 @@
# Define the added flags for standard, debugging, profiling
# and shared object builds.
@@ -63,16 +63,18 @@
CFLAGS_DEBUG=@DBG_CFLAGS@
CFLAGS_PROFILE=-pg @OPT_CFLAGS@
CFLAGS_SO=@DYNAMIC_CFLAGS@
-@@ -381,7 +380,7 @@
+@@ -379,8 +378,8 @@
# Solaris may need -lnsl -lsocket -lposix4.
# (Libraries required by individual drivers are handled automatically.)
-EXTRALIBS=$(XTRALIBS) @LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ @FT_LIBS@
+-AUXEXTRALIBS=$(XTRALIBS) @LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ @FT_LIBS@ @AUX_SHARED_ZLIB@
+EXTRALIBS=$(XTRALIBS) @LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ @FT_LIBS@ -Wl,-export-dynamic
++AUXEXTRALIBS=$(XTRALIBS) @LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ @FT_LIBS@ @AUX_SHARED_ZLIB@ -Wl,-export-dynamic
# Define the standard libraries to search at the end of linking.
# Most platforms require -lpthread for the POSIX threads library;
-@@ -425,7 +424,7 @@
+@@ -424,7 +423,7 @@
# the pthread library. Otherwise use SYNC=nosync
#SYNC=posync
#SYNC=nosync
@@ -81,7 +83,7 @@
# programs we use
RM=rm -f
-@@ -513,27 +512,27 @@
+@@ -516,27 +515,27 @@
#DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev
#DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev
DEVICE_DEVS=$(DISPLAY_DEV) @X11_DEVS@
@@ -130,7 +132,7 @@
# Shared library target to build.
-@@ -578,6 +577,7 @@
+@@ -581,6 +580,7 @@
# ---------------- End of platform-specific section ---------------- #
INSTALL_CONTRIB=@INSTALL_CONTRIB@
Modified: head/print/ghostscript9-agpl/files/patch-base-unix-gcc.mak
==============================================================================
--- head/print/ghostscript9/files/patch-base-unix-gcc.mak Tue Apr 23 05:11:57 2013 (r316307)
+++ head/print/ghostscript9-agpl/files/patch-base-unix-gcc.mak Sun Apr 28 16:59:29 2013 (r316733)
@@ -1,5 +1,5 @@
---- base/unix-gcc.mak.orig 2012-08-08 17:01:36.000000000 +0900
-+++ base/unix-gcc.mak 2012-10-14 02:32:51.000000000 +0900
+--- base/unix-gcc.mak.orig 2013-02-14 16:58:13.000000000 +0900
++++ base/unix-gcc.mak 2013-04-28 01:43:54.000000000 +0900
@@ -22,16 +22,17 @@
# source, generated intermediate file, and object directories
# for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@@ -76,7 +76,7 @@
TIFFSRCDIR=tiff
TIFFPLATFORM=unix
TIFFCONFIG_SUFFIX=.unix
-@@ -174,15 +174,23 @@
+@@ -174,12 +174,12 @@
# what its name is (usually libz, but sometimes libgz).
# See gs.mak and Make.htm for more information.
@@ -91,18 +91,7 @@
JBIG2_LIB=jbig2dec
JBIG2SRCDIR=jbig2dec
-+# Choose the library to use for (JPXDecode support)
-+# whether to link to an external build or compile in from source
-+# and source location and configuration flags for compiling in
-+JPX_LIB=jasper
-+SHARE_JPX=0
-+JPXSRCDIR=jasper
-+JPX_CFLAGS=-DJAS_CONFIGURE
-+
- # Define the directory where the icclib source are stored.
- # See icclib.mak for more information
- ICCSRCDIR=icclib
-@@ -223,7 +231,7 @@
+@@ -219,7 +219,7 @@
# Define the name of the C compiler.
@@ -111,7 +100,7 @@
# Define the name of the linker for the final link step.
# Normally this is the same as the C compiler.
-@@ -240,7 +248,7 @@
+@@ -236,7 +236,7 @@
# Define the added flags for standard, debugging, profiling
# and shared object builds.
@@ -120,7 +109,7 @@
CFLAGS_DEBUG=-g -O0
CFLAGS_PROFILE=-pg -O2
CFLAGS_SO=-fPIC
-@@ -256,7 +264,8 @@
+@@ -252,7 +252,8 @@
# We don't include -ansi, because this gets in the way of the platform-
# specific stuff that <math.h> typically needs; nevertheless, we expect
# gcc to accept ANSI-style function prototypes and function definitions.
@@ -130,7 +119,7 @@
CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
-@@ -267,7 +276,7 @@
+@@ -263,7 +264,7 @@
# -R /usr/local/xxx/lib:/usr/local/lib
# giving the full path names of the shared library directories.
# XLDFLAGS can be set from the command line.
@@ -139,7 +128,7 @@
LDFLAGS=$(XLDFLAGS)
-@@ -278,7 +287,7 @@
+@@ -274,7 +275,7 @@
# Solaris may need -lnsl -lsocket -lposix4.
# (Libraries required by individual drivers are handled automatically.)
@@ -148,7 +137,7 @@
# Define the standard libraries to search at the end of linking.
# Most platforms require -lpthread for the POSIX threads library;
-@@ -300,7 +309,7 @@
+@@ -296,7 +297,7 @@
# Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
# not in $(XINCLUDE).
@@ -157,7 +146,7 @@
# Define the directory/ies and library names for the X11 library files.
# XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
-@@ -315,29 +324,29 @@
+@@ -311,29 +312,29 @@
#XLIBS=Xt SM ICE Xext X11
#XLIBDIRS=-L/usr/local/X/lib
@@ -192,17 +181,7 @@
#FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev
# The following is strictly for testing.
FEATURE_DEVS_ALL=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)rasterop.dev $(PSD)double.dev $(PSD)trapping.dev $(PSD)stocht.dev $(GLD)pipe.dev
-@@ -476,6 +485,9 @@
- include $(GLSRCDIR)/png.mak
- include $(GLSRCDIR)/tiff.mak
- include $(GLSRCDIR)/jbig2.mak
-+include $(GLSRCDIR)/jasper.mak
-+include $(GLSRCDIR)/ldf_jb2.mak
-+include $(GLSRCDIR)/lwf_jp2.mak
- include $(GLSRCDIR)/icclib.mak
- include $(GLSRCDIR)/lcms.mak
- include $(GLSRCDIR)/ijs.mak
-@@ -486,6 +498,7 @@
+@@ -481,6 +482,7 @@
include $(GLSRCDIR)/unix-dll.mak
include $(GLSRCDIR)/unix-end.mak
include $(GLSRCDIR)/unixinst.mak
Added: head/print/ghostscript9-agpl/files/patch-contrib__gomni.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/ghostscript9-agpl/files/patch-contrib__gomni.c Sun Apr 28 16:59:29 2013 (r316733)
@@ -0,0 +1,195 @@
+--- contrib/gomni.c.orig 2013-04-28 02:09:12.000000000 +0900
++++ contrib/gomni.c 2013-04-28 02:09:14.000000000 +0900
+@@ -530,7 +530,7 @@
+ && pDev->pcoreOmni->pszJobOptions
+ )
+ {
+- gs_free (pDev->memory->non_gc_memory, pDev->pcoreOmni->pszJobOptions, strlen (pDev->pcoreOmni->pszJobOptions) + 1, 1, "Option String");
++ gs_free (gs_lib_ctx_get_non_gc_memory_t(), pDev->pcoreOmni->pszJobOptions, strlen (pDev->pcoreOmni->pszJobOptions) + 1, 1, "Option String");
+ }
+
+ if ( pDev->pcoreOmni
+@@ -549,7 +549,7 @@
+
+ if (pDev->pcoreOmni)
+ {
+- gs_free (pDev->memory->non_gc_memory, pDev->pcoreOmni, sizeof (core_omni_device), 1, "omni/device");
++ gs_free (gs_lib_ctx_get_non_gc_memory_t(), pDev->pcoreOmni, sizeof (core_omni_device), 1, "omni/device");
+ pDev->pcoreOmni = 0;
+ }
+
+@@ -720,7 +720,7 @@
+ {
+ PDEVSTRUCT p;
+
+- p = (PDEVSTRUCT)gs_malloc (pgxdev->memory->non_gc_memory, 1, sizeof (Omni_Dev), "omni/instance");
++ p = (PDEVSTRUCT)gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), 1, sizeof (Omni_Dev), "omni/instance");
+ if (!p)
+ {
+ dprintf ("<<<<<<<<<<<<<<<<<<<<<< ERROR >>>>>>>>>>>>>>>>>>>>>>>\n\n");
+@@ -734,7 +734,7 @@
+
+ memset (pDev, 0, sizeof (Omni_Dev));
+
+- pDev->pcoreOmni = (core_omni_device *)gs_malloc (pgxdev->memory->non_gc_memory, 1, sizeof (core_omni_device), "omni/device");
++ pDev->pcoreOmni = (core_omni_device *)gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), 1, sizeof (core_omni_device), "omni/device");
+
+ if (!pDev->pcoreOmni)
+ {
+@@ -783,7 +783,7 @@
+
+ for (i = 0; i < sizeof (apszLibraryPaths)/sizeof (apszLibraryPaths[0]) && !pDev->hmodOmni; i++)
+ {
+- pszDeviceLib = (char *)gs_malloc (pDev->memory->non_gc_memory, 1,
++ pszDeviceLib = (char *)gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), 1,
+ strlen (cOmnilib)
+ + strlen (apszLibraryPaths[i])
+ + 1,
+@@ -796,7 +796,7 @@
+
+ if (fDebugOutput) dprintf2 ("SetupDevice: Trying to load %s = %p\n", pszDeviceLib, pDev->hmodOmni);
+ }
+- gs_free (pDev->memory->non_gc_memory, pszDeviceLib, strlen (pszDeviceLib) + 1, 1, "Devicestring");
++ gs_free (gs_lib_ctx_get_non_gc_memory_t(), pszDeviceLib, strlen (pszDeviceLib) + 1, 1, "Devicestring");
+ }
+
+ if (!pDev->hmodOmni)
+@@ -810,7 +810,7 @@
+
+ for (i = 0; i < sizeof (apszLibraryPaths)/sizeof (apszLibraryPaths[0]) && !pDev->hmodOmni; i++)
+ {
+- pszDeviceLib = (char *)gs_malloc (pDev->memory->non_gc_memory, 1,
++ pszDeviceLib = (char *)gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), 1,
+ strlen (cOmnilib)
+ + strlen (apszLibraryPaths[i])
+ + 1,
+@@ -830,7 +830,7 @@
+ g_module_close (pModule);
+ }
+ }
+- gs_free (pDev->memory->non_gc_memory, pszDeviceLib, strlen (pszDeviceLib) + 1, 1, "Devicestring");
++ gs_free (gs_lib_ctx_get_non_gc_memory_t(), pszDeviceLib, strlen (pszDeviceLib) + 1, 1, "Devicestring");
+ }
+
+ return 1;
+@@ -953,7 +953,7 @@
+ )
+ {
+ if (!pDev->pcoreOmni->pszJobOptions)
+- pDev->pcoreOmni->pszJobOptions = (char *)gs_malloc (pDev->memory->non_gc_memory, 1, fname.size + 1, "Option String");
++ pDev->pcoreOmni->pszJobOptions = (char *)gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), 1, fname.size + 1, "Option String");
+ memcpy (pDev->pcoreOmni->pszJobOptions, fname.data, fname.size);
+ pDev->pcoreOmni->pszJobOptions[fname.size] = '\0';
+ }
+@@ -1044,7 +1044,7 @@
+
+ for (i = 0; i < sizeof (apszLibraryPaths)/sizeof (apszLibraryPaths[0]) && !pModule; i++)
+ {
+- pszDeviceLib = (char *)gs_malloc (pDev->memory->non_gc_memory, 1,
++ pszDeviceLib = (char *)gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), 1,
+ strlen (cDialogName)
+ + strlen (apszLibraryPaths[i])
+ + 1,
+@@ -1059,7 +1059,7 @@
+
+ pModule = g_module_open (pszDeviceLib, (GModuleFlags)0);
+ }
+- gs_free (pDev->memory->non_gc_memory, pszDeviceLib, strlen (pszDeviceLib) + 1, 1, "Devicestring");
++ gs_free (gs_lib_ctx_get_non_gc_memory_t(), pszDeviceLib, strlen (pszDeviceLib) + 1, 1, "Devicestring");
+ }
+
+ if (!pModule)
+@@ -1070,7 +1070,7 @@
+
+ for (i = 0; i < sizeof (apszLibraryPaths)/sizeof (apszLibraryPaths[0]) && !pModule; i++)
+ {
+- pszDeviceLib = (char *)gs_malloc (pDev->memory->non_gc_memory, 1,
++ pszDeviceLib = (char *)gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), 1,
+ strlen (cDialogName)
+ + strlen (apszLibraryPaths[i])
+ + 1,
+@@ -1092,7 +1092,7 @@
+ g_module_close (pModule);
+ }
+ }
+- gs_free (pDev->memory->non_gc_memory, pszDeviceLib, strlen (pszDeviceLib) + 1, 1, "Devicestring");
++ gs_free (gs_lib_ctx_get_non_gc_memory_t(), pszDeviceLib, strlen (pszDeviceLib) + 1, 1, "Devicestring");
+ }
+ }
+ else
+@@ -1107,13 +1107,13 @@
+
+ if (pDev->pcoreOmni->pszJobOptions)
+ {
+- gs_free (pDev->memory->non_gc_memory, pDev->pcoreOmni->pszJobOptions, strlen (pDev->pcoreOmni->pszJobOptions) + 1, 1, "Option String");
++ gs_free (gs_lib_ctx_get_non_gc_memory_t(), pDev->pcoreOmni->pszJobOptions, strlen (pDev->pcoreOmni->pszJobOptions) + 1, 1, "Option String");
+ pDev->pcoreOmni->pszJobOptions = 0;
+ }
+
+ iLength = strlen (pszSelectedJobProperties);
+
+- pDev->pcoreOmni->pszJobOptions = (char *)gs_malloc (pDev->memory->non_gc_memory, 1, iLength + 1, "Option String");
++ pDev->pcoreOmni->pszJobOptions = (char *)gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), 1, iLength + 1, "Option String");
+
+ strcpy (pDev->pcoreOmni->pszJobOptions, pszSelectedJobProperties);
+
+@@ -1375,7 +1375,7 @@
+ iBytesToAlloc += (iNumColors - 1) * sizeof (RGB2);
+ }
+
+- pbmi = (PBITMAPINFO2)gs_malloc (pDev->memory->non_gc_memory, 1, iBytesToAlloc, "Bmpi Memory");
++ pbmi = (PBITMAPINFO2)gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), 1, iBytesToAlloc, "Bmpi Memory");
+ if (!pbmi)
+ {
+ eprintf("<<<<<<<<<<<<<<<<<<<<<< ERROR >>>>>>>>>>>>>>>>>>>>>>>\n\n");
+@@ -1481,7 +1481,7 @@
+ }
+ }
+
+- pGSData = (byte *)gs_malloc (pDev->memory->non_gc_memory, uiBytesPerLine, 1, "bmp file buffer");
++ pGSData = (byte *)gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), uiBytesPerLine, 1, "bmp file buffer");
+
+ if (pGSData == 0)
+ /* can't allocate row buffer */
+@@ -1501,7 +1501,7 @@
+ pasyncDev->pDev->iVertDots,
+ 8000*1024); /*eight meg buffer */
+
+- pBitmapMem = (byte *) gs_malloc (pDev->memory->non_gc_memory, 1, uiBytesPerLine * ulBandLength, "Bitmap Memory");
++ pBitmapMem = (byte *) gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), 1, uiBytesPerLine * ulBandLength, "Bitmap Memory");
+
+ if(!pBitmapMem)
+ {
+@@ -1613,7 +1613,7 @@
+ {
+ if (prtMode.iBitCount < 16)
+ {
+- pMonoData = (byte *)gs_malloc (pDev->memory->non_gc_memory, 1, iYBand * ImageInfo.ulTrgBytesPerLine, "Mono Memory");
++ pMonoData = (byte *)gs_malloc (gs_lib_ctx_get_non_gc_memory_t(), 1, iYBand * ImageInfo.ulTrgBytesPerLine, "Mono Memory");
+
+ if (pMonoData)
+ {
+@@ -1661,7 +1661,7 @@
+ /* We're done with the mono band */
+ /* now free up the mono buffer so we can get clean data buffer if more lines are to be */
+ /* gray-scaled */
+- gs_free (pDev->memory->non_gc_memory, (char *)pMonoData, iYBand * ImageInfo.ulTrgBytesPerLine, 1, "Mono Memory");
++ gs_free (gs_lib_ctx_get_non_gc_memory_t(), (char *)pMonoData, iYBand * ImageInfo.ulTrgBytesPerLine, 1, "Mono Memory");
+
+ pMonoData = NULL;
+ }
+@@ -1709,11 +1709,11 @@
+
+ done:
+
+- gs_free (pDev->memory->non_gc_memory, (char *) pBitmapMem, uiBytesPerLine * ulBandLength, 1, "Bitmap Memory");
++ gs_free (gs_lib_ctx_get_non_gc_memory_t(), (char *) pBitmapMem, uiBytesPerLine * ulBandLength, 1, "Bitmap Memory");
+ dprintf ("Page Completed\n");
+
+- gs_free (pDev->memory->non_gc_memory, (char *)pGSData, uiBytesPerLine, 1, "bmp file buffer");
+- gs_free (pDev->memory->non_gc_memory, (char *)pbmi, uiBytesPerLine, 1, "Bpmi Memory");
++ gs_free (gs_lib_ctx_get_non_gc_memory_t(), (char *)pGSData, uiBytesPerLine, 1, "bmp file buffer");
++ gs_free (gs_lib_ctx_get_non_gc_memory_t(), (char *)pbmi, uiBytesPerLine, 1, "Bpmi Memory");
+
+ /******************************************************************/
+ /* Note: @@08162000 */
Modified: head/print/ghostscript9-agpl/pkg-plist
==============================================================================
--- head/print/ghostscript9/pkg-plist Tue Apr 23 05:11:57 2013 (r316307)
+++ head/print/ghostscript9-agpl/pkg-plist Sun Apr 28 16:59:29 2013 (r316733)
@@ -16,7 +16,6 @@ bin/lprsetup.sh
%%GS_pcl3%%bin/pcl3opts
bin/pdf2dsc
bin/pdf2ps
-bin/pdfopt
bin/pf2afm
bin/pfbtopfa
bin/pphs
@@ -483,7 +482,6 @@ lib/libgs.so.%%GS_VERSION%%
%%DATADIR%%/%%GS_VERSION%%/lib/wrfont.ps
%%DATADIR%%/%%GS_VERSION%%/lib/zeroline.ps
%%DATADIR%%/%%GS_VERSION%%/lib/pdf2dsc.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/pdfopt.ps
%%DATADIR%%/%%GS_VERSION%%/lib/gs_ce_e.ps
%%DATADIR%%/%%GS_VERSION%%/lib/gs_cmdl.ps
%%DATADIR%%/%%GS_VERSION%%/lib/gs_fform.ps
More information about the svn-ports-head
mailing list