From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 28 11:00:37 2005 Return-Path: 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 13A9916A4CF for ; Fri, 28 Jan 2005 11:00:37 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCE4E43D45 for ; Fri, 28 Jan 2005 11:00:36 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id j0SB0aoM048392 for ; Fri, 28 Jan 2005 11:00:36 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id j0SB0a9m048379; Fri, 28 Jan 2005 11:00:36 GMT (envelope-from gnats) Resent-Date: Fri, 28 Jan 2005 11:00:36 GMT Resent-Message-Id: <200501281100.j0SB0a9m048379@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, Florent Thoumie Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 63F0516A4D6 for ; Fri, 28 Jan 2005 10:50:32 +0000 (GMT) Received: from gate.xbsd.org (xbsd.org [82.233.2.192]) by mx1.FreeBSD.org (Postfix) with ESMTP id A74E643D49 for ; Fri, 28 Jan 2005 10:50:31 +0000 (GMT) (envelope-from flz@xbsd.org) Received: from localhost (localhost.xbsd.org [127.0.0.1]) by gate.xbsd.org (Postfix) with ESMTP id C9D59119C2; Fri, 28 Jan 2005 11:51:31 +0100 (CET) Received: from gate.xbsd.org ([127.0.0.1]) by localhost (gate.xbsd.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 94232-03; Fri, 28 Jan 2005 11:51:23 +0100 (CET) Received: by gate.xbsd.org (Postfix, from userid 2001) id F0D3211996; Fri, 28 Jan 2005 11:51:22 +0100 (CET) Message-Id: <20050128105122.F0D3211996@gate.xbsd.org> Date: Fri, 28 Jan 2005 11:51:22 +0100 (CET) From: Florent Thoumie To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: papowell@astart.com Subject: ports/76789: Update port: sysutils/LPRngTool - fix packing list X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Florent Thoumie List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jan 2005 11:00:37 -0000 >Number: 76789 >Category: ports >Synopsis: Update port: sysutils/LPRngTool - fix packing list >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Jan 28 11:00:36 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Florent Thoumie >Release: FreeBSD 5.3-RELEASE i386 >Organization: Xbsd.org >Environment: System: FreeBSD gate.xbsd.org 5.3-RELEASE FreeBSD 5.3-RELEASE #2: Wed Nov 24 16:35:34 CET 2004 root@gate.xbsd.org:/usr/src/sys/i386/compile/GATE i386 >Description: Fix packing list. Respect SYSCONFDIR in pkg-plist. Remove useless test on PREFIX. Remove useless HAS_CONFIGURE's. Build log available at [1]. [1] http://www.xbsd.org/tb/logs/4-i386-freebsd/LPRngTool-1.3.2.log >How-To-Repeat: N/A >Fix: --- lprngtool.diff begins here --- diff -ruN LPRngTool.orig/Makefile LPRngTool/Makefile --- LPRngTool.orig/Makefile Fri Jan 28 10:37:36 2005 +++ LPRngTool/Makefile Fri Jan 28 11:43:42 2005 @@ -28,21 +28,18 @@ #RUN_DEPENDS= ifhp:${PORTSDIR}/print/ifhp -.if defined(PREFIX) - CONFIGURE_ARGS+= --prefix="${PREFIX}" -.endif .if defined(SYSCONFDIR) - CONFIGURE_ARGS+= --with-sysconfdir="${SYSCONFDIR}" +PLIST_SUB+= CWD="" SYSCONFDIR="${SYSCONFDIR:S,^/,,}" +.else +SYSCONFDIR= ${PREFIX}/etc +PLIST_SUB+= CWD="@comment " SYSCONFDIR="${SYSCONFDIR:S,^${PREFIX}/,,}" .endif -HAS_CONFIGURE= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes -HAS_CONFIGURE= yes - -CONFIGURE_ARGS+=\ - --with-spool_directory=/var/spool/lpd +CONFIGURE_ARGS+= --with-spool_directory=/var/spool/lpd \ + --with-sysconfdir="${SYSCONFDIR}" MAN1=lprngtool.1 @@ -60,5 +57,10 @@ exit 1; \ fi @${ECHO_MSG} "Configuring with '${CONFIGURE_ARGS}'" + +post-install: + @if [ ! -f ${SYSCONFDIR}/lprngtool.conf ]; then \ + ${CP} ${SYSCONFDIR}/lprngtool.conf.sample ${SYSCONFDIR}/lprngtool.conf; \ + fi .include diff -ruN LPRngTool.orig/pkg-plist LPRngTool/pkg-plist --- LPRngTool.orig/pkg-plist Fri Jan 28 10:37:36 2005 +++ LPRngTool/pkg-plist Fri Jan 28 10:37:46 2005 @@ -1,4 +1,3 @@ -etc/lprngtool.conf.sample bin/lprngtool libexec/filters/atalkprint libexec/filters/ncpprint @@ -7,3 +6,8 @@ libexec/filters/testpage.asc libexec/filters/testpage.ps libexec/filters/testpage-a4.ps +@unexec rmdir %D/libexec/filters 2> /dev/null || true +%%CWD%%@cwd / +@unexec if cmp -s %D/%%SYSCONFDIR%%/lprngtool.conf %D/%%SYSCONFDIR%%/lprngtool.conf.sample; then rm -f %D/%%SYSCONFDIR%%/lprngtool.conf; fi +%%SYSCONFDIR%%/lprngtool.conf.sample +@exec [ -f %B/lprngtool.conf ] || cp %B/%f %B/lprngtool.conf --- lprngtool.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: