diff options
| author | marino <marino@FreeBSD.org> | 2014-01-14 03:15:26 +0800 |
|---|---|---|
| committer | marino <marino@FreeBSD.org> | 2014-01-14 03:15:26 +0800 |
| commit | e88c7a5873984e7003bdb107069680291af5a197 (patch) | |
| tree | abb6addce3da3c778cdd9847a0008b0da6ac265c /converters | |
| parent | 71be81ab38e7436337bc8efd3ff3aedf144b6ca7 (diff) | |
| download | freebsd-ports-graphics-e88c7a5873984e7003bdb107069680291af5a197.tar.gz freebsd-ports-graphics-e88c7a5873984e7003bdb107069680291af5a197.tar.zst freebsd-ports-graphics-e88c7a5873984e7003bdb107069680291af5a197.zip | |
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.
Diffstat (limited to 'converters')
| -rw-r--r-- | converters/fconv/Makefile | 8 | ||||
| -rw-r--r-- | converters/fconv/files/patch-Makefile | 11 |
2 files changed, 12 insertions, 7 deletions
diff --git a/converters/fconv/Makefile b/converters/fconv/Makefile index b945f4cfb52..a58c9057d1b 100644 --- a/converters/fconv/Makefile +++ b/converters/fconv/Makefile @@ -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> diff --git a/converters/fconv/files/patch-Makefile b/converters/fconv/files/patch-Makefile new file mode 100644 index 00000000000..3b3e7e96dbe --- /dev/null +++ b/converters/fconv/files/patch-Makefile @@ -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: |