Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 18 Sep 2014 20:35:42 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r368522 - in head/sysutils/symon: . files
Message-ID:  <201409182035.s8IKZgO2049053@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Thu Sep 18 20:35:42 2014
New Revision: 368522
URL: http://svnweb.freebsd.org/changeset/ports/368522
QAT: https://qat.redports.org/buildarchive/r368522/

Log:
  - Allow staging as a regular user
  - Create the _symon group

Added:
  head/sysutils/symon/files/patch-client__Makefile   (contents, props changed)
Deleted:
  head/sysutils/symon/files/patch-Makefile.inc
Modified:
  head/sysutils/symon/Makefile
  head/sysutils/symon/files/patch-symon__Makefile
  head/sysutils/symon/files/patch-symux__Makefile
  head/sysutils/symon/pkg-plist

Modified: head/sysutils/symon/Makefile
==============================================================================
--- head/sysutils/symon/Makefile	Thu Sep 18 20:32:47 2014	(r368521)
+++ head/sysutils/symon/Makefile	Thu Sep 18 20:35:42 2014	(r368522)
@@ -3,7 +3,7 @@
 
 PORTNAME=	symon
 PORTVERSION=	2.86
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://wpd.home.xs4all.nl/symon/philes/ \
 		${MASTER_SITE_LOCAL}
@@ -19,6 +19,7 @@ USE_PERL5=	build
 MAKE_JOBS_UNSAFE=	yes
 
 USERS=		_symon
+GROUPS=		_symon
 
 # Synonym for WITHOUT_SYMUX
 .if defined(WITHOUT_RRD)

Added: head/sysutils/symon/files/patch-client__Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/symon/files/patch-client__Makefile	Thu Sep 18 20:35:42 2014	(r368522)
@@ -0,0 +1,14 @@
+--- client/Makefile.orig	2009-06-28 18:40:28 UTC
++++ client/Makefile
+@@ -8,7 +8,7 @@
+ 	rm -f SymuxClient.cat3p
+ 
+ install: SymuxClient.pm SymuxClient.cat3p getsymonitem.pl
+-	${INSTALL} -d -m 555 -g ${INSTALLGROUPDIR} -o ${INSTALLUSER} ${PREFIX}/${CLIENTDIR}
+-	${INSTALL} -c -m 555 -g ${INSTALLGROUPFILE} -o ${INSTALLUSER} getsymonitem.pl      ${PREFIX}/${CLIENTDIR}/
+-	${INSTALL} -c -m 444 -g ${INSTALLGROUPFILE} -o ${INSTALLUSER} SymuxClient.pm       ${PREFIX}/${CLIENTDIR}/
+-	${INSTALL} -c -m 444 -g ${INSTALLGROUPFILE} -o ${INSTALLUSER} SymuxClient.cat3p    ${PREFIX}/${CLIENTDIR}/SymuxClient.0
++	${INSTALL} -d -m 755 ${PREFIX}/${CLIENTDIR}
++	${INSTALL} -c -m 555 getsymonitem.pl      ${PREFIX}/${CLIENTDIR}/
++	${INSTALL} -c -m 444 SymuxClient.pm       ${PREFIX}/${CLIENTDIR}/
++	${INSTALL} -c -m 444 SymuxClient.cat3p    ${PREFIX}/${CLIENTDIR}/SymuxClient.0

Modified: head/sysutils/symon/files/patch-symon__Makefile
==============================================================================
--- head/sysutils/symon/files/patch-symon__Makefile	Thu Sep 18 20:32:47 2014	(r368521)
+++ head/sysutils/symon/files/patch-symon__Makefile	Thu Sep 18 20:35:42 2014	(r368522)
@@ -1,18 +1,23 @@
---- symon/Makefile.orig	2012-05-02 16:30:09.240890321 +0600
-+++ symon/Makefile	2012-05-02 16:30:29.066896699 +0600
-@@ -30,13 +30,11 @@
+--- symon/Makefile.orig	2012-02-21 20:46:14 UTC
++++ symon/Makefile
+@@ -30,14 +30,12 @@
  	rm -f conf.h symon symon.cat8 symon.core ${OBJS}
  
  install: symon symon.8 symon.conf
 -	${INSTALL} -d -m 555 -g ${INSTALLGROUPDIR} -o ${INSTALLUSER} ${PREFIX}/${BINDIR}
- 	${INSTALL} -c -m 555 -g ${INSTALLGROUPFILE} -o ${INSTALLUSER} symon      ${PREFIX}/${BINDIR}/
+-	${INSTALL} -c -m 555 -g ${INSTALLGROUPFILE} -o ${INSTALLUSER} symon      ${PREFIX}/${BINDIR}/
 -	${INSTALL} -d -m 555 -g ${INSTALLGROUPDIR} -o ${INSTALLUSER} ${PREFIX}/${MANDIR}/man8
- 	${INSTALL} -c -m 444 -g ${INSTALLGROUPFILE} -o ${INSTALLUSER} symon.8 ${PREFIX}/${MANDIR}/man8/symon.8
+-	${INSTALL} -c -m 444 -g ${INSTALLGROUPFILE} -o ${INSTALLUSER} symon.8 ${PREFIX}/${MANDIR}/man8/symon.8
 -	${INSTALL} -d -m 555 -g ${INSTALLGROUPDIR} -o ${INSTALLUSER} ${PREFIX}/${SHRDIR}
-+	${INSTALL} -d -m 755 -g ${INSTALLGROUPDIR} -o ${INSTALLUSER} ${PREFIX}/${SHRDIR}
- 	${INSTALL} -c -m 555 -g ${INSTALLGROUPFILE} -o ${INSTALLUSER} c_config.sh ${PREFIX}/${SHRDIR}/
+-	${INSTALL} -c -m 555 -g ${INSTALLGROUPFILE} -o ${INSTALLUSER} c_config.sh ${PREFIX}/${SHRDIR}/
 -	${INSTALL} -d -m 555 -g ${INSTALLGROUPDIR} -o ${INSTALLUSER} ${PREFIX}/${EXADIR}
-+	${INSTALL} -d -m 755 -g ${INSTALLGROUPDIR} -o ${INSTALLUSER} ${PREFIX}/${EXADIR}
- 	${INSTALL} -c -m 444 -g ${INSTALLGROUPFILE} -o ${INSTALLUSER} symon.conf ${PREFIX}/${EXADIR}/
+-	${INSTALL} -c -m 444 -g ${INSTALLGROUPFILE} -o ${INSTALLUSER} symon.conf ${PREFIX}/${EXADIR}/
++	${INSTALL} -c -m 555 symon      ${PREFIX}/${BINDIR}/
++	${INSTALL} -c -m 444 symon.8 ${PREFIX}/${MANDIR}/man8/symon.8
++	${INSTALL} -d -m 755 ${PREFIX}/${SHRDIR}
++	${INSTALL} -c -m 555 c_config.sh ${PREFIX}/${SHRDIR}/
++	${INSTALL} -d -m 755 ${PREFIX}/${EXADIR}
++	${INSTALL} -c -m 444 symon.conf ${PREFIX}/${EXADIR}/
  
  conf.h:  Makefile ../Makefile.inc
+ 	@echo Generating $@ on ${OS}

Modified: head/sysutils/symon/files/patch-symux__Makefile
==============================================================================
--- head/sysutils/symon/files/patch-symux__Makefile	Thu Sep 18 20:32:47 2014	(r368521)
+++ head/sysutils/symon/files/patch-symux__Makefile	Thu Sep 18 20:35:42 2014	(r368522)
@@ -1,18 +1,23 @@
---- symux/Makefile.orig	2012-05-02 16:31:32.062896190 +0600
-+++ symux/Makefile	2012-05-02 16:32:10.931897139 +0600
-@@ -19,13 +19,11 @@
+--- symux/Makefile.orig	2012-02-18 20:23:56 UTC
++++ symux/Makefile
+@@ -19,14 +19,12 @@
  	rm -f conf.h symux symux.cat8 symux.core ${OBJS}
  
  install: symux symux.8 c_smrrds.sh symux.conf
 -	${INSTALL} -d -m 555 -g ${INSTALLGROUPDIR} -o ${INSTALLUSER} ${PREFIX}/${BINDIR}
- 	${INSTALL} -c -m 555 -g ${INSTALLGROUPFILE} -o ${INSTALLUSER} symux	   ${PREFIX}/${BINDIR}/
+-	${INSTALL} -c -m 555 -g ${INSTALLGROUPFILE} -o ${INSTALLUSER} symux	   ${PREFIX}/${BINDIR}/
 -	${INSTALL} -d -m 555 -g ${INSTALLGROUPDIR} -o ${INSTALLUSER} ${PREFIX}/${MANDIR}/man8
- 	${INSTALL} -c -m 444 -g ${INSTALLGROUPFILE} -o ${INSTALLUSER} symux.8	   ${PREFIX}/${MANDIR}/man8/symux.8
+-	${INSTALL} -c -m 444 -g ${INSTALLGROUPFILE} -o ${INSTALLUSER} symux.8	   ${PREFIX}/${MANDIR}/man8/symux.8
 -	${INSTALL} -d -m 555 -g ${INSTALLGROUPDIR} -o ${INSTALLUSER} ${PREFIX}/${SHRDIR}
-+	${INSTALL} -d -m 755 -g ${INSTALLGROUPDIR} -o ${INSTALLUSER} ${PREFIX}/${SHRDIR}
- 	${INSTALL} -c -m 544 -g ${INSTALLGROUPFILE} -o ${INSTALLUSER} c_smrrds.sh  ${PREFIX}/${SHRDIR}/
+-	${INSTALL} -c -m 544 -g ${INSTALLGROUPFILE} -o ${INSTALLUSER} c_smrrds.sh  ${PREFIX}/${SHRDIR}/
 -	${INSTALL} -d -m 555 -g ${INSTALLGROUPDIR} -o ${INSTALLUSER} ${PREFIX}/${EXADIR}
-+	${INSTALL} -d -m 755 -g ${INSTALLGROUPDIR} -o ${INSTALLUSER} ${PREFIX}/${EXADIR}
- 	${INSTALL} -c -m 444 -g ${INSTALLGROUPFILE} -o ${INSTALLUSER} symux.conf   ${PREFIX}/${EXADIR}/
+-	${INSTALL} -c -m 444 -g ${INSTALLGROUPFILE} -o ${INSTALLUSER} symux.conf   ${PREFIX}/${EXADIR}/
++	${INSTALL} -c -m 555 symux	   ${PREFIX}/${BINDIR}/
++	${INSTALL} -c -m 444 symux.8	   ${PREFIX}/${MANDIR}/man8/symux.8
++	${INSTALL} -d -m 755 ${PREFIX}/${SHRDIR}
++	${INSTALL} -c -m 544 c_smrrds.sh  ${PREFIX}/${SHRDIR}/
++	${INSTALL} -d -m 755 ${PREFIX}/${EXADIR}
++	${INSTALL} -c -m 444 symux.conf   ${PREFIX}/${EXADIR}/
  
  cleanipc:
+ 	ipcs | egrep "^m" | awk '{print $$2}' | xargs -n1 ipcrm -m &

Modified: head/sysutils/symon/pkg-plist
==============================================================================
--- head/sysutils/symon/pkg-plist	Thu Sep 18 20:32:47 2014	(r368521)
+++ head/sysutils/symon/pkg-plist	Thu Sep 18 20:35:42 2014	(r368522)
@@ -12,4 +12,3 @@
 @dirrm share/symon/client
 @dirrm %%DATADIR%%
 @dirrm %%EXAMPLESDIR%%
-@unexec echo "Warning: If you will *NOT* use this package anymore, please remove the _symon user manually."



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409182035.s8IKZgO2049053>