diff options
author | Antoine Brodin <antoine@FreeBSD.org> | 2014-09-03 21:07:17 +0000 |
---|---|---|
committer | Antoine Brodin <antoine@FreeBSD.org> | 2014-09-03 21:07:17 +0000 |
commit | 0090808295dbe0366733c7871468f154c19d17e8 (patch) | |
tree | cdbc504d12ee8db825712bef5ec2e47a54174d4a | |
parent | Forgot Makefile in last commit reviving mail/sqlgrey. (diff) |
Allow staging as a regular user
Notes
Notes:
svn path=/head/; revision=367236
-rw-r--r-- | benchmarks/tcpblast/Makefile | 1 | ||||
-rw-r--r-- | devel/configkit/Makefile | 2 | ||||
-rw-r--r-- | editors/tweak/Makefile | 1 | ||||
-rw-r--r-- | math/slatec/Makefile | 2 | ||||
-rw-r--r-- | net-im/chattahoochie/Makefile | 3 | ||||
-rw-r--r-- | net-mgmt/arpwatch/Makefile | 9 | ||||
-rw-r--r-- | net-mgmt/arpwatch/files/patch-Makefile.in | 19 | ||||
-rw-r--r-- | net-mgmt/arpwatch/pkg-plist | 2 | ||||
-rw-r--r-- | net/urelay/Makefile | 1 | ||||
-rw-r--r-- | net/wackford-squeers/Makefile | 3 | ||||
-rw-r--r-- | sysutils/ascpu/Makefile | 4 | ||||
-rw-r--r-- | sysutils/asmon/Makefile | 5 | ||||
-rw-r--r-- | sysutils/bsdmoted/Makefile | 1 | ||||
-rw-r--r-- | sysutils/consolehm/Makefile | 1 |
14 files changed, 32 insertions, 22 deletions
diff --git a/benchmarks/tcpblast/Makefile b/benchmarks/tcpblast/Makefile index 044cf4a9eb16..1a696c7e326d 100644 --- a/benchmarks/tcpblast/Makefile +++ b/benchmarks/tcpblast/Makefile @@ -12,6 +12,7 @@ COMMENT= Measures the throughput of a TCP connection PLIST_FILES= bin/tcpblast +USES= uidfix WRKSRC= ${WRKDIR}/src do-extract: diff --git a/devel/configkit/Makefile b/devel/configkit/Makefile index 1e09b6658bc1..de11ab365f8c 100644 --- a/devel/configkit/Makefile +++ b/devel/configkit/Makefile @@ -16,7 +16,7 @@ COMMENT= Somewhat prototypical facility for generating CLI interfaces BUILD_DEPENDS= ${LOCALBASE}/lib/libphk.a:${PORTSDIR}/devel/libphk WRKSRC= ${WRKDIR}/ConfigKit - +USES= uidfix MAKE_ARGS= BINDIR=${PREFIX}/bin LIBDIR=${PREFIX}/lib INCLUDEDIR=${PREFIX}/include .include <bsd.port.mk> diff --git a/editors/tweak/Makefile b/editors/tweak/Makefile index dc8207e6d505..2f831aac5de6 100644 --- a/editors/tweak/Makefile +++ b/editors/tweak/Makefile @@ -12,6 +12,7 @@ COMMENT= Efficient hex editor PLIST_FILES= bin/tweak \ man/man1/tweak.1.gz +USES= uidfix MAKEFILE= ${FILESDIR}/Makefile.in MAKE_ENV+= BINDIR="${LOCALBASE}/bin" MANDIR="${PREFIX}/man/man" diff --git a/math/slatec/Makefile b/math/slatec/Makefile index eddf721018ee..78bf315438cc 100644 --- a/math/slatec/Makefile +++ b/math/slatec/Makefile @@ -17,7 +17,7 @@ EXTRACT_ONLY= slatec_src.tgz slatec_chk.tgz MAINTAINER= ports@FreeBSD.org COMMENT= SLATEC Common Mathematical Library -USES= fortran +USES= fortran uidfix USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/src SHLIB_MAJOR= 1 diff --git a/net-im/chattahoochie/Makefile b/net-im/chattahoochie/Makefile index eac0fee2e29b..71b5de0b67b7 100644 --- a/net-im/chattahoochie/Makefile +++ b/net-im/chattahoochie/Makefile @@ -9,4 +9,7 @@ MASTER_SITES= http://www.mammothcheese.ca/ MAINTAINER= jimmy@mammothcheese.ca COMMENT= Small group plain-text chat server +MAKE_ENV= INSTALL_MAN="${INSTALL_MAN}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + INSTALL_SCRIPT="${INSTALL_SCRIPT}" + .include <bsd.port.mk> diff --git a/net-mgmt/arpwatch/Makefile b/net-mgmt/arpwatch/Makefile index 957182230f51..9bf0f6ffb1ee 100644 --- a/net-mgmt/arpwatch/Makefile +++ b/net-mgmt/arpwatch/Makefile @@ -16,7 +16,6 @@ LICENSE= BSD3CLAUSE GNU_CONFIGURE= yes CONFIGURE_ARGS= --quiet -MAKE_ENV+= BINOWN="${BINOWN}" BINGRP="${BINGRP}" INSTALL_TARGET= install install-man SUB_FILES= pkg-message @@ -27,13 +26,7 @@ MAKE_ARGS= ARPDIR=${ARPDIR} .endif post-install: - if [ ! -d ${STAGEDIR}${PREFIX}/arpwatch ]; then \ - ${MKDIR} ${STAGEDIR}${PREFIX}/arpwatch; \ - ${CHMOD} 755 ${STAGEDIR}${PREFIX}/arpwatch; \ - ${CHOWN} root:operator ${STAGEDIR}${PREFIX}/arpwatch; \ - fi - ${TOUCH} ${STAGEDIR}${PREFIX}/arpwatch/arp.dat - ${CHMOD} 644 ${STAGEDIR}${PREFIX}/arpwatch/arp.dat + ${MKDIR} ${STAGEDIR}${PREFIX}/arpwatch for files in ethercodes.dat d.awk duplicates.awk euppertolower.awk e.awk p.awk; do \ ${INSTALL_DATA} ${WRKSRC}/$$files ${STAGEDIR}${PREFIX}/arpwatch; \ done diff --git a/net-mgmt/arpwatch/files/patch-Makefile.in b/net-mgmt/arpwatch/files/patch-Makefile.in index e9e2f747c050..b5f40ae58f9f 100644 --- a/net-mgmt/arpwatch/files/patch-Makefile.in +++ b/net-mgmt/arpwatch/files/patch-Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.orig Thu Jun 15 02:39:55 2000 -+++ Makefile.in Tue Nov 14 15:28:00 2006 +--- Makefile.in.orig 2000-06-15 00:39:55 UTC ++++ Makefile.in @@ -31,7 +31,7 @@ # Pathname of directory to install the man page MANDEST = @mandir@ @@ -18,14 +18,21 @@ # Standard CFLAGS CFLAGS = $(CCOPT) $(DEFS) $(INCLS) -@@ -110,8 +110,8 @@ +@@ -110,13 +110,13 @@ $(CC) $(CFLAGS) -o $@ zap.o intoa.o -lutil install: force - $(INSTALL) -m 555 -o bin -g bin arpwatch $(DESTDIR)$(BINDEST) - $(INSTALL) -m 555 -o bin -g bin arpsnmp $(DESTDIR)$(BINDEST) -+ $(INSTALL) -s -m 555 -o $(BINOWN) -g $(BINGRP) arpwatch $(DESTDIR)$(BINDEST) -+ $(INSTALL) -s -m 555 -o $(BINOWN) -g $(BINGRP) arpsnmp $(DESTDIR)$(BINDEST) ++ $(BSD_INSTALL_PROGRAM) arpwatch $(DESTDIR)$(BINDEST) ++ $(BSD_INSTALL_PROGRAM) arpsnmp $(DESTDIR)$(BINDEST) install-man: force - $(INSTALL) -m 444 -o bin -g bin $(srcdir)/arpwatch.8 \ +- $(INSTALL) -m 444 -o bin -g bin $(srcdir)/arpwatch.8 \ ++ $(BSD_INSTALL_MAN) $(srcdir)/arpwatch.8 \ + $(DESTDIR)$(MANDEST)/man8 +- $(INSTALL) -m 444 -o bin -g bin $(srcdir)/arpsnmp.8 \ ++ $(BSD_INSTALL_MAN) $(srcdir)/arpsnmp.8 \ + $(DESTDIR)$(MANDEST)/man8 + + lint: $(GENSRC) force diff --git a/net-mgmt/arpwatch/pkg-plist b/net-mgmt/arpwatch/pkg-plist index 91455458ac9a..3ff0bc9759e6 100644 --- a/net-mgmt/arpwatch/pkg-plist +++ b/net-mgmt/arpwatch/pkg-plist @@ -12,4 +12,4 @@ sbin/arpsnmp sbin/arpwatch @unexec test -f %D/arpwatch/arp.dat && test -s %D/arpwatch/arp.dat || rm -f %D/arpwatch/arp.dat @exec test -f %D/arpwatch/arp.dat || touch %D/arpwatch/arp.dat -@dirrm arpwatch +@dirrm(,operator,0755) arpwatch diff --git a/net/urelay/Makefile b/net/urelay/Makefile index 6b6b50ab9a34..7a895a8a045c 100644 --- a/net/urelay/Makefile +++ b/net/urelay/Makefile @@ -9,6 +9,7 @@ MASTER_SITES= http://devel.ringlet.net/net/urelay/ MAINTAINER= ports@FreeBSD.org COMMENT= UCSPI-based TCP forwarder +USES= uidfix PLIST_FILES= bin/urelay \ man/man1/urelay.1.gz diff --git a/net/wackford-squeers/Makefile b/net/wackford-squeers/Makefile index b8b750650868..5b01c5381d3e 100644 --- a/net/wackford-squeers/Makefile +++ b/net/wackford-squeers/Makefile @@ -11,4 +11,7 @@ COMMENT= Plain text network hypertext server and client RUN_DEPENDS= ${LOCALBASE}/bin/munger:${PORTSDIR}/lang/munger +MAKE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}" INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + INSTALL_DATA="${INSTALL_DATA}" INSTALL_MAN="${INSTALL_MAN}" + .include <bsd.port.mk> diff --git a/sysutils/ascpu/Makefile b/sysutils/ascpu/Makefile index ffcde968be55..23b3b3c97ce4 100644 --- a/sysutils/ascpu/Makefile +++ b/sysutils/ascpu/Makefile @@ -18,10 +18,10 @@ CONFIGURE_ARGS= --with-xpm-includes=${LOCALBASE}/include --with-xpm-library=${LO LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV= EXTRA_LIBRARIES="-L${LOCALBASE}/lib" -PLIST_FILES= bin/ascpu man/man1/ascpu.1.gz +PLIST_FILES= "@(,kmem,2555) bin/ascpu" man/man1/ascpu.1.gz do-install: ${INSTALL_MAN} ${WRKSRC}/ascpu.man ${STAGEDIR}${PREFIX}/man/man1/ascpu.1 - ${INSTALL} ${STRIP} -o ${BINOWN} -g kmem -m 2755 ${WRKSRC}/ascpu ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/ascpu ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> diff --git a/sysutils/asmon/Makefile b/sysutils/asmon/Makefile index 296fe1a34f55..6aaac78aee2a 100644 --- a/sysutils/asmon/Makefile +++ b/sysutils/asmon/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv2 USE_XORG= xpm x11 -BUILD_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/asmon +BUILD_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/asmon CFLAGS+= -I${LOCALBASE}/include USES= gmake USE_CSTD= gnu89 @@ -23,13 +23,12 @@ ALL_TARGET= asmon MAKE_ARGS+= LIBDIR="-L${LOCALBASE}/lib" \ SOLARIS_LIBS=-lkvm -PLIST_FILES= bin/asmon +PLIST_FILES= "@(,kmem,) bin/asmon" post-patch: ${REINPLACE_CMD} -e 's:gcc:${CC} ${CFLAGS}:' ${BUILD_WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/asmon/asmon ${STAGEDIR}${PREFIX}/bin - ${CHGRP} kmem ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include <bsd.port.mk> diff --git a/sysutils/bsdmoted/Makefile b/sysutils/bsdmoted/Makefile index ceafd80bbff6..5ff4bff91d85 100644 --- a/sysutils/bsdmoted/Makefile +++ b/sysutils/bsdmoted/Makefile @@ -9,6 +9,7 @@ MASTER_SITES= SF MAINTAINER= sahne@0x90.at COMMENT= Use Wii remote as mouse +USES= uidfix PLIST_FILES= sbin/bsdmoted .include <bsd.port.mk> diff --git a/sysutils/consolehm/Makefile b/sysutils/consolehm/Makefile index 71e0ee777baf..324500da626e 100644 --- a/sysutils/consolehm/Makefile +++ b/sysutils/consolehm/Makefile @@ -13,6 +13,7 @@ COMMENT= Console based hardware monitor for FreeBSD WRKSRC= ${WRKDIR}/consolehm/consolehm +USES= uidfix GNU_CONFIGURE= yes PLIST_FILES= bin/chm man/man8/chm.8.gz |