Date: Mon, 13 Jan 2014 19:15:27 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339621 - in head/converters/fconv: . files Message-ID: <201401131915.s0DJFRfK025429@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Mon Jan 13 19:15:26 2014 New Revision: 339621 URL: http://svnweb.freebsd.org/changeset/ports/339621 Log: converters/fconv: Unbreak for root builds The previous commit enabled non-root builds to work, but broke builds by root instead. The ${GID} variable is blank when the user is root, so the replacement of "root" with ${GID} resulted in bad command. Just use ${BSD_INSTALL_PROGRAM} instead and revbump because the packaged binaries could be stripped now because of that. Commit covered by the "Just fix it" blanket. Added: head/converters/fconv/files/ head/converters/fconv/files/patch-Makefile (contents, props changed) Modified: head/converters/fconv/Makefile Modified: head/converters/fconv/Makefile ============================================================================== --- head/converters/fconv/Makefile Mon Jan 13 19:06:58 2014 (r339620) +++ head/converters/fconv/Makefile Mon Jan 13 19:15:26 2014 (r339621) @@ -3,7 +3,7 @@ PORTNAME= fconv PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= converters MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= chris @@ -11,12 +11,6 @@ MASTER_SITE_SUBDIR= chris MAINTAINER= chris@FreeBSD.org COMMENT= Converts DOS or Mac-style files to Unix format, and vice-versa -USES= uidfix - MAKE_ARGS+= INSTALLDIR=${STAGEDIR}${PREFIX}/bin -post-patch: - @${REINPLACE_CMD} 's/root/${UID}/g; s/wheel/${GID}/g' \ - ${WRKSRC}/Makefile - .include <bsd.port.mk> Added: head/converters/fconv/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/fconv/files/patch-Makefile Mon Jan 13 19:15:26 2014 (r339621) @@ -0,0 +1,11 @@ +--- Makefile.orig 2000-12-07 23:29:34.000000000 +0000 ++++ Makefile +@@ -40,7 +40,7 @@ man: + + install: links + .for TMPINS in ${LINKS} +- install -c -o root -g wheel -m 0755 ${TMPINS} ${INSTALLDIR} ++ ${BSD_INSTALL_PROGRAM} ${TMPINS} ${INSTALLDIR} + .endfor + + links:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401131915.s0DJFRfK025429>