svn commit: r367236 - in head: benchmarks/tcpblast devel/configkit editors/tweak math/slatec net-im/chattahoochie net-mgmt/arpwatch net-mgmt/arpwatch/files net/urelay net/wackford-squeers sysutils/...

Antoine Brodin antoine at FreeBSD.org
Wed Sep 3 21:07:21 UTC 2014 

Author: antoine
Date: Wed Sep  3 21:07:17 2014
New Revision: 367236
URL: http://svnweb.freebsd.org/changeset/ports/367236
QAT: https://qat.redports.org/buildarchive/r367236/

Log:
  Allow staging as a regular user

Modified:
  head/benchmarks/tcpblast/Makefile
  head/devel/configkit/Makefile
  head/editors/tweak/Makefile
  head/math/slatec/Makefile
  head/net-im/chattahoochie/Makefile
  head/net-mgmt/arpwatch/Makefile
  head/net-mgmt/arpwatch/files/patch-Makefile.in
  head/net-mgmt/arpwatch/pkg-plist
  head/net/urelay/Makefile
  head/net/wackford-squeers/Makefile
  head/sysutils/ascpu/Makefile
  head/sysutils/asmon/Makefile
  head/sysutils/bsdmoted/Makefile
  head/sysutils/consolehm/Makefile

Modified: head/benchmarks/tcpblast/Makefile
==============================================================================
--- head/benchmarks/tcpblast/Makefile	Wed Sep  3 20:51:15 2014	(r367235)
+++ head/benchmarks/tcpblast/Makefile	Wed Sep  3 21:07:17 2014	(r367236)
@@ -12,6 +12,7 @@ COMMENT=	Measures the throughput of a TC
 
 PLIST_FILES=	bin/tcpblast
 
+USES=		uidfix
 WRKSRC=		${WRKDIR}/src
 
 do-extract:

Modified: head/devel/configkit/Makefile
==============================================================================
--- head/devel/configkit/Makefile	Wed Sep  3 20:51:15 2014	(r367235)
+++ head/devel/configkit/Makefile	Wed Sep  3 21:07:17 2014	(r367236)
@@ -16,7 +16,7 @@ COMMENT=	Somewhat prototypical facility 
 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>

Modified: head/editors/tweak/Makefile
==============================================================================
--- head/editors/tweak/Makefile	Wed Sep  3 20:51:15 2014	(r367235)
+++ head/editors/tweak/Makefile	Wed Sep  3 21:07:17 2014	(r367236)
@@ -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"
 

Modified: head/math/slatec/Makefile
==============================================================================
--- head/math/slatec/Makefile	Wed Sep  3 20:51:15 2014	(r367235)
+++ head/math/slatec/Makefile	Wed Sep  3 21:07:17 2014	(r367236)
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	slatec_src.tgz slatec_chk.
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	SLATEC Common Mathematical Library
 
-USES=		fortran
+USES=		fortran uidfix
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/src
 SHLIB_MAJOR=	1

Modified: head/net-im/chattahoochie/Makefile
==============================================================================
--- head/net-im/chattahoochie/Makefile	Wed Sep  3 20:51:15 2014	(r367235)
+++ head/net-im/chattahoochie/Makefile	Wed Sep  3 21:07:17 2014	(r367236)
@@ -9,4 +9,7 @@ MASTER_SITES=	http://www.mammothcheese.c
 MAINTAINER=	jimmy at 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>

Modified: head/net-mgmt/arpwatch/Makefile
==============================================================================
--- head/net-mgmt/arpwatch/Makefile	Wed Sep  3 20:51:15 2014	(r367235)
+++ head/net-mgmt/arpwatch/Makefile	Wed Sep  3 21:07:17 2014	(r367236)
@@ -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

Modified: head/net-mgmt/arpwatch/files/patch-Makefile.in
==============================================================================
--- head/net-mgmt/arpwatch/files/patch-Makefile.in	Wed Sep  3 20:51:15 2014	(r367235)
+++ head/net-mgmt/arpwatch/files/patch-Makefile.in	Wed Sep  3 21:07:17 2014	(r367236)
@@ -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

Modified: head/net-mgmt/arpwatch/pkg-plist
==============================================================================
--- head/net-mgmt/arpwatch/pkg-plist	Wed Sep  3 20:51:15 2014	(r367235)
+++ head/net-mgmt/arpwatch/pkg-plist	Wed Sep  3 21:07:17 2014	(r367236)
@@ -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
- at dirrm arpwatch
+ at dirrm(,operator,0755) arpwatch

Modified: head/net/urelay/Makefile
==============================================================================
--- head/net/urelay/Makefile	Wed Sep  3 20:51:15 2014	(r367235)
+++ head/net/urelay/Makefile	Wed Sep  3 21:07:17 2014	(r367236)
@@ -9,6 +9,7 @@ MASTER_SITES=	http://devel.ringlet.net/n
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	UCSPI-based TCP forwarder
 
+USES=		uidfix
 PLIST_FILES=	bin/urelay \
 		man/man1/urelay.1.gz
 

Modified: head/net/wackford-squeers/Makefile
==============================================================================
--- head/net/wackford-squeers/Makefile	Wed Sep  3 20:51:15 2014	(r367235)
+++ head/net/wackford-squeers/Makefile	Wed Sep  3 21:07:17 2014	(r367236)
@@ -11,4 +11,7 @@ COMMENT=	Plain text network hypertext se
 
 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>

Modified: head/sysutils/ascpu/Makefile
==============================================================================
--- head/sysutils/ascpu/Makefile	Wed Sep  3 20:51:15 2014	(r367235)
+++ head/sysutils/ascpu/Makefile	Wed Sep  3 21:07:17 2014	(r367236)
@@ -18,10 +18,10 @@ CONFIGURE_ARGS=	--with-xpm-includes=${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>

Modified: head/sysutils/asmon/Makefile
==============================================================================
--- head/sysutils/asmon/Makefile	Wed Sep  3 20:51:15 2014	(r367235)
+++ head/sysutils/asmon/Makefile	Wed Sep  3 21:07:17 2014	(r367236)
@@ -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>

Modified: head/sysutils/bsdmoted/Makefile
==============================================================================
--- head/sysutils/bsdmoted/Makefile	Wed Sep  3 20:51:15 2014	(r367235)
+++ head/sysutils/bsdmoted/Makefile	Wed Sep  3 21:07:17 2014	(r367236)
@@ -9,6 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	sahne at 0x90.at
 COMMENT=	Use Wii remote as mouse
 
+USES=		uidfix
 PLIST_FILES=	sbin/bsdmoted
 
 .include <bsd.port.mk>

Modified: head/sysutils/consolehm/Makefile
==============================================================================
--- head/sysutils/consolehm/Makefile	Wed Sep  3 20:51:15 2014	(r367235)
+++ head/sysutils/consolehm/Makefile	Wed Sep  3 21:07:17 2014	(r367236)
@@ -13,6 +13,7 @@ COMMENT=	Console based hardware monitor 
 
 WRKSRC=		${WRKDIR}/consolehm/consolehm
 
+USES=		uidfix
 GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/chm man/man8/chm.8.gz

More information about the svn-ports-all mailing list