From owner-svn-ports-head@FreeBSD.ORG Mon May 11 00:43:08 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9421E5CA; Mon, 11 May 2015 00:43:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 82EA210DC; Mon, 11 May 2015 00:43:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4B0h8hN076735; Mon, 11 May 2015 00:43:08 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4B0h7A6076732; Mon, 11 May 2015 00:43:07 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201505110043.t4B0h7A6076732@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 11 May 2015 00:43:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386038 - in head/sysutils/torque: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 May 2015 00:43:08 -0000 Author: amdmi3 Date: Mon May 11 00:43:07 2015 New Revision: 386038 URL: https://svnweb.freebsd.org/changeset/ports/386038 Log: - Strip library - Silence patching - Properly handle setuid binary - Drop @dirrm* from plist Added: head/sysutils/torque/files/patch-src_iff_Makefile.in (contents, props changed) Modified: head/sysutils/torque/Makefile head/sysutils/torque/pkg-plist Modified: head/sysutils/torque/Makefile ============================================================================== --- head/sysutils/torque/Makefile Mon May 11 00:03:34 2015 (r386037) +++ head/sysutils/torque/Makefile Mon May 11 00:43:07 2015 (r386038) @@ -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 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 Added: head/sysutils/torque/files/patch-src_iff_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/torque/files/patch-src_iff_Makefile.in Mon May 11 00:43:07 2015 (r386038) @@ -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: Modified: head/sysutils/torque/pkg-plist ============================================================================== --- head/sysutils/torque/pkg-plist Mon May 11 00:03:34 2015 (r386037) +++ head/sysutils/torque/pkg-plist Mon May 11 00:43:07 2015 (r386038) @@ -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