mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-24 00:45:52 +00:00
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.
This commit is contained in:
parent
e1657aa13f
commit
d7f1d8f658
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=339621
@ -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>
|
||||
|
11
converters/fconv/files/patch-Makefile
Normal file
11
converters/fconv/files/patch-Makefile
Normal file
@ -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:
|
Loading…
Reference in New Issue
Block a user