[Midnightbsd-cvs] mports: print/ghostscript-gpl:

[laffer1 at midnightbsd.org]

Log Message:
-----------


Modified Files:
--------------
    mports/print/ghostscript-gpl:
        Makefile (r1.6 -> r1.7)
        Makefile.inc (r1.3 -> r1.4)

Added Files:
-----------
    mports/print/ghostscript-gpl/files:
        patch-alps:gdevalps.mak (r1.3)

Removed Files:
-------------
    mports/print/ghostscript-gpl/files:
        patch-src:genarch.c
        patch-src:unix-dll.mak

-------------- next part --------------
Index: Makefile.inc
===================================================================
RCS file: /home/cvs/mports/print/ghostscript-gpl/Makefile.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -L print/ghostscript-gpl/Makefile.inc -L print/ghostscript-gpl/Makefile.inc -u -r1.3 -r1.4
--- print/ghostscript-gpl/Makefile.inc
+++ print/ghostscript-gpl/Makefile.inc
@@ -1,6 +1,5 @@
-# $FreeBSD: ports/print/ghostscript-gpl/Makefile.inc,v 1.15 2006/03/07 08:27:20 ade Exp $
 # $MidnightBSD$
 
 GS_VERSION=	8.56
-GS_REVISION=	0
+GS_REVISION=	1
 GS_EPOCH=	0
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/print/ghostscript-gpl/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -L print/ghostscript-gpl/Makefile -L print/ghostscript-gpl/Makefile -u -r1.6 -r1.7
--- print/ghostscript-gpl/Makefile
+++ print/ghostscript-gpl/Makefile
@@ -66,6 +66,7 @@
 CONFLICTS=	ghostscript-afpl*
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+WANT_GNOME=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd6.0 \
 			--host=${ARCH}-portbld-freebsd6.0 \
 			--target=${ARCH}-portbld-freebsd6.0
@@ -112,7 +113,7 @@
 
 .if defined(WITH_SHLIB)
 .undef WITHOUT_X11
-USE_GNOME=	gtk20
+USE_GNOME+=	gtk20
 ALL_TARGET=	so pcl3opts
 INSTALL_TARGET=	soinstall
 USE_LDCONFIG=	yes
--- print/ghostscript-gpl/files/patch-src:genarch.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/genarch.c.orig	Wed Sep 20 04:00:23 2000
-+++ src/genarch.c	Wed Jun 20 04:05:36 2001
-@@ -40,6 +40,7 @@
-     fprintf(f, "\n\t /* ---------------- %s ---------------- */\n\n", str);
- }
- 
-+#ifndef __FreeBSD__
- private clock_t
- time_clear(char *buf, int bsize, int nreps)
- {
-@@ -50,6 +51,7 @@
- 	memset(buf, 0, bsize);
-     return clock() - t;
- }
-+#endif /* __FreeBSD__ */
- 
- private void
- define(FILE *f, const char *str)
-@@ -180,6 +182,7 @@
-     fprintf(f, "((unsigned long)~0L + (unsigned long)0)\n");
- #undef PRINT_MAX
- 
-+#ifndef __FreeBSD__
-     section(f, "Cache sizes");
- 
-     /*
-@@ -240,6 +243,7 @@
- 	}
- 	define_int(f, "ARCH_CACHE2_SIZE", bsize >> 1);
-     }
-+#endif /* __FreeBSD__ */
- 
-     section(f, "Miscellaneous");
- 
--- print/ghostscript-gpl/files/patch-src:unix-dll.mak
+++ /dev/null
@@ -1,60 +0,0 @@
---- src/unix-dll.mak.orig	Wed Sep 24 22:41:20 2003
-+++ src/unix-dll.mak	Wed Dec 10 19:25:49 2003
-@@ -46,11 +46,9 @@
- 
- # shared library
- GS_SONAME=lib$(GS).so
--GS_SONAME_MAJOR=$(GS_SONAME).$(GS_VERSION_MAJOR)
--GS_SONAME_MAJOR_MINOR= $(GS_SONAME).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR)
-+GS_SONAME_MAJOR=$(GS_SONAME).$(GS_SHLIB_VER)
- GS_SO=$(BINDIR)/$(GS_SONAME)
--GS_SO_MAJOR=$(GS_SO).$(GS_VERSION_MAJOR)
--GS_SO_MAJOR_MINOR=$(GS_SO_MAJOR).$(GS_VERSION_MINOR)
-+GS_SO_MAJOR=$(GS_SO).$(GS_SHLIB_VER)
- 
- # Shared object is built by redefining GS_XE in a recursive make.
- 
-@@ -58,24 +56,20 @@
- 
- $(GS_SO): $(GS_SO_MAJOR)
- 	$(RM_) $(GS_SO)
--	ln -s $(GS_SONAME_MAJOR_MINOR) $(GS_SO)
--
--$(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR)
--	$(RM_) $(GS_SO_MAJOR)
--	ln -s $(GS_SONAME_MAJOR_MINOR) $(GS_SO_MAJOR)
-+	ln -s $(GS_SONAME_MAJOR) $(GS_SO)
- 
- # Build the small Ghostscript loaders, with Gtk+ and without
- 
- $(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c
--	$(GLCC) -g `gtk-config --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `gtk-config --libs`
-+	$(GLCC) `pkg-config --cflags gtk+` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `pkg-config --libs gtk+`
- 
- $(GSSOC_XE): $(GS_SO) $(GLSRC)dxmainc.c
--	$(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS)
-+	$(GLCC) -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS)
- 
- # ------------------------- Recursive make targets ------------------------- #
- 
--SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared -Wl,-soname=$(GS_SONAME_MAJOR)'\
-- GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\
-+SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared -Wl,-soname,$(GS_SONAME_MAJOR)'\
-+ GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR)\
-  STDIO_IMPLEMENTATION=c\
-  DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\
-  BINDIR=$(BINDIR)/$(SOBINRELDIR)\
-@@ -104,11 +98,9 @@
- 	-mkdir -p $(libdir)
- 	$(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME)
- 	$(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME)
--	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR)
-+	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR) $(libdir)/$(GS_SONAME_MAJOR)
- 	$(RM_) $(libdir)/$(GS_SONAME)
--	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME)
--	$(RM_) $(libdir)/$(GS_SONAME_MAJOR)
--	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR)
-+	ln -s $(GS_SONAME_MAJOR) $(libdir)/$(GS_SONAME)
- 
- soinstall: install-so install-scripts install-data
-