Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Nov 2004 17:09:18 +0100
From:      Jose M Rodriguez <josemi@freebsd.jazztel.es>
To:        ports@freebsd.org
Subject:   use ghostscript-gpl as default
Message-ID:  <200411111709.19127.freebsd@redesjm.local>

next in thread | raw e-mail | index | archive | help
Hi,
Can this patch break anything?

it makes ghostscript-gpl the default gs and add WITH_GHOSTSCRIPT_GNU

Also, I found a little issue with cups.

Thanks in advance,
--
  josemi

----- patch-gs-gpl

--- /usr/ports/Mk/bsd.port.mk Thu Oct  7 19:59:18 2004
+++ Mk/bsd.port.mk Tue Nov  9 13:01:42 2004
@@ -247,7 +247,10 @@
 #     versions for their nationality.
 # WITH_GHOSTSCRIPT_AFPL - If set to Yes, says to use the AFPL
 #     version of the ghostscript software instead
-#     of the GNU version, which is used otherwise.
+#     of the GPL version, which is used otherwise.
+# WITH_GHOSTSCRIPT_GNU - If set to Yes, says to use the GNU
+#     version of the ghostscript software instead
+#     of the GPL version, which is used otherwise.
 ##
 # USE_BISON  - Says that the port uses bison for building.
 ##
@@ -1606,23 +1609,19 @@
 # compatible functionality.
 .if !defined(WITHOUT_X11)
 .if defined(WITH_GHOSTSCRIPT_AFPL)
-.if ${WITH_GHOSTSCRIPT_AFPL} == yes
 GHOSTSCRIPT_PORT?= print/ghostscript-afpl
-.else
+.elif defined(WITH_GHOSTSCRIPT_GNU)
 GHOSTSCRIPT_PORT?= print/ghostscript-gnu
-.endif
 .else
-GHOSTSCRIPT_PORT?= print/ghostscript-gnu
+GHOSTSCRIPT_PORT?= print/ghostscript-gpl
 .endif
 .else
 .if defined(WITH_GHOSTSCRIPT_AFPL)
-.if ${WITH_GHOSTSCRIPT_AFPL} == yes
 GHOSTSCRIPT_PORT?= print/ghostscript-afpl-nox11
-.else
+.elif defined(WITH_GHOSTSCRIPT_GNU)
 GHOSTSCRIPT_PORT?= print/ghostscript-gnu-nox11
-.endif
 .else
-GHOSTSCRIPT_PORT?= print/ghostscript-gnu-nox11
+GHOSTSCRIPT_PORT?= print/ghostscript-gpl-nox11
 .endif
 .endif
 
----- patch-cups

diff -Nru /usr/ports/print/cups-pstoraster/Makefile 
print/cups-pstoraster/Makefile
--- /usr/ports/print/cups-pstoraster/Makefile Wed Feb  4 06:08:33 2004
+++ print/cups-pstoraster/Makefile Wed Nov 10 12:01:42 2004
@@ -20,7 +20,7 @@
 COMMENT= GNU Postscript interpreter for CUPS printing to non-PS 
printers
 
 LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-base
-RUN_DEPENDS= 
${LOCALBASE}/share/ghostscript/${PORTVERSION}/lib/gs_init.ps:
${PORTSDIR}/print/ghostscript-gnu
+USE_GHOSTSCRIPT_RUN=yes
 
 WRKSRC=  ${WRKDIR}/ghostscript-${PORTVERSION}
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411111709.19127.freebsd>