Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 12 Oct 2014 16:46:23 +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: r370729 - head/games/conquest
Message-ID:  <201410121646.s9CGkNHq048411@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Sun Oct 12 16:46:23 2014
New Revision: 370729
URL: https://svnweb.freebsd.org/changeset/ports/370729
QAT: https://qat.redports.org/buildarchive/r370729/

Log:
  Allow staging as a regular user

Modified:
  head/games/conquest/Makefile
  head/games/conquest/pkg-plist

Modified: head/games/conquest/Makefile
==============================================================================
--- head/games/conquest/Makefile	Sun Oct 12 16:32:06 2014	(r370728)
+++ head/games/conquest/Makefile	Sun Oct 12 16:46:23 2014	(r370729)
@@ -32,11 +32,11 @@ post-patch:
 	${REINPLACE_CMD} "s/-O2 -fPIC//g" ${WRKSRC}/configure
 
 do-install:
-	${INSTALL_PROGRAM} -m 2550 ${WRKSRC}/conqai ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_PROGRAM} -m 2551 ${WRKSRC}/conqdriv ${STAGEDIR}${PREFIX}/libexec
-	${INSTALL_PROGRAM} -m 2551 ${WRKSRC}/conqoper ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/conqai ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/conqdriv ${STAGEDIR}${PREFIX}/libexec
+	${INSTALL_PROGRAM} ${WRKSRC}/conqoper ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/conqstrat ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_PROGRAM} -m 2551 ${WRKSRC}/conquest ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/conquest ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/conqrule ${STAGEDIR}${ETCDIR}/conqrule.sample
 	@${MKDIR} ${STAGEDIR}${DATADIR}
@@ -45,5 +45,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/conquest.doc ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}/var/games/conquest
 
 .include <bsd.port.mk>

Modified: head/games/conquest/pkg-plist
==============================================================================
--- head/games/conquest/pkg-plist	Sun Oct 12 16:32:06 2014	(r370728)
+++ head/games/conquest/pkg-plist	Sun Oct 12 16:46:23 2014	(r370729)
@@ -1,16 +1,13 @@
 @group conquest
-bin/conquest
-@unexec if cmp -s %D/etc/conquest/conqrule.sample %D/etc/conquest/conqrule ; then rm -f %D/etc/conquest/conqrule; fi
-etc/conquest/conqrule.sample
-@exec if [ ! -f %D/etc/conquest/conqrule ] ; then cp -p %D/%F %B/conqrule; fi
-libexec/conqdriv
-sbin/conqai
-sbin/conqoper
+@(,,2551) bin/conquest
+@sample etc/conquest/conqrule.sample
+@(,,2551) libexec/conqdriv
+@(,,2550) sbin/conqai
+@(,,2551) sbin/conqoper
 sbin/conqstrat
-@unexec if cmp -s %D/%%DATADIR%%/conqnews.doc.sample %D/%%DATADIR%%/conqnews.doc ; then rm -f %D/%%DATADIR%%/conqnews.doc; fi
-%%DATADIR%%/conqnews.doc.sample
-@exec if [ ! -f %D/%%DATADIR%%/conqnews.doc ] ; then cp -p %D/%F %B/conqnews.doc; fi
+@sample %%DATADIR%%/conqnews.doc.sample
 %%DATADIR%%/conquest.doc
-@dirrmtry etc/conquest
-@dirrmtry %%DATADIR%%
-@exec install -d -o root -g conquest -m 770 /var/games/conquest || true
+@dir etc/conquest
+@dir %%DATADIR%%
+@dir(,,770) /var/games/conquest
+@group



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