- Strip library

- Silence patching
- Properly handle setuid binary
- Drop @dirrm* from plist

3 files changed, 36 insertions, 32 deletions

diff --git a/sysutils/torque/Makefile b/sysutils/torque/Makefile
index 2589869a6b7c..ca96446e8ee5 100644
--- a/sysutils/torque/Makefile
+++ b/sysutils/torque/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	torque
 PORTVERSION=	2.5.13
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	sysutils parallel
 MASTER_SITES=	http://www.adaptivecomputing.com/index.php?wpfb_dl=1643/
@@ -20,6 +20,7 @@ MAKE_ENV=	DESTDIR=${STAGEDIR}/${PREFIX}
 USE_RC_SUBR=	pbs_server pbs_sched pbs_mom
 SUB_FILES=	pkg-message torque-config
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
 
 CONFLICTS_INSTALL=	qstat-[0-9]* zh-qterm-[0-9]*
 
@@ -28,8 +29,8 @@ OPTIONS_DEFINE=	EXAMPLES
 .include <bsd.port.options.mk>
 
 pre-configure:
-	${REINPLACE_CMD} -E 's|ps[ \t]+-ef|ps -ax|g' ${WRKSRC}/torque.setup
-	${REINPLACE_CMD} -E 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -E 's|ps[ \t]+-ef|ps -ax|g' ${WRKSRC}/torque.setup
+	@${REINPLACE_CMD} -E 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/torque-config ${STAGEDIR}${PREFIX}/bin
diff --git a/sysutils/torque/files/patch-src_iff_Makefile.in b/sysutils/torque/files/patch-src_iff_Makefile.in
new file mode 100644
index 000000000000..69e87befc803
--- /dev/null
+++ b/sysutils/torque/files/patch-src_iff_Makefile.in
@@ -0,0 +1,10 @@
+--- src/iff/Makefile.in.orig	2013-08-01 16:10:01 UTC
++++ src/iff/Makefile.in
+@@ -607,7 +607,6 @@ uninstall-am: uninstall-info-am uninstal
+ 
+ 
+ install-exec-hook:
+-	chmod u+s $(DESTDIR)$(sbindir)/$(program_prefix)pbs_iff$(program_suffix)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/sysutils/torque/pkg-plist b/sysutils/torque/pkg-plist
index b8873a46f002..9b7e9b4f4493 100644
--- a/sysutils/torque/pkg-plist
+++ b/sysutils/torque/pkg-plist
@@ -138,7 +138,7 @@ man/man8/qstop.8.gz
 man/man8/qterm.8.gz
 sbin/momctl
 sbin/pbs_demux
-sbin/pbs_iff
+@(root,wheel,4755) sbin/pbs_iff
 sbin/pbs_mom
 sbin/pbs_sched
 sbin/pbs_server
@@ -153,31 +153,24 @@ sbin/qserverd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/sched_priv/sched_config
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/server_name
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/server_priv/nodes
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/undelivered
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/spool
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/queues
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/jobs
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/hostlist
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/disallowed_types
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/credentials
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/arrays
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_users
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_svr
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_hosts
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_groups
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/accounting
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_logs
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_priv/accounting
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_priv
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_logs
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_priv/jobs
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_priv
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_logs
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/job_logs
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/checkpoint
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/aux
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/var/spool/torque/undelivered
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/var/spool/torque/spool
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/var/spool/torque/server_priv/queues
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/var/spool/torque/server_priv/jobs
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/var/spool/torque/server_priv/hostlist
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/var/spool/torque/server_priv/disallowed_types
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/var/spool/torque/server_priv/credentials
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/var/spool/torque/server_priv/arrays
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_users
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_svr
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_hosts
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_groups
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/var/spool/torque/server_priv/accounting
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/var/spool/torque/server_logs
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/var/spool/torque/sched_priv/accounting
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/var/spool/torque/sched_logs
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/var/spool/torque/mom_priv/jobs
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/var/spool/torque/mom_logs
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/var/spool/torque/job_logs
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/var/spool/torque/checkpoint
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/var/spool/torque/aux