Set SPECIAL_PERMS and use user-destdir mode instead of privileged

destdir mode.

3 files changed, 15 insertions, 11 deletions

diff --git a/net/tcl-scotty/Makefile b/net/tcl-scotty/Makefile
index a1b41466aa7..a1936b08cc7 100644
--- a/net/tcl-scotty/Makefile
+++ b/net/tcl-scotty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2014/10/09 14:06:48 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2015/07/12 04:59:55 dholland Exp $
 #
 
 DISTNAME=	scotty-${DIST_VERS}
@@ -13,8 +13,6 @@ COMMENT=	Network management extensions to TCL
 
 LICENSE=	2-clause-bsd
 
-PKG_DESTDIR_SUPPORT= destdir
-
 DIST_VERS=	2.1.11
 
 CONFIGURE_DIRS=	unix
@@ -37,6 +35,9 @@ PLIST_SUBST+=	MACHINE="${MACHINE}"
 
 INSTALL_TARGET= tnm-install install-man sinstall
 
+SPECIAL_PERMS+=	bin/ntping ${SETUID_ROOT_PERMS}
+SPECIAL_PERMS+=	bin/straps ${SETUID_ROOT_PERMS}
+
 post-extract:
 	cd ${WRKSRC}/${BUILD_DIRS} && ${RM} -f ../doc/http.n
 	cd ${WRKSRC}/${BUILD_DIRS} && ${RM} -f ../doc/tkined.1
diff --git a/net/tcl-scotty/distinfo b/net/tcl-scotty/distinfo
index 459c3188ab0..56b32e18604 100644
--- a/net/tcl-scotty/distinfo
+++ b/net/tcl-scotty/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2014/10/08 15:50:18 he Exp $
+$NetBSD: distinfo,v 1.15 2015/07/12 04:59:55 dholland Exp $
 
 SHA1 (scotty-2.1.11.tar.gz) = 819011f908c57e4591d6f50e51677c01eb55dc13
 RMD160 (scotty-2.1.11.tar.gz) = 3b4d45f3db73f05b49a46017bf2ffed6d6464b00
@@ -38,7 +38,7 @@ SHA1 (patch-tnm_snmp_tnmSnmpRecv.c) = f55abae9975a7832e38e2754fe6e38e025eb6276
 SHA1 (patch-tnm_snmp_tnmSnmpSend.c) = 46c2b0f7c3d5f6392df96cba55b831ef763deeb7
 SHA1 (patch-tnm_snmp_tnmSnmpTcl.c) = 565d982a4e24e8033c4a16895ff503a3159a1a33
 SHA1 (patch-tnm_snmp_tnmSnmpUtil.c) = 9441f16f0be0f15689e9e628c3e96fc0c10bc942
-SHA1 (patch-unix-Makefile.in) = a20fcd84d99fb42772b6bbcfb5ee40ac779fa585
+SHA1 (patch-unix-Makefile.in) = f5aad7fb5537855e36fe2ea444e410a7f04334d8
 SHA1 (patch-unix_configure) = 6d2b4b522ba802d07c0bc8346330070ae7e0edea
 SHA1 (patch-unix_scotty.c) = fdb6a9bb414566ddb5317a3ebc60d2c305f611a7
 SHA1 (patch-unix_tnmUnixIcmp.c) = 86be48d8da9d77098662e7d2515193515a028e96
diff --git a/net/tcl-scotty/patches/patch-unix-Makefile.in b/net/tcl-scotty/patches/patch-unix-Makefile.in
index 10a5634c7ad..727025d9be5 100644
--- a/net/tcl-scotty/patches/patch-unix-Makefile.in
+++ b/net/tcl-scotty/patches/patch-unix-Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-unix-Makefile.in,v 1.2 2014/05/30 11:35:35 joerg Exp $
+$NetBSD: patch-unix-Makefile.in,v 1.3 2015/07/12 04:59:55 dholland Exp $
 
 Put installed files under lib/tcl, so that tcl more easily picks it
 up using e.g. "package require Tnm".
@@ -8,6 +8,8 @@ Don't initialize $(LD_SEARCH_FLAGS), fixes PR#30241.
 Support DESTDIR installs, but not yet for the "uninstall" target,
 since that's not used in pkgsrc.
 
+Use SPECIAL_PERMS instead of installing setuid directly.
+
 --- unix/Makefile.in.orig	2001-06-15 10:06:35.000000000 +0000
 +++ unix/Makefile.in
 @@ -35,13 +35,13 @@ LIB_INSTALL_DIR =       $(exec_prefix)/l
@@ -421,7 +423,7 @@ since that's not used in pkgsrc.
  		else true; \
  		fi; \
  	    done;
-@@ -661,44 +670,44 @@ tki-install-apps:
+@@ -661,44 +670,45 @@ tki-install-apps:
  	    do \
  	    echo "Installing $$i"; \
  	    base=`basename $$i`; \
@@ -465,7 +467,8 @@ since that's not used in pkgsrc.
  	    do \
  	    echo "Installing $$i"; \
 -	    $(INSTALL_PROGRAM) -o root -m 4755 $$i $(BIN_INSTALL_DIR)/$$i; \
-+	    $(INSTALL_PROGRAM) -o root -m 4555 $$i ${DESTDIR}/$(BIN_INSTALL_DIR)/$$i; \
++	    : $(INSTALL_PROGRAM) -o root -m 4555 $$i ${DESTDIR}/$(BIN_INSTALL_DIR)/$$i; \
++	    $(INSTALL_PROGRAM) $$i ${DESTDIR}/$(BIN_INSTALL_DIR)/$$i; \
  	    done
  
  uninstall: tnm-uninstall uninstall-man tki-uninstall
@@ -479,7 +482,7 @@ since that's not used in pkgsrc.
  	@for i in $(LIB_INSTALL_DIR)/tnm$(TNM_VERSION)/* ; \
  	    do \
  	    if [ "`basename $$i`" != "site" ] ; then \
-@@ -713,9 +722,9 @@ tnm-uninstall:
+@@ -713,9 +723,9 @@ tnm-uninstall:
  	    fi
  
  tki-uninstall:
@@ -491,7 +494,7 @@ since that's not used in pkgsrc.
  	@for i in $(LIB_INSTALL_DIR)/tkined$(TKI_VERSION)/* ; \
  	    do \
  	    if [ "`basename $$i`" != "site" ] ; then \
-@@ -750,7 +759,7 @@ clean:
+@@ -750,7 +760,7 @@ clean:
  	@rm -f $(TNM_OBJS) $(TKI_OBJS) scotty.o ntping.o straps.o
  	@rm -f tnmGdmoScan.c tnmGdmoParser.c tnmGdmoParser.h
  	@rm -f scotty ntping straps tkined
@@ -500,7 +503,7 @@ since that's not used in pkgsrc.
  	@rm -f core *_svc.c *~ *.bak so_locations lmake.???
  	@rm -f map.so tnmMap.o tnmMapUtil.o 
  	@rm -f tnmMapNode.o tnmMapClnt.o tnmMapAppl.o
-@@ -821,8 +830,8 @@ BIN_FILES =	$(BIN_INSTALL_DIR)/tkined$(T
+@@ -821,8 +831,8 @@ BIN_FILES =	$(BIN_INSTALL_DIR)/tkined$(T
  		$(MAN8_INSTALL_DIR)/straps.8 \
  		$(BIN_INSTALL_DIR)/ntping \
  		$(MAN8_INSTALL_DIR)/ntping.8 \