Date: Fri, 28 Jan 2005 11:51:22 +0100 (CET) From: Florent Thoumie <flz@xbsd.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: papowell@astart.com Subject: ports/76789: Update port: sysutils/LPRngTool - fix packing list Message-ID: <20050128105122.F0D3211996@gate.xbsd.org> Resent-Message-ID: <200501281100.j0SB0a9m048379@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.mk> 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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050128105122.F0D3211996>