From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 17 17:20:41 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E3C4116B4F7 for ; Wed, 17 May 2006 17:20:41 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 14BD843D5D for ; Wed, 17 May 2006 17:20:23 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k4HHKNe0007630 for ; Wed, 17 May 2006 17:20:23 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k4HHKNN6007626; Wed, 17 May 2006 17:20:23 GMT (envelope-from gnats) Resent-Date: Wed, 17 May 2006 17:20:23 GMT Resent-Message-Id: <200605171720.k4HHKNN6007626@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Arseny Nasokin Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C43F016B483 for ; Wed, 17 May 2006 17:17:30 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A70943E10 for ; Wed, 17 May 2006 17:15:37 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k4HHFbmu088023 for ; Wed, 17 May 2006 17:15:37 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k4HHFbfC088022; Wed, 17 May 2006 17:15:37 GMT (envelope-from nobody) Message-Id: <200605171715.k4HHFbfC088022@www.freebsd.org> Date: Wed, 17 May 2006 17:15:37 GMT From: Arseny Nasokin To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: ports/97406: [PATCH] bsd.port.mk: ghostscript port detection refactoring X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 17:20:46 -0000 >Number: 97406 >Category: ports >Synopsis: [PATCH] bsd.port.mk: ghostscript port detection refactoring >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed May 17 17:20:22 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Arseny Nasokin >Release: FreeBSD-7.0 >Organization: CMC MSU >Environment: $FreeBSD: ports/Mk/bsd.port.mk,v 1.532 2006/05/02 10:09:23 netchild Exp $ >Description: detectng, which ghostscrpt port to use, is not efficient. >How-To-Repeat: see this make file. >Fix: --- bsd.port.mk.orig Wed May 17 21:00:14 2006 +++ bsd.port.mk Wed May 17 21:01:13 2006 @@ -1843,23 +1843,19 @@ # Set the default for the installation of Postscript(TM)- # compatible functionality. -.if !defined(WITHOUT_X11) +.if !defined(GHOSTSCRIPT_PORT) .if defined(WITH_GHOSTSCRIPT_AFPL) -GHOSTSCRIPT_PORT?= print/ghostscript-afpl +GHOSTSCRIPT_PORT= print/ghostscript-afpl .elif defined(WITH_GHOSTSCRIPT_GPL) -GHOSTSCRIPT_PORT?= print/ghostscript-gpl +GHOSTSCRIPT_PORT= print/ghostscript-gpl .else -GHOSTSCRIPT_PORT?= print/ghostscript-gnu -.endif -.else -.if defined(WITH_GHOSTSCRIPT_AFPL) -GHOSTSCRIPT_PORT?= print/ghostscript-afpl-nox11 -.elif defined(WITH_GHOSTSCRIPT_GPL) -GHOSTSCRIPT_PORT?= print/ghostscript-gpl-nox11 -.else -GHOSTSCRIPT_PORT?= print/ghostscript-gnu-nox11 +GHOSTSCRIPT_PORT= print/ghostscript-gnu .endif + +.if !defined(WITHOUT_X11) +GHOSTSCRIPT_PORT:= ${GHOSTSCRIPT_PORT}-nox11 .endif +.endif #!defined GHOSTSCRIPT_PORT # Set up the ghostscript dependencies. .if defined(USE_GHOSTSCRIPT) || defined(USE_GHOSTSCRIPT_BUILD) >Release-Note: >Audit-Trail: >Unformatted: