On Sun, Jul 03, 2011 at 11:56:17PM +0200, Matthias Kilian wrote:
> > Yeah I think you can set things like:
> > FULLPKGNAME-cups = ghostscript-cup-${VERSION}
> > FULLPKGPATH-cups = print/ghostscript/gnu,-cups
>
> Cool, thanks.
>
> Here's my current udpate:
Next try... simpler than before (no subpackages). After I found a
separate gstoraster implementation (sent a few minutes ago), this
one would be the ghostscript update.
- Update to gs-9.02 to fix the google maps problem with pdf2ps.
- Drop gstoraster (formerly known as ps2raster); it will be replaced
by the new gstoraster package (sent in a separate mail).
- Also drop pstopxl, it's currently broken (at least since gs-9.00). If
anyone needs it, please let me know (or patch/repair it yourself
and send me a diff). Note that it would need rather heavy patching
or it had to depend on gnu grep.
This update, together with the new print/gstoraster, should make
it possible to let print/cups depend on print/gstoraster (and
recursively on print/ghostscript, of course). I've tried that update
path and there where not errors.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/Makefile,v
retrieving revision 1.83
diff -u -p -r1.83 Makefile
--- Makefile 8 Jun 2011 19:15:48 -0000 1.83
+++ Makefile 4 Jul 2011 21:03:10 -0000
@@ -2,10 +2,10 @@
COMMENT= GNU PostScript interpreter
-VERSION= 9.00
+VERSION= 9.02
DISTNAME= ghostscript-${VERSION}
CATEGORIES= print lang
-SHARED_LIBS= gs 12.0
+SHARED_LIBS= gs 13.0
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ghostscript/}
@@ -52,10 +52,6 @@ STDLIBS= -pthread -lm -liconv
MAKE_FLAGS= BINDIR=./obj \
CFLAGS_STANDARD='${CFLAGS} -fPIC' \
COMPILE_INITS=0 \
- CUPSCFLAGS="$$(cups-config --cflags)" \
- CUPSSERVERBIN="$$(cups-config --serverbin)" \
- CUPSSERVERROOT="$$(cups-config --serverroot)" \
- CUPSDATA="$$(cups-config --datadir)" \
DEVICE_DEVS='${DEVICES:C/.*/\$(DD)&.dev/}' \
EXTRALIBS="${EXTRALIBS}" \
FT_BRIDGE=${FT_BRIDGE} \
@@ -128,13 +124,13 @@ ERRORS+= "Fatal: Conflicting flavors: ${
.elif ${FLAVOR:L:Mgtk}
LIB_DEPENDS+= x11/gtk+2
MODULES+= devel/gettext
-WANTLIB+= Xau Xcomposite Xcursor Xdamage Xdmcp Xfixes Xi Xinerama
+WANTLIB+= GL Xcomposite Xcursor Xdamage Xfixes Xi Xinerama
WANTLIB+= Xrandr Xrender atk-1.0 cairo expat fontconfig freetype
WANTLIB+= gdk-x11-2.0>=1000 gdk_pixbuf-2.0>=1000 gio-2.0 glib-2.0
WANTLIB+= gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0>=1000
WANTLIB+= pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 pthread-stubs
-WANTLIB+= xcb xcb-render
-WANTLIB+= GL Xxf86vm drm xcb-shm
+WANTLIB+= xcb xcb-render xcb-shm
+WANTLIB+= ${MODGETTEXT_WANTLIB}
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
SOC_CFLAGS= $$(pkg-config gtk+-2.0 --cflags)
SOC_LIBS+= $$(pkg-config gtk+-2.0 --libs)
@@ -144,7 +140,7 @@ NOGTK_DEVICES=
.else
USE_GTK= No
GTK_DEVICES=
-NOGTK_DEVICES= display
+NOGTK_DEVICES= display
.endif
.if !${FLAVOR:L:Mno_x11}
@@ -170,12 +166,6 @@ post-extract:
cd ${WRKSRC} && mkdir junk && \
mv freetype ijs jpeg libpng jbig2dec tiff zlib junk
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/cups/pstoraster
-
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/cups/pstoraster
-
pre-build:
mkdir -p ${WRKDIST}/obj
@@ -210,8 +200,6 @@ post-install:
ln -sf ps2pdf.1 ps2pdf13.1 && \
ln -sf ps2pdf.1 ps2pdf14.1 && \
ln -sf ps2ps.1 eps2eps.1
- mv ${DESTDIR}/${SYSCONFDIR}/cups/*
${PREFIX}/share/ghostscript/${VERSION}/examples
- rm -rf ${DESTDIR}/${SYSCONFDIR}/cups
# Device list based on configure.ac:
# X_DEVS (skipping x11_ and x11alt_, since those are dependencies of
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo 8 Jun 2011 19:15:48 -0000 1.12
+++ distinfo 4 Jul 2011 21:03:10 -0000
@@ -1,5 +1,5 @@
-MD5 (ghostscript-9.00.tar.gz) = pAJGJHi0zdo+GBaJkie4RQ==
-RMD160 (ghostscript-9.00.tar.gz) = dx1dUX7lliyUSRSPJYx4RUmvP7Q=
-SHA1 (ghostscript-9.00.tar.gz) = ludWde+g8AgT8WCLosODP0EDuhk=
-SHA256 (ghostscript-9.00.tar.gz) = nnVMMV1o2Rpl7yCLmovaH7V+Rae+GKqTl6z8xf9Z3hY=
-SIZE (ghostscript-9.00.tar.gz) = 28050090
+MD5 (ghostscript-9.02.tar.gz) = hsw6BQnA2WpkHViHnVQnSw==
+RMD160 (ghostscript-9.02.tar.gz) = XlqvGz2b4MBolwaVbrXSoEOtEpU=
+SHA1 (ghostscript-9.02.tar.gz) = HYgx4Nwjxlj+Q8lx/xGVUH4bN4Y=
+SHA256 (ghostscript-9.02.tar.gz) = OcAMp8jHJAujsOyfNkEnez9yyMuxr1kn4JTOvCWba6g=
+SIZE (ghostscript-9.02.tar.gz) = 28145426
Index: patches/patch-base_devs_mak
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/patches/patch-base_devs_mak,v
retrieving revision 1.1
diff -u -p -r1.1 patch-base_devs_mak
--- patches/patch-base_devs_mak 8 Jun 2011 19:15:48 -0000 1.1
+++ patches/patch-base_devs_mak 4 Jul 2011 21:03:10 -0000
@@ -1,22 +1,22 @@
-$OpenBSD: patch-base_devs_mak,v 1.1 2011/06/08 19:15:48 kili Exp $
---- base/devs.mak.orig Thu Sep 9 05:45:12 2010
-+++ base/devs.mak Sun Sep 19 13:17:56 2010
-@@ -650,14 +650,13 @@ $(GLOBJ)gdevlj56.$(OBJ) : $(GLSRC)gdevlj56.c $(PDEVH)
+$OpenBSD$
+--- base/devs.mak.orig Thu Mar 10 01:58:08 2011
++++ base/devs.mak Tue Jun 28 16:38:49 2011
+@@ -1807,14 +1807,11 @@ $(DD)plibk.dev : $(DEVS_MAK) $(plib_) $(GLD)page.dev
+ $(SETPDEV2) $(DD)plibk $(plib_)
- ### -------------------- The ijs client ----------------- ###
+ ### ------------------------------- CUPS ------------------------------- ###
+-lcups_dev=$(LCUPSGENDIR)$(D)lcups.dev
+-lcupsi_dev=$(LCUPSIGENDIR)$(D)lcupsi.dev
+-
+ cups_=$(GLOBJ)gdevcups.$(OBJ)
+-$(DD)cups.dev : $(DEVS_MAK) $(lcups_dev) $(lcupsi_dev) $(cups_)
++$(DD)cups.dev : $(DEVS_MAK) $(cups_)
+ $(SETPDEV2) $(DD)cups $(cups_)
+- $(ADDMOD) $(DD)cups -include $(lcups_dev)
+- $(ADDMOD) $(DD)cups -include $(lcupsi_dev)
++ $(ADDMOD) $(DD)cups
++ $(ADDMOD) $(DD)cups
--ijs_=$(GLOBJ)gdevijs.$(OBJ) $(IJSOBJ)ijs.$(OBJ) $(IJSOBJ)ijs_client.$(OBJ) \
-- $(IJSOBJ)ijs_exec_$(IJSEXECTYPE).$(OBJ)
-+ijs_=$(GLOBJ)gdevijs.$(OBJ)
-
--$(DD)ijs.dev : $(ijs_) $(GLD)page.dev $(DD)ijslib.dev
-+$(DD)ijs.dev : $(ijs_) $(GLD)page.dev
- $(SETPDEV) $(DD)ijs $(ijs_)
-+ $(ADDMOD) $(DD)ijs -lib ijs
-
--$(GLOBJ)gdevijs.$(OBJ) : $(GLSRC)gdevijs.c $(PDEVH) $(unistd__h) $(gp_h)\
-- $(ijs_h) $(ijs_client_h)
-+$(GLOBJ)gdevijs.$(OBJ) : $(GLSRC)gdevijs.c $(PDEVH) $(unistd__h) $(gp_h)
- $(CC_) $(I_)$(GLI_) $(II)$(IJSI_)$(_I) $(GLF_) $(GLO_)gdevijs.$(OBJ)
$(C_) $(GLSRC)gdevijs.c
-
- # Please see ijs.mak for the Makefile fragment which builds the IJS
+ $(GLOBJ)gdevcups.$(OBJ) : cups$(D)gdevcups.c $(std_h)
+- $(CUPS_CC) $(GLO_)gdevcups.$(OBJ) $(C_) $(CFLAGS) $(I_)$(GLSRC)
$(I_)$(GLOBJ) $(I_)$(LCUPSSRCDIR)$(D)libs $(LCUPSSRCDIR)$(D)gdevcups.c
++ $(GLCC) $(GLO_)gdevcups.$(OBJ) $(C_) $(CFLAGS) $(I_)$(GLSRC)
$(I_)$(GLOBJ) cups$(D)gdevcups.c
Index: patches/patch-base_ijs_mak
===================================================================
RCS file: patches/patch-base_ijs_mak
diff -N patches/patch-base_ijs_mak
--- patches/patch-base_ijs_mak 8 Jun 2011 19:15:48 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-base_ijs_mak,v 1.1 2011/06/08 19:15:48 kili Exp $
---- base/ijs.mak.orig Wed Jun 6 00:23:38 2007
-+++ base/ijs.mak Fri Sep 14 21:11:40 2007
-@@ -18,6 +18,8 @@
- # in spawning the server. currently
- # 'unix' and 'win' are supported.
- # BINDIR - where to put the executible examples
-+# SHARE_IJS - 0 to compile the library, 1 to share
-+# IJS_NAME - if SHARE_IJS = 1, the name of the shared library
-
- # This partial makefile compiles the IJS client library for use in
- # Ghostscript.
-@@ -51,9 +53,19 @@ ijs.config-clean :
-
- IJSDEP=$(AK)
-
-+# Define the version of ijslib.dev that we are actually using.
-+$(IJSGEN)ijslib.dev : $(TOP_MAKEFILES) $(IJSGEN)ijslib_$(SHARE_IJS).dev
-+ $(CP_) $(IJSGEN)ijslib_$(SHARE_IJS).dev $(IJSGEN)ijslib.dev
-+
-+# Define the shared version of libpng.
-+# Note that it requires libz, which must be searched *after* libpng.
-+$(IJSGEN)ijslib_1.dev : $(TOP_MAKEFILES) $(IJS_MAK) $(ECHOGS_XE)
-+ $(SETMOD) $(IJSGEN)ijslib_1 -lib $(IJS_NAME)
-+
-+# Define the non-shared version of ijslib.
- ijslib_=$(IJSOBJ)ijs.$(OBJ) $(IJSOBJ)ijs_server.$(OBJ) \
- $(IJSOBJ)ijs_client.$(OBJ) $(IJSOBJ)ijs_exec_$(IJSEXECTYPE).$(OBJ)
--$(IJSGEN)ijslib.dev : $(IJS_MAK) $(ECHOGS_XE) $(ijslib_)
-+$(IJSGEN)ijslib_0.dev : $(IJS_MAK) $(ECHOGS_XE) $(ijslib_)
- $(SETMOD) $(IJSGEN)ijslib $(ijslib_)
-
- ijs_h=$(IJSSRC)ijs.h
Index: patches/patch-base_unix-aux_mak
===================================================================
RCS file: patches/patch-base_unix-aux_mak
diff -N patches/patch-base_unix-aux_mak
--- patches/patch-base_unix-aux_mak 8 Jun 2011 19:15:48 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-base_unix-aux_mak,v 1.1 2011/06/08 19:15:48 kili Exp $
---- base/unix-aux.mak.orig Wed Mar 31 00:59:53 2010
-+++ base/unix-aux.mak Sun Sep 19 13:17:56 2010
-@@ -74,7 +74,7 @@ $(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS)
- $(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS)
- $(CCAUX) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c
-
--MKROMFS_OBJS=$(MKROMFS_ZLIB_OBJS) $(GLOBJ)gscdefs.$(OBJ)
$(GLOBJ)gsmisc.$(OBJ) \
-+MKROMFS_OBJS=$(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \
- $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gslibctx.$(OBJ) $(GLOBJ)gp_getnv.$(OBJ) \
- $(GLOBJ)gp_unix.$(OBJ) $(GLOBJ)gp_unifs.$(OBJ) $(GLOBJ)gp_unifn.$(OBJ) \
- $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ)
Index: patches/patch-base_unix-dll_mak
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/patches/patch-base_unix-dll_mak,v
retrieving revision 1.1
diff -u -p -r1.1 patch-base_unix-dll_mak
--- patches/patch-base_unix-dll_mak 8 Jun 2011 19:15:48 -0000 1.1
+++ patches/patch-base_unix-dll_mak 4 Jul 2011 21:03:10 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-base_unix-dll_mak,v 1.1 2011/06/08 19:15:48 kili Exp $
---- base/unix-dll.mak.orig Fri Jul 23 10:22:43 2010
-+++ base/unix-dll.mak Sun Nov 14 22:05:26 2010
+--- base/unix-dll.mak.orig Tue Jan 18 11:22:12 2011
++++ base/unix-dll.mak Tue Jun 28 13:50:10 2011
@@ -23,10 +23,6 @@
# export LD_LIBRARY_PATH=/insert-path-here/sobin
# export GS_LIB=/insert-path-here/lib
@@ -31,33 +31,40 @@ $OpenBSD: patch-base_unix-dll_mak,v 1.1
# shared library
GS_SONAME_BASE=lib$(GS)
-@@ -47,9 +47,9 @@ GS_SONAME_BASE=lib$(GS)
+@@ -47,16 +47,11 @@ GS_SONAME_BASE=lib$(GS)
# GNU/Linux
GS_SOEXT=so
GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT)
-GS_SONAME_MAJOR=$(GS_SONAME).$(GS_VERSION_MAJOR)
-GS_SONAME_MAJOR_MINOR=$(GS_SONAME).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR)
--LDFLAGS_SO=-shared -Wl,-soname=$(GS_SONAME_MAJOR)
+-#LDFLAGS_SO=-shared -Wl,-soname=$(GS_SONAME_MAJOR)
+GS_SONAME_MAJOR=$(GS_SONAME).$(basename $(LIBgs_VERSION))
+GS_SONAME_MAJOR_MINOR=$(GS_SONAME).$(LIBgs_VERSION)
+LDFLAGS_SO=-shared
+-# NOTE: the value of LD_SET_DT_SONAME for, for example, Solaris ld, must
contain the
+-# trailing space to separation it from the value of the option. For GNU ld and
+-# similar linkers it must containt the trailing "="
+-LDFLAGS_SO=-shared
-Wl,$(LD_SET_DT_SONAME)$(LDFLAGS_SO_PREFIX)$(GS_SONAME_MAJOR)
+
+-
# MacOS X
#GS_SOEXT=dylib
-@@ -77,25 +77,25 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR)
+ #GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT)
+@@ -83,25 +78,25 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR)
ln -s $(GS_SONAME_MAJOR_MINOR) $(GS_SO_MAJOR)
# Build the small Ghostscript loaders, with Gtk+ and without
-$(GSSOC_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
- $(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \
-- $(LDFLAGS) -L$(BINDIR) -l$(GS)
+- -L$(BINDIR) -l$(GS)
+$(GSSOC_XE): $(GS_SO) $(PSSRC)dxmainc.c
+ $(GLCC) -g $(SOC_CFLAGS) -o $(GSSOC_XE) $(PSSRC)dxmainc.c \
+ -L$(BINDIR) $(LDFLAGS) -l$(GS) $(SOC_LIBS)
-$(GSSOX_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
- $(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \
-- $(LDFLAGS) -L$(BINDIR) -l$(GS) $(SOC_LIBS)
+- -L$(BINDIR) -l$(GS) $(SOC_LIBS)
+$(GSSOX_XE): $(GS_SO) $(PSSRC)dxmain.c
+ $(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)dxmain.c \
+ -L$(BINDIR) $(LDFLAGS) -l$(GS) $(SOC_LIBS)
@@ -83,7 +90,7 @@ $OpenBSD: patch-base_unix-dll_mak,v 1.1
# Normal shared object
-@@ -104,8 +104,8 @@ so: SODIRS
+@@ -110,8 +105,8 @@ so: SODIRS
then echo "Warning: this target requires gmake";\
fi
$(MAKE) $(SODEFS) LDFLAGS='$(LDFLAGS)' CFLAGS='$(CFLAGS_STANDARD)
$(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) \
@@ -94,7 +101,7 @@ $OpenBSD: patch-base_unix-dll_mak,v 1.1
prefix=$(prefix)
$(MAKE) $(SODEFS) LDFLAGS='$(LDFLAGS)' CFLAGS='$(CFLAGS_STANDARD)
$(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) $(GSSOC) $(GSSOX)
-@@ -133,13 +133,11 @@ install-so: so
+@@ -139,13 +134,11 @@ install-so: so
-mkdir -p $(DESTDIR)$(bindir)
-mkdir -p $(DESTDIR)$(libdir)
-mkdir -p $(DESTDIR)$(gsincludedir)
@@ -111,7 +118,7 @@ $OpenBSD: patch-base_unix-dll_mak,v 1.1
$(INSTALL_DATA) $(PSSRC)iapi.h $(DESTDIR)$(gsincludedir)iapi.h
$(INSTALL_DATA) $(PSSRC)ierrors.h $(DESTDIR)$(gsincludedir)ierrors.h
$(INSTALL_DATA) $(GLSRC)gdevdsp.h $(DESTDIR)$(gsincludedir)gdevdsp.h
-@@ -148,17 +146,17 @@ soinstall: install-so install-scripts install-data $(I
+@@ -154,17 +147,17 @@ soinstall: install-so install-scripts install-data $(I
# Make the build directories
SODIRS: STDDIRS
Index: patches/patch-base_unix-gcc_mak
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/patches/patch-base_unix-gcc_mak,v
retrieving revision 1.1
diff -u -p -r1.1 patch-base_unix-gcc_mak
--- patches/patch-base_unix-gcc_mak 8 Jun 2011 19:15:48 -0000 1.1
+++ patches/patch-base_unix-gcc_mak 4 Jul 2011 21:03:10 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-base_unix-gcc_mak,v 1.1 2011/06/08 19:15:48 kili Exp $
---- base/unix-gcc.mak.orig Wed Jul 7 19:47:09 2010
-+++ base/unix-gcc.mak Sun Sep 19 13:26:55 2010
+--- base/unix-gcc.mak.orig Thu Mar 3 21:23:43 2011
++++ base/unix-gcc.mak Mon Jul 4 17:21:25 2011
@@ -30,6 +30,7 @@ PSLIBDIR=./lib
PSRESDIR=./Resource
PSGENDIR=./obj
@@ -24,7 +24,7 @@ $OpenBSD: patch-base_unix-gcc_mak,v 1.1
# Define whether or not searching for initialization files should always
# look in the current directory first. This leads to well-known security
-@@ -199,6 +200,9 @@ LCMSSRCDIR=lcms
+@@ -201,6 +202,9 @@ IJS_NAME=
IJSSRCDIR=ijs
IJSEXECTYPE=unix
@@ -34,7 +34,7 @@ $OpenBSD: patch-base_unix-gcc_mak,v 1.1
# Define how to build the library archives. (These are not used in any
# standard configuration.)
-@@ -207,6 +211,11 @@ IJSEXECTYPE=unix
+@@ -209,6 +213,11 @@ IJSEXECTYPE=unix
IMDISRCDIR=imdi
@@ -46,7 +46,7 @@ $OpenBSD: patch-base_unix-gcc_mak,v 1.1
AR=ar
ARFLAGS=qc
RANLIB=ranlib
-@@ -215,7 +224,7 @@ RANLIB=ranlib
+@@ -217,7 +226,7 @@ RANLIB=ranlib
# Define the name of the C compiler.
@@ -55,7 +55,7 @@ $OpenBSD: patch-base_unix-gcc_mak,v 1.1
# Define the name of the linker for the final link step.
# Normally this is the same as the C compiler.
-@@ -364,8 +373,6 @@ DISPLAY_DEV=
+@@ -366,8 +375,6 @@ DISPLAY_DEV=
# Choose the device(s) to include. See devs.mak for details,
# devs.mak and contrib.mak for the list of available devices.
@@ -64,7 +64,7 @@ $OpenBSD: patch-base_unix-gcc_mak,v 1.1
#DEVICE_DEVS1=
#DEVICE_DEVS2=
#DEVICE_DEVS3=
-@@ -387,35 +394,14 @@ DEVICE_DEVS=$(DISPLAY_DEV) $(DD)x11.dev $(DD)x11alpha.
+@@ -389,35 +396,14 @@ DEVICE_DEVS=$(DISPLAY_DEV) $(DD)x11.dev $(DD)x11alpha.
#DEVICE_DEVS19=
#DEVICE_DEVS20=
@@ -78,7 +78,7 @@ $OpenBSD: patch-base_unix-gcc_mak,v 1.1
-DEVICE_DEVS8=$(DD)pcxmono.dev $(DD)pcxgray.dev $(DD)pcx16.dev $(DD)pcx256.dev
$(DD)pcx24b.dev $(DD)pcxcmyk.dev
-DEVICE_DEVS9=$(DD)pbm.dev $(DD)pbmraw.dev $(DD)pgm.dev $(DD)pgmraw.dev
$(DD)pgnm.dev $(DD)pgnmraw.dev $(DD)pnm.dev $(DD)pnmraw.dev $(DD)ppm.dev
$(DD)ppmraw.dev $(DD)pkm.dev $(DD)pkmraw.dev $(DD)pksm.dev $(DD)pksmraw.dev
-DEVICE_DEVS10=$(DD)tiffcrle.dev $(DD)tiffg3.dev $(DD)tiffg32d.dev
$(DD)tiffg4.dev $(DD)tifflzw.dev $(DD)tiffpack.dev
--DEVICE_DEVS11=$(DD)tiff12nc.dev $(DD)tiff24nc.dev $(DD)tiff48nc.dev
$(DD)tiffgray.dev $(DD)tiff32nc.dev $(DD)tiff64nc.dev $(DD)tiffsep.dev
$(DD)tiffsep1.dev
+-DEVICE_DEVS11=$(DD)tiff12nc.dev $(DD)tiff24nc.dev $(DD)tiff48nc.dev
$(DD)tiffgray.dev $(DD)tiff32nc.dev $(DD)tiff64nc.dev $(DD)tiffsep.dev
$(DD)tiffsep1.dev $(DD)tiffscaled.dev
-DEVICE_DEVS12=$(DD)psmono.dev $(DD)psgray.dev $(DD)psrgb.dev $(DD)bit.dev
$(DD)bitrgb.dev $(DD)bitcmyk.dev
-DEVICE_DEVS13=$(DD)pngmono.dev $(DD)pnggray.dev $(DD)png16.dev
$(DD)png256.dev $(DD)png16m.dev $(DD)pngalpha.dev
-DEVICE_DEVS14=$(DD)jpeg.dev $(DD)jpeggray.dev $(DD)jpegcmyk.dev
@@ -88,8 +88,8 @@ $OpenBSD: patch-base_unix-gcc_mak,v 1.1
-DEVICE_DEVS17=
-DEVICE_DEVS18=
-DEVICE_DEVS19=
--DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev
--DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev
$(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16m.dev $(DD)bmp32b.dev
$(DD)psdcmyk.dev $(DD)psdrgb.dev $(DD)pamcmyk32.dev
+-DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev $(DD)pamcmyk32.dev
$(DD)pamcmyk4.dev
+-DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev
$(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16m.dev $(DD)bmp32b.dev
$(DD)psdcmyk.dev $(DD)psdrgb.dev
-
# Shared library target to build.
# Note that the two vga devices are Linux specific, and requires svgalib
@@ -103,20 +103,19 @@ $OpenBSD: patch-base_unix-gcc_mak,v 1.1
# ---------------------------- End of options --------------------------- #
-@@ -456,6 +442,7 @@ include $(GLSRCDIR)/zlib.mak
- include $(GLSRCDIR)/libpng.mak
- include $(GLSRCDIR)/libtiff.mak
+@@ -460,6 +446,7 @@ include $(GLSRCDIR)/zlib.mak
+ include $(GLSRCDIR)/png.mak
+ include $(GLSRCDIR)/tiff.mak
include $(GLSRCDIR)/jbig2.mak
+include $(GLSRCDIR)/jasper.mak
include $(GLSRCDIR)/icclib.mak
include $(GLSRCDIR)/lcms.mak
include $(GLSRCDIR)/ijs.mak
-@@ -466,6 +453,8 @@ include $(GLSRCDIR)/unixlink.mak
+@@ -470,6 +457,7 @@ include $(GLSRCDIR)/unixlink.mak
include $(GLSRCDIR)/unix-dll.mak
include $(GLSRCDIR)/unix-end.mak
include $(GLSRCDIR)/unixinst.mak
+include contrib/contrib.mak
-+include cups/cups.mak
# This has to come last so it won't be taken as the default target.
$(AK):
Index: patches/patch-cups_cups_mak
===================================================================
RCS file: patches/patch-cups_cups_mak
diff -N patches/patch-cups_cups_mak
--- patches/patch-cups_cups_mak 8 Jun 2011 19:15:48 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-cups_cups_mak,v 1.1 2011/06/08 19:15:48 kili Exp $
---- cups/cups.mak.orig Wed May 5 05:08:00 2010
-+++ cups/cups.mak Sun Sep 19 13:34:05 2010
-@@ -56,7 +56,7 @@ $(PDFTORASTER_XE): $(pdftoraster_)
-
- install: install-cups
-
--install-cups: cups
-+install-cups:
- -mkdir -p $(DESTDIR)$(CUPSSERVERBIN)/filter
- $(INSTALL_PROGRAM) cups/pstoraster $(DESTDIR)$(CUPSSERVERBIN)/filter
- if [ "$(CUPSPDFTORASTER)" = "1" ]; then \
Index: patches/patch-cups_gdevcups_c
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/patches/patch-cups_gdevcups_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-cups_gdevcups_c
--- patches/patch-cups_gdevcups_c 8 Jun 2011 19:15:48 -0000 1.4
+++ patches/patch-cups_gdevcups_c 4 Jul 2011 21:03:10 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-cups_gdevcups_c,v 1.4 2011/06/08 19:15:48 kili Exp $
---- cups/gdevcups.c.orig Thu Aug 12 20:10:47 2010
-+++ cups/gdevcups.c Sun Sep 19 17:34:22 2010
+--- cups/gdevcups.c.orig Mon Mar 7 16:40:13 2011
++++ cups/gdevcups.c Tue Jun 28 13:37:01 2011
@@ -70,6 +70,7 @@
#include "gsparam.h"
#include "arch.h"
@@ -9,7 +9,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.4 20
#include <stdlib.h>
#include <ctype.h>
#include <cups/raster.h>
-@@ -221,6 +222,15 @@ typedef struct gx_device_cups_s
+@@ -227,6 +228,15 @@ typedef struct gx_device_cups_s
int cupsRasterVersion;
/* Used by cups_put_params(): */
@@ -25,10 +25,10 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.4 20
} gx_device_cups;
private gx_device_procs cups_procs =
-@@ -417,7 +427,14 @@ gx_device_cups gs_cups_device =
- { }, /* EncodeLUT */
- { }, /* Density */
- { }, /* Matrix */
+@@ -425,7 +435,14 @@ gx_device_cups gs_cups_device =
+ {0x00}, /* EncodeLUT */
+ {0x00}, /* Density */
+ {0x00}, /* Matrix */
- 3 /* cupsRasterVersion */
+ 3, /* cupsRasterVersion */
+ 0, /* libCupsReady */
@@ -41,7 +41,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.4 20
};
/*
-@@ -450,7 +467,7 @@ cups_close(gx_device *pdev) /* I - Device
info */
+@@ -458,7 +475,7 @@ cups_close(gx_device *pdev) /* I - Device
info */
if (cups->stream != NULL)
{
@@ -50,7 +50,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.4 20
close(fileno(cups->file));
cups->stream = NULL;
cups->file = NULL;
-@@ -2679,6 +2696,39 @@ cups_open(gx_device *pdev) /* I - Device
info */
+@@ -2687,6 +2704,39 @@ cups_open(gx_device *pdev) /* I - Device
info */
dprintf1("DEBUG2: cups_open(%p)\n", pdev);
#endif /* DEBUG */
@@ -90,7 +90,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.4 20
dprintf("INFO: Start rendering...\n");
cups->printer_procs.get_space_params = cups_get_space_params;
-@@ -2694,7 +2744,7 @@ cups_open(gx_device *pdev) /* I - Device
info */
+@@ -2702,7 +2752,7 @@ cups_open(gx_device *pdev) /* I - Device
info */
return (code);
if (cups->PPD == NULL)
@@ -99,7 +99,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.4 20
return (0);
}
-@@ -2791,7 +2841,7 @@ cups_print_pages(gx_device_printer *pdev,
+@@ -2799,7 +2849,7 @@ cups_print_pages(gx_device_printer *pdev,
if (cups->stream == NULL)
{
@@ -108,7 +108,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.4 20
if (RasterVersion) {
#ifdef DEBUG
dprintf1("DEBUG2: cupsRasterVersion = %s\n", RasterVersion->value);
-@@ -2804,7 +2854,7 @@ cups_print_pages(gx_device_printer *pdev,
+@@ -2812,7 +2862,7 @@ cups_print_pages(gx_device_printer *pdev,
return_error(gs_error_unknownerror);
}
}
@@ -117,7 +117,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.4 20
(cups->cupsRasterVersion == 3 ?
CUPS_RASTER_WRITE :
CUPS_RASTER_WRITE_COMPRESSED))) == NULL)
-@@ -2835,7 +2885,7 @@ cups_print_pages(gx_device_printer *pdev,
+@@ -2843,7 +2893,7 @@ cups_print_pages(gx_device_printer *pdev,
for (copy = num_copies; copy > 0; copy --)
{
@@ -126,7 +126,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.4 20
if (pdev->color_info.num_components == 1)
code = cups_print_chunked(pdev, src, dst, srcbytes);
-@@ -3130,7 +3180,7 @@ cups_put_params(gx_device *pdev, /* I - Device
inf
+@@ -3150,7 +3200,7 @@ cups_put_params(gx_device *pdev, /* I - Device
inf
dprintf1("DEBUG2: cups->PPD = %p\n", cups->PPD);
#endif /* DEBUG */
@@ -135,7 +135,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.4 20
if (backside) {
#ifdef DEBUG
dprintf1("DEBUG2: cupsBackSide = %s\n", backside->value);
-@@ -3142,7 +3192,7 @@ cups_put_params(gx_device *pdev, /* I - Device
inf
+@@ -3162,7 +3212,7 @@ cups_put_params(gx_device *pdev, /* I - Device
inf
#endif /* DEBUG */
backsiderequiresflippedmargins =
@@ -144,7 +144,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.4 20
#ifdef DEBUG
if (backsiderequiresflippedmargins)
dprintf1("DEBUG2: APDuplexRequiresFlippedMargin = %s\n",
-@@ -4061,7 +4111,7 @@ cups_print_chunked(gx_device_printer *pdev,
+@@ -4074,7 +4124,7 @@ cups_print_chunked(gx_device_printer *pdev,
#endif /* DEBUG */
if (cups->PPD) {
@@ -153,7 +153,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.4 20
if (backside) {
#ifdef DEBUG
dprintf1("DEBUG2: cupsBackSide = %s\n", backside->value);
-@@ -4238,7 +4288,7 @@ cups_print_chunked(gx_device_printer *pdev,
+@@ -4251,7 +4301,7 @@ cups_print_chunked(gx_device_printer *pdev,
* Write the bitmap data to the raster stream...
*/
@@ -162,7 +162,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.4 20
}
else
{
-@@ -4246,7 +4296,7 @@ cups_print_chunked(gx_device_printer *pdev,
+@@ -4259,7 +4309,7 @@ cups_print_chunked(gx_device_printer *pdev,
* Write the scanline data to the raster stream...
*/
@@ -171,7 +171,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.4 20
}
}
return (0);
-@@ -4288,7 +4338,7 @@ cups_print_banded(gx_device_printer *pdev,
+@@ -4301,7 +4351,7 @@ cups_print_banded(gx_device_printer *pdev,
#endif /* DEBUG */
if (cups->PPD) {
@@ -180,7 +180,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.4 20
if (backside) {
#ifdef DEBUG
dprintf1("DEBUG2: cupsBackSide = %s\n", backside->value);
-@@ -4959,7 +5009,7 @@ cups_print_banded(gx_device_printer *pdev,
+@@ -4972,7 +5022,7 @@ cups_print_banded(gx_device_printer *pdev,
* Write the bitmap data to the raster stream...
*/
@@ -189,7 +189,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.4 20
}
return (0);
}
-@@ -5331,7 +5381,7 @@ cups_print_planar(gx_device_printer *pdev,
+@@ -5344,7 +5394,7 @@ cups_print_planar(gx_device_printer *pdev,
* Write the bitmap data to the raster stream...
*/
Index: patches/patch-cups_pstoraster
===================================================================
RCS file: patches/patch-cups_pstoraster
diff -N patches/patch-cups_pstoraster
--- patches/patch-cups_pstoraster 2 Mar 2011 07:10:55 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-cups_pstoraster,v 1.1 2011/03/02 07:10:55 ajacoutot Exp $
---- cups/pstoraster.orig Tue Feb 22 13:29:14 2011
-+++ cups/pstoraster Tue Feb 22 13:29:27 2011
-@@ -27,7 +27,7 @@ exec_prefix=${prefix}
- bindir=${exec_prefix}/bin
-
- # Set the library/font path...
--GS_LIB="${CUPS_FONTPATH:=/usr/share/cups/fonts}"
-+GS_LIB="${CUPS_FONTPATH:=${LOCALBASE}/share/cups/fonts}"
- export GS_LIB
-
- # Options we use with Ghostscript...
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/pkg/PLIST,v
retrieving revision 1.19
diff -u -p -r1.19 PLIST
--- pkg/PLIST 8 Jun 2011 19:15:48 -0000 1.19
+++ pkg/PLIST 4 Jul 2011 21:03:10 -0000
@@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST,v 1.19 2011/06/08 19:15:48 kili Exp $
@pkgpath print/ghostscript/afpl${FLAVOR_STRING}
@pkgpath print/ghostscript/gnu${FLAVOR_STRING},cups
-@newgroup _cups:541
%%SHARED%%
bin/bdftops
bin/dumphint
@@ -22,6 +21,7 @@ bin/pdf2ps
bin/pdfopt
bin/pf2afm
bin/pfbtopfa
+bin/pphs
bin/printafm
bin/ps2ascii
bin/ps2epsi
@@ -35,10 +35,6 @@ bin/ps2ps2
bin/pv.sh
bin/unix-lpr.sh
bin/wftopfa
-libexec/cups/
-libexec/cups/filter/
-libexec/cups/filter/pstopxl
-libexec/cups/filter/pstoraster
man/de/
man/de/man1/
@man man/de/man1/dvipdf.1
@@ -81,10 +77,6 @@ man/de/man1/
@man man/man1/ps2pdfwr.1
@man man/man1/ps2ps.1
@man man/man1/wftopfa.1
-share/cups/
-share/cups/model/
-share/cups/model/pxlcolor.ppd
-share/cups/model/pxlmono.ppd
share/ghostscript/${VERSION}/
share/ghostscript/${VERSION}/Resource/
share/ghostscript/${VERSION}/Resource/CMap/
@@ -440,7 +432,6 @@ share/ghostscript/${VERSION}/Resource/In
share/ghostscript/${VERSION}/Resource/Init/gs_typ42.ps
share/ghostscript/${VERSION}/Resource/Init/gs_type1.ps
share/ghostscript/${VERSION}/Resource/Init/gs_wan_e.ps
-share/ghostscript/${VERSION}/Resource/Init/opdfread.ps
share/ghostscript/${VERSION}/Resource/Init/pdf_base.ps
share/ghostscript/${VERSION}/Resource/Init/pdf_cslayer.ps
share/ghostscript/${VERSION}/Resource/Init/pdf_draw.ps
@@ -498,19 +489,27 @@ share/ghostscript/${VERSION}/doc/Xfonts.
share/ghostscript/${VERSION}/doc/gs.css
share/ghostscript/${VERSION}/doc/index.html
share/ghostscript/${VERSION}/examples/
-@group _cups
-@sample ${SYSCONFDIR}/cups/
-@group
share/ghostscript/${VERSION}/examples/alphabet.ps
share/ghostscript/${VERSION}/examples/annots.pdf
share/ghostscript/${VERSION}/examples/chess.ps
+share/ghostscript/${VERSION}/examples/cjk/
+share/ghostscript/${VERSION}/examples/cjk/all_ac1.ps
+share/ghostscript/${VERSION}/examples/cjk/all_ag1.ps
+share/ghostscript/${VERSION}/examples/cjk/all_aj1.ps
+share/ghostscript/${VERSION}/examples/cjk/all_aj2.ps
+share/ghostscript/${VERSION}/examples/cjk/all_ak1.ps
+share/ghostscript/${VERSION}/examples/cjk/article9.ps
+share/ghostscript/${VERSION}/examples/cjk/gscjk_ac.ps
+share/ghostscript/${VERSION}/examples/cjk/gscjk_ag.ps
+share/ghostscript/${VERSION}/examples/cjk/gscjk_aj.ps
+share/ghostscript/${VERSION}/examples/cjk/gscjk_ak.ps
+share/ghostscript/${VERSION}/examples/cjk/iso2022.ps
+share/ghostscript/${VERSION}/examples/cjk/iso2022v.ps
share/ghostscript/${VERSION}/examples/colorcir.ps
share/ghostscript/${VERSION}/examples/doretree.ps
share/ghostscript/${VERSION}/examples/escher.ps
share/ghostscript/${VERSION}/examples/golfer.eps
share/ghostscript/${VERSION}/examples/grayalph.ps
-share/ghostscript/${VERSION}/examples/pstoraster.convs
-@sample ${SYSCONFDIR}/cups/pstoraster.convs
share/ghostscript/${VERSION}/examples/ridt91.eps
share/ghostscript/${VERSION}/examples/snowflak.ps
share/ghostscript/${VERSION}/examples/tiger.eps
@@ -618,7 +617,6 @@ share/ghostscript/${VERSION}/lib/pdfwrit
share/ghostscript/${VERSION}/lib/pf2afm.ps
share/ghostscript/${VERSION}/lib/pfbtopfa.ps
share/ghostscript/${VERSION}/lib/ppath.ps
-share/ghostscript/${VERSION}/lib/pphs
share/ghostscript/${VERSION}/lib/pphs.ps
share/ghostscript/${VERSION}/lib/prfont.ps
share/ghostscript/${VERSION}/lib/printafm.ps
