From owner-freebsd-ports@FreeBSD.ORG Thu Nov 11 16:09:25 2004 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F017B16A4CE for ; Thu, 11 Nov 2004 16:09:25 +0000 (GMT) Received: from smtp1.jazztel.es (smtp1.jazztel.es [62.14.3.161]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24C9543D2D for ; Thu, 11 Nov 2004 16:09:25 +0000 (GMT) (envelope-from josemi@freebsd.jazztel.es) Received: from antivirus by smtp1.jazztel.es with antivirus id 1CSHW1-0007iR-00 for ports@freebsd.org Thu, 11 Nov 2004 17:09:41 +0100 Received: from [212.106.238.191] (helo=rguez.homeunix.net) by smtp1.jazztel.es with esmtp id 1CSHVz-0007fe-00 for ports@freebsd.org Thu, 11 Nov 2004 17:09:40 +0100 Received: from redesjm.local (orion.redesjm.local [192.168.254.16]) by rguez.homeunix.net (8.13.1/8.13.1) with ESMTP id iABG9K01001036 for ; Thu, 11 Nov 2004 17:09:20 +0100 (CET) (envelope-from freebsd@redesjm.local) Received: from localhost (localhost [[UNIX: localhost]]) by redesjm.local (8.13.1/8.13.1/Submit) id iABG9JDP049173 for ports@freebsd.org; Thu, 11 Nov 2004 17:09:19 +0100 (CET) (envelope-from freebsd@redesjm.local) From: Jose M Rodriguez To: ports@freebsd.org Date: Thu, 11 Nov 2004 17:09:18 +0100 User-Agent: KMail/1.7.1 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200411111709.19127.freebsd@redesjm.local> X-AntiVirus: checked by AntiVir Milter (version: 1.1; AVE: 6.28.0.12; VDF: 6.28.0.59; host: antares.redesjm.local) X-Virus-Scanned: by antivirus Subject: use ghostscript-gpl as default X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Nov 2004 16:09:26 -0000 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}