5 files changed, 25 insertions, 35 deletions

diff --git a/games/wolfpack/Makefile b/games/wolfpack/Makefile
index a6d7ec5e5f07..5f0893da8bce 100644
--- a/games/wolfpack/Makefile
+++ b/games/wolfpack/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wolfpack
-PORTVERSION=	4.3.32
-PORTREVISION=	1
+PORTVERSION=	4.3.33
 CATEGORIES=	games
 MASTER_SITES=	SF/empserver/${DISTNAME}
 DISTNAME=	empire-${PORTVERSION}
@@ -16,7 +15,7 @@ USES=		gmake perl5
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 BINDIR=		${PREFIX}/lib/${PORTNAME}
-CONFIGURE_ARGS=	--bindir=${BINDIR} --sbindir=${BINDIR} --localstatedir="${PREFIX}/var"
+CONFIGURE_ARGS=	--bindir=${BINDIR} --sbindir=${BINDIR}
 
 CONFLICTS_INSTALL=	empire-[0-9]*
 
@@ -40,6 +39,7 @@ post-install:
 	${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
+	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${STAGEDIR}${PREFIX}/lib/wolfpack/pconfig > \
 		${STAGEDIR}${ETCDIR}/econfig.orig
 
diff --git a/games/wolfpack/distinfo b/games/wolfpack/distinfo
index 43dda2015b98..6521853741c5 100644
--- a/games/wolfpack/distinfo
+++ b/games/wolfpack/distinfo
@@ -1,2 +1,2 @@
-SHA256 (empire-4.3.32.tar.gz) = d056dafb74c51ca76190c1f2fe8396fce1e124f0b71a4f89f30ef648c5d81e5d
-SIZE (empire-4.3.32.tar.gz) = 1441556
+SHA256 (empire-4.3.33.tar.gz) = ac5f03ee077c7544d184a9569858d9b0ded8009af2d92210bd055f04f2cc8190
+SIZE (empire-4.3.33.tar.gz) = 1442119
diff --git a/games/wolfpack/files/patch-Make.mk b/games/wolfpack/files/patch-Make.mk
index f647cef17f4e..6548479ecd5a 100644
--- a/games/wolfpack/files/patch-Make.mk
+++ b/games/wolfpack/files/patch-Make.mk
@@ -1,31 +1,28 @@
---- 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
+--- Make.mk.orig	2015-04-25 14:31:24.000000000 +0200
++++ Make.mk	2015-06-05 08:55:41.000000000 +0200
+@@ -65,10 +65,10 @@ 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
+-edatadir := $(datadir)/empire
 +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
++edatadir := $(datadir)/wolfpack
+ builtindir := $(edatadir)/builtin
+ einfodir := $(edatadir)/info.nr
+ ehtmldir := $(edatadir)/info.html
+@@ -199,43 +199,43 @@ distclean: clean
  
  .PHONY: install
  install: all installdirs
 -	$(INSTALL_PROGRAM) $(util) $(server) $(sbindir)
 -	$(INSTALL_PROGRAM) $(client) $(bindir)
 -	$(INSTALL) -m 444 $(addprefix $(srcdir)/, $(builtins)) $(builtindir)
+-	rm -f $(einfodir)/*
 -	$(INSTALL_DATA) $(info.nr) $(einfodir)
 -	$(INSTALL_DATA) $(addprefix $(srcdir)/, $(man6)) $(mandir)/man6
 -	sed -e '1,/^$$/d' -e 's/^/# /g' <$(srcdir)/doc/schedule >$(schedule).dist
@@ -36,6 +33,7 @@
 +	$(INSTALL_PROGRAM) $(util) $(server) $(DESTDIR)$(sbindir)
 +	$(INSTALL_PROGRAM) $(client) $(DESTDIR)$(bindir)
 +	$(INSTALL) -m 444 $(addprefix $(srcdir)/, $(builtins)) $(DESTDIR)$(builtindir)
++	rm -f $(DESTDIR)$(einfodir)/*
 +	$(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
@@ -46,7 +44,7 @@
  	    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 src/util/pconfig $(econfig) >$(DESTDIR)$(econfig).dist; then	\
 +	        if cmp -s $(DESTDIR)$(econfig) $(DESTDIR)$(econfig).dist; then		\
  		    echo "$(econfig) unchanged";			\
 -		    rm $(econfig).dist;					\
@@ -69,13 +67,15 @@
  .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)
++	mkdir -p $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir) $(DESTDIR)$(builtindir) $(DESTDIR)$(einfodir) $(DESTDIR)$(mandir)/man6 $(DESTDIR)$(dir $(econfig)) $(DESTDIR)$(gamedir)
  
  .PHONY: install-html
  install-html: html
 -	mkdir -p $(ehtmldir)
+-	rm -f $(ehtmldir)/*
 -	$(INSTALL_DATA) $(info.html) $(ehtmldir)
 +	mkdir -p $(DESTDIR)$(ehtmldir)
++	rm -f $(DESTDIR)$(ehtmldir)/*
 +	$(INSTALL_DATA) $(info.html) $(DESTDIR)$(ehtmldir)
  
  .PHONY: uninstall
diff --git a/games/wolfpack/files/wolfpack.in b/games/wolfpack/files/wolfpack.in
index 355ef7a34a85..dbd772907f2b 100644
--- a/games/wolfpack/files/wolfpack.in
+++ b/games/wolfpack/files/wolfpack.in
@@ -20,7 +20,7 @@ load_rc_config $name
 : ${wolfpack_enable="NO"}
 : ${wolfpack_user="wolfpack"}
 
-pidfile="%%PREFIX%%/var/wolfpack/server.pid"
+pidfile="/var/wolfpack/server.pid"
 command="%%PREFIX%%/lib/wolfpack/emp_server"
 
 run_rc_command "$1"
diff --git a/games/wolfpack/pkg-plist b/games/wolfpack/pkg-plist
index 0ec138944c8f..d3e0f2e37162 100644
--- a/games/wolfpack/pkg-plist
+++ b/games/wolfpack/pkg-plist
@@ -4,9 +4,9 @@ lib/wolfpack/emp_server
 lib/wolfpack/empdump
 lib/wolfpack/empire
 lib/wolfpack/empsched
-lib/wolfpack/pconfig
-lib/wolfpack/files
 lib/wolfpack/fairland
+lib/wolfpack/files
+lib/wolfpack/pconfig
 man/man6/empire.6.gz
 man/man6/emp_server.6.gz
 man/man6/empdump.6.gz
@@ -27,8 +27,6 @@ man/man6/pconfig.6.gz
 %%DATADIR%%/builtin/sect.config
 %%DATADIR%%/builtin/ship.config
 %%DATADIR%%/info.nr/Attacking
-%%DATADIR%%/info.nr/Autofish
-%%DATADIR%%/info.nr/Autonav
 %%DATADIR%%/info.nr/BTU
 %%DATADIR%%/info.nr/Basics
 %%DATADIR%%/info.nr/Bridges
@@ -165,7 +163,6 @@ man/man6/pconfig.6.gz
 %%DATADIR%%/info.nr/flash
 %%DATADIR%%/info.nr/fleetadd
 %%DATADIR%%/info.nr/fly
-%%DATADIR%%/info.nr/follow
 %%DATADIR%%/info.nr/force
 %%DATADIR%%/info.nr/fortify
 %%DATADIR%%/info.nr/give
@@ -204,7 +201,6 @@ man/man6/pconfig.6.gz
 %%DATADIR%%/info.nr/morale
 %%DATADIR%%/info.nr/motd
 %%DATADIR%%/info.nr/move
-%%DATADIR%%/info.nr/mquota
 %%DATADIR%%/info.nr/name
 %%DATADIR%%/info.nr/nation
 %%DATADIR%%/info.nr/navigate
@@ -216,7 +212,6 @@ man/man6/pconfig.6.gz
 %%DATADIR%%/info.nr/nmap
 %%DATADIR%%/info.nr/nuke
 %%DATADIR%%/info.nr/offer
-%%DATADIR%%/info.nr/order
 %%DATADIR%%/info.nr/origin
 %%DATADIR%%/info.nr/paradrop
 %%DATADIR%%/info.nr/path
@@ -232,7 +227,6 @@ man/man6/pconfig.6.gz
 %%DATADIR%%/info.nr/pray
 %%DATADIR%%/info.nr/production
 %%DATADIR%%/info.nr/pstat
-%%DATADIR%%/info.nr/qorder
 %%DATADIR%%/info.nr/quit
 %%DATADIR%%/info.nr/radar
 %%DATADIR%%/info.nr/range
@@ -249,7 +243,6 @@ man/man6/pconfig.6.gz
 %%DATADIR%%/info.nr/retreat
 %%DATADIR%%/info.nr/route
 %%DATADIR%%/info.nr/sabotage
-%%DATADIR%%/info.nr/sail
 %%DATADIR%%/info.nr/satellite
 %%DATADIR%%/info.nr/sbmap
 %%DATADIR%%/info.nr/scrap
@@ -270,11 +263,11 @@ man/man6/pconfig.6.gz
 %%DATADIR%%/info.nr/skywatch
 %%DATADIR%%/info.nr/smap
 %%DATADIR%%/info.nr/sonar
-%%DATADIR%%/info.nr/sorder
 %%DATADIR%%/info.nr/spy
 %%DATADIR%%/info.nr/sstat
 %%DATADIR%%/info.nr/start
 %%DATADIR%%/info.nr/starvation
+%%DATADIR%%/info.nr/stockpile
 %%DATADIR%%/info.nr/stop
 %%DATADIR%%/info.nr/strength
 %%DATADIR%%/info.nr/supply
@@ -290,10 +283,8 @@ man/man6/pconfig.6.gz
 %%DATADIR%%/info.nr/torpedo
 %%DATADIR%%/info.nr/trade
 %%DATADIR%%/info.nr/transport
-%%DATADIR%%/info.nr/treaty
 %%DATADIR%%/info.nr/turn
 %%DATADIR%%/info.nr/unload
-%%DATADIR%%/info.nr/unsail
 %%DATADIR%%/info.nr/update
 %%DATADIR%%/info.nr/upgrade
 %%DATADIR%%/info.nr/version
@@ -316,5 +307,4 @@ etc/wolfpack/econfig.orig
 @dirrm lib/wolfpack
 @mode 750
 @dirrmtry etc/wolfpack
-@dirrmtry var/wolfpack
-@dirrmtry var
+@dirrmtry /var/wolfpack