svn commit: r341136 - in head/games/wolfpack: . files

Johan van Selst johans at FreeBSD.org
Sat Jan 25 23:08:40 UTC 2014


Author: johans
Date: Sat Jan 25 23:08:38 2014
New Revision: 341136
URL: http://svnweb.freebsd.org/changeset/ports/341136
QAT: https://qat.redports.org/buildarchive/r341136/

Log:
  Enable stage support

Added:
  head/games/wolfpack/files/patch-Make.mk   (contents, props changed)
Modified:
  head/games/wolfpack/Makefile
  head/games/wolfpack/pkg-plist

Modified: head/games/wolfpack/Makefile
==============================================================================
--- head/games/wolfpack/Makefile	Sat Jan 25 23:07:59 2014	(r341135)
+++ head/games/wolfpack/Makefile	Sat Jan 25 23:08:38 2014	(r341136)
@@ -27,11 +27,6 @@ GROUPS=		wolfpack
 USE_RC_SUBR=	wolfpack
 SUB_FILES+=	pkg-message
 
-MAN6=		empire.6 emp_server.6 empdump.6 empsched.6 \
-		fairland.6 files.6 pconfig.6
-
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 
 post-patch:
@@ -43,12 +38,13 @@ post-patch:
 .endif
 
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/README ${DATADIR}
-	@${LN} -s ${BINDIR}/emp_server ${PREFIX}/bin/emp_server
-	@${LN} -s ${BINDIR}/empire ${PREFIX}/bin/emp_client
-	@${PREFIX}/lib/wolfpack/pconfig > ${ETCDIR}/econfig.orig
-	@${CHOWN} -R ${USERS}:${GROUPS} ${DATADIR} ${ETCDIR} ${VARDIR}
-	@${CHMOD} -R u+w,o-rx ${DATADIR} ${ETCDIR} ${VARDIR}
-	@${CAT} ${WRKDIR}/pkg-message
+	@${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DATADIR}
+	@${LN} -s ${BINDIR}/emp_server ${STAGEDIR}${PREFIX}/bin/emp_server
+	@${LN} -s ${BINDIR}/empire ${STAGEDIR}${PREFIX}/bin/emp_client
+	@${PREFIX}/lib/wolfpack/pconfig > ${STAGEDIR}${ETCDIR}/econfig.orig
+	@${CHOWN} -R ${USERS}:${GROUPS} ${STAGEDIR}${DATADIR} \
+		${STAGEDIR}${ETCDIR} ${STAGEDIR}${VARDIR}
+	@${CHMOD} -R u+w,o-rx ${STAGEDIR}${DATADIR} \
+		${STAGEDIR}${ETCDIR} ${STAGEDIR}${VARDIR}
 
 .include <bsd.port.post.mk>

Added: head/games/wolfpack/files/patch-Make.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/wolfpack/files/patch-Make.mk	Sat Jan 25 23:08:38 2014	(r341136)
@@ -0,0 +1,82 @@
+--- Make.mk.orig	2013-08-01 21:40:42.000000000 +0200
++++ Make.mk	2014-01-26 00:04:27.000000000 +0100
+@@ -65,12 +65,12 @@ info := $(topics) $(subjects) all TOP
+ scripts := $(srcdir)/src/scripts
+ depcomp := $(SHELL) $(srcdir)/depcomp
+ tarball := $(SHELL) -e $(scripts)/tarball
+-econfig := $(sysconfdir)/empire/econfig
+-schedule := $(sysconfdir)/empire/schedule
+-gamedir := $(localstatedir)/empire
+-builtindir := $(datadir)/empire/builtin
+-einfodir := $(datadir)/empire/info.nr
+-ehtmldir := $(datadir)/empire/info.html
++econfig := $(sysconfdir)/wolfpack/econfig
++schedule := $(sysconfdir)/wolfpack/schedule
++gamedir := $(localstatedir)/wolfpack
++builtindir := $(datadir)/wolfpack/builtin
++einfodir := $(datadir)/wolfpack/info.nr
++ehtmldir := $(datadir)/wolfpack/info.html
+ client/w32 := arpa/inet.h netdb.h netinet/in.h sys/time.h sys/socket.h	\
+ sys/uio.h unistd.h w32io.c w32sockets.c w32types.h
+ 
+@@ -198,41 +198,41 @@ distclean: clean
+ 
+ .PHONY: install
+ install: all installdirs
+-	$(INSTALL_PROGRAM) $(util) $(server) $(sbindir)
+-	$(INSTALL_PROGRAM) $(client) $(bindir)
+-	$(INSTALL) -m 444 $(addprefix $(srcdir)/, $(builtins)) $(builtindir)
+-	$(INSTALL_DATA) $(info.nr) $(einfodir)
+-	$(INSTALL_DATA) $(addprefix $(srcdir)/, $(man6)) $(mandir)/man6
+-	sed -e '1,/^$$/d' -e 's/^/# /g' <$(srcdir)/doc/schedule >$(schedule).dist
+-	echo >>$(schedule).dist
+-	echo 'every 10 minutes' >>$(schedule).dist
+-	[ -e $(schedule) ] || mv $(schedule).dist $(schedule)
+-	if [ -e $(econfig) ]; then					\
++	$(INSTALL_PROGRAM) $(util) $(server) $(DESTDIR)$(sbindir)
++	$(INSTALL_PROGRAM) $(client) $(DESTDIR)$(bindir)
++	$(INSTALL) -m 444 $(addprefix $(srcdir)/, $(builtins)) $(DESTDIR)$(builtindir)
++	$(INSTALL_DATA) $(info.nr) $(DESTDIR)$(einfodir)
++	$(INSTALL_DATA) $(addprefix $(srcdir)/, $(man6)) $(DESTDIR)$(mandir)/man6
++	sed -e '1,/^$$/d' -e 's/^/# /g' <$(srcdir)/doc/schedule >$(DESTDIR)$(schedule).dist
++	echo >>$(DESTDIR)$(schedule).dist
++	echo 'every 10 minutes' >>$(DESTDIR)$(schedule).dist
++	[ -e $(DESTDIR)$(schedule) ] || mv $(DESTDIR)$(schedule).dist $(DESTDIR)$(schedule)
++	if [ -e $(DESTDIR)$(econfig) ]; then					\
+ 	    echo "Attempting to update your econfig";			\
+-	    if src/util/pconfig $(econfig) >$(econfig).dist; then	\
+-	        if cmp -s $(econfig) $(econfig).dist; then		\
++	    if src/util/pconfig $(DESTDIR)$(econfig) >$(DESTDIR)$(econfig).dist; then	\
++	        if cmp -s $(DESTDIR)$(econfig) $(DESTDIR)$(econfig).dist; then		\
+ 		    echo "$(econfig) unchanged";			\
+-		    rm $(econfig).dist;					\
++		    rm $(DESTDIR)$(econfig).dist;					\
+ 		fi;							\
+ 	    else							\
+ 		echo "Your $(econfig) doesn't work";			\
+-		src/util/pconfig >$(econfig).dist;			\
++		src/util/pconfig >$(DESTDIR)$(econfig).dist;			\
+ 	    fi;								\
+-	    if [ -e $(econfig).dist ]; then				\
++	    if [ -e $(DESTDIR)$(econfig).dist ]; then				\
+ 		echo "Check out $(econfig).dist";			\
+ 	    fi;								\
+ 	else								\
+-	    src/util/pconfig >$(econfig);				\
++	    src/util/pconfig >$(DESTDIR)$(econfig);				\
+ 	fi
+ 
+ .PHONY: installdirs
+ installdirs:
+-	mkdir -p $(sbindir) $(bindir) $(builtindir) $(einfodir) $(mandir)/man6 $(dir $(econfig)) $(gamedir)
++	mkdir -p $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir) $(DESTDIR)$(builtindir) $(DESTDIR)$(einfodir) $(DESTDIR)$(mandir)/man6 $(dir $(DESTDIR)$(econfig)) $(DESTDIR)$(gamedir)
+ 
+ .PHONY: install-html
+ install-html: html
+-	mkdir -p $(ehtmldir)
+-	$(INSTALL_DATA) $(info.html) $(ehtmldir)
++	mkdir -p $(DESTDIR)$(ehtmldir)
++	$(INSTALL_DATA) $(info.html) $(DESTDIR)$(ehtmldir)
+ 
+ .PHONY: uninstall
+ uninstall:

Modified: head/games/wolfpack/pkg-plist
==============================================================================
--- head/games/wolfpack/pkg-plist	Sat Jan 25 23:07:59 2014	(r341135)
+++ head/games/wolfpack/pkg-plist	Sat Jan 25 23:08:38 2014	(r341136)
@@ -7,6 +7,13 @@ lib/wolfpack/empsched
 lib/wolfpack/pconfig
 lib/wolfpack/files
 lib/wolfpack/fairland
+man/man6/empire.6.gz
+man/man6/emp_server.6.gz
+man/man6/empdump.6.gz
+man/man6/empsched.6.gz
+man/man6/fairland.6.gz
+man/man6/files.6.gz
+man/man6/pconfig.6.gz
 %%DATADIR%%/README
 %%DATADIR%%/builtin/infra.config
 %%DATADIR%%/builtin/item.config
@@ -304,3 +311,4 @@ etc/wolfpack/econfig.orig
 @dirrm lib/wolfpack
 @dirrmtry etc/wolfpack
 @dirrmtry var/wolfpack
+ at dirrmtry var


More information about the svn-ports-all mailing list