Date: Thu, 31 Oct 2013 09:17:48 GMT From: Kimmo Paasiala <kpaasial@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/183518: sysutils/kiconvtool installs an rc(8) script that references the stage directory instead of PREFIX Message-ID: <201310310917.r9V9HmjA089915@oldred.freebsd.org> Resent-Message-ID: <201310310920.r9V9K1nf095745@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183518
>Category: ports
>Synopsis: sysutils/kiconvtool installs an rc(8) script that references the stage directory instead of PREFIX
>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: Thu Oct 31 09:20:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Kimmo Paasiala
>Release: FreeBSD 10.0-BETA2 stable/10
>Organization:
>Environment:
FreeBSD freebsd10.rdnzl.info 10.0-BETA2 FreeBSD 10.0-BETA2 #0 r257267: Mon Oct 28 22:42:23 EET 2013 kimmo@freebsd10.rdnzl.info:/usr/obj/usr/src/sys/GENERIC i386
>Description:
sysutils/kiconvtool install a kiconv.sh rc(8) script that incorrectly uses the stage directory path to the kiconvtool binary instead of the correct ${PREFIX}/sbin/ path.
>How-To-Repeat:
Install sysutils/kiconvtool and inspect the "command" variable in the ${PREFIX}/etc/rc.d/kiconv.sh script, it is set to the ${STAGEDIR}${PREFIX}/sbin instead of the correct ${PREFIX}/sbin.
>Fix:
Apply the attached patch that removes the incorrect PREFIX assignment from the port Makefile and adds support for DESTDIR to the actual Makefile of the software.
Patch attached with submission follows:
Index: Makefile
===================================================================
--- Makefile (revision 332203)
+++ Makefile (working copy)
@@ -12,8 +12,6 @@
USES= iconv # used by libkiconv, actually
-MAKE_ARGS= PREFIX="${STAGEDIR}${PREFIX}"
-
PLIST_FILES= sbin/${PORTNAME} etc/rc.d/kiconv \
man/man8/${PORTNAME}.8.gz
Index: files/patch-Makefile
===================================================================
--- files/patch-Makefile (revision 0)
+++ files/patch-Makefile (working copy)
@@ -0,0 +1,17 @@
+--- Makefile 2011-10-01 00:25:12.000000000 +0300
++++ Makefile.new 2013-10-31 10:47:12.000000000 +0200
+@@ -11,10 +11,10 @@
+ all: kiconvtool kiconv.sh
+
+ install: kiconvtool kiconv.sh
+- mkdir -p ${PREFIX}/sbin/ ${PREFIX}/etc/rc.d/ ${PREFIX}/man/man8/
+- ${BSD_INSTALL_PROGRAM} kiconvtool ${PREFIX}/sbin/
+- ${BSD_INSTALL_SCRIPT} kiconv.sh ${PREFIX}/etc/rc.d/kiconv
+- ${BSD_INSTALL_MAN} kiconvtool.8 ${PREFIX}/man/man8/
++ mkdir -p ${DESTDIR}${PREFIX}/sbin/ ${DESTDIR}${PREFIX}/etc/rc.d/ ${DESTDIR}${PREFIX}/man/man8/
++ ${BSD_INSTALL_PROGRAM} kiconvtool ${DESTDIR}${PREFIX}/sbin/
++ ${BSD_INSTALL_SCRIPT} kiconv.sh ${DESTDIR}${PREFIX}/etc/rc.d/kiconv
++ ${BSD_INSTALL_MAN} kiconvtool.8 ${DESTDIR}${PREFIX}/man/man8/
+
+ kiconvtool: kiconvtool.c
+ ${CC} ${CFLAGS} $> ${LIBS} -o $@
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310310917.r9V9HmjA089915>