Index: head/games/wolfpack/Makefile =================================================================== --- head/games/wolfpack/Makefile (revision 388588) +++ head/games/wolfpack/Makefile (revision 388589) @@ -1,46 +1,46 @@ # Created by: Daniel O'Connor # $FreeBSD$ PORTNAME= wolfpack -PORTVERSION= 4.3.32 -PORTREVISION= 1 +PORTVERSION= 4.3.33 CATEGORIES= games MASTER_SITES= SF/empserver/${DISTNAME} DISTNAME= empire-${PORTVERSION} MAINTAINER= johans@FreeBSD.org COMMENT= Long term multiplayer strategy game MAKEFILE= GNUmakefile 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]* USERS= wolfpack GROUPS= wolfpack USE_RC_SUBR= wolfpack SUB_FILES+= pkg-message .include post-patch: ${REINPLACE_CMD} -e '/^econfig/,/^$$/s|/empire|/${PORTNAME}|' \ ${WRKSRC}/Make.mk ${WRKSRC}/sources.mk .if ${ARCH} == "sparc64" ${REINPLACE_CMD} -e '/ucontext\.h/ { h; s|ucontext|sys/types|; G; }' \ ${WRKSRC}/src/lib/lwp/lwpint.h .endif 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 .include Index: head/games/wolfpack/distinfo =================================================================== --- head/games/wolfpack/distinfo (revision 388588) +++ head/games/wolfpack/distinfo (revision 388589) @@ -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 Index: head/games/wolfpack/files/patch-Make.mk =================================================================== --- head/games/wolfpack/files/patch-Make.mk (revision 388588) +++ head/games/wolfpack/files/patch-Make.mk (revision 388589) @@ -1,82 +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 +--- 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 ++edatadir := $(datadir)/wolfpack + builtindir := $(edatadir)/builtin + einfodir := $(edatadir)/info.nr + ehtmldir := $(edatadir)/info.html +@@ -199,43 +199,43 @@ distclean: clean -@@ -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) +- 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 - 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) ++ 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 + 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 src/util/pconfig $(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) ++ 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 uninstall: Index: head/games/wolfpack/files/wolfpack.in =================================================================== --- head/games/wolfpack/files/wolfpack.in (revision 388588) +++ head/games/wolfpack/files/wolfpack.in (revision 388589) @@ -1,27 +1,27 @@ #!/bin/sh # PROVIDE: wolfpack # # Add the following line to /etc/rc.conf.local or /etc/rc.conf # to enable the wolfpack game server: # wolfpack_enable="YES" # # Please read the documentation in %%DATADIR%%/README # about configuring the server and creating a world first. # . /etc/rc.subr name=wolfpack rcvar=wolfpack_enable 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" Index: head/games/wolfpack/pkg-plist =================================================================== --- head/games/wolfpack/pkg-plist (revision 388588) +++ head/games/wolfpack/pkg-plist (revision 388589) @@ -1,320 +1,310 @@ bin/emp_client bin/emp_server 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 man/man6/empsched.6.gz man/man6/fairland.6.gz man/man6/files.6.gz man/man6/pconfig.6.gz @owner wolfpack @group wolfpack @mode 644 %%DATADIR%%/README %%DATADIR%%/builtin/infra.config %%DATADIR%%/builtin/item.config %%DATADIR%%/builtin/land.config %%DATADIR%%/builtin/nuke.config %%DATADIR%%/builtin/plane.config %%DATADIR%%/builtin/product.config %%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 %%DATADIR%%/info.nr/Bugs %%DATADIR%%/info.nr/CHANGES.CHAINSAW %%DATADIR%%/info.nr/Citizens %%DATADIR%%/info.nr/Clients %%DATADIR%%/info.nr/Combat %%DATADIR%%/info.nr/Commerce %%DATADIR%%/info.nr/Commodities %%DATADIR%%/info.nr/Communication %%DATADIR%%/info.nr/Damage %%DATADIR%%/info.nr/Deity %%DATADIR%%/info.nr/Detection %%DATADIR%%/info.nr/Diplomacy %%DATADIR%%/info.nr/Distribution %%DATADIR%%/info.nr/Education %%DATADIR%%/info.nr/Empire2 %%DATADIR%%/info.nr/Empire3 %%DATADIR%%/info.nr/Empire4 %%DATADIR%%/info.nr/Expert %%DATADIR%%/info.nr/Fallout %%DATADIR%%/info.nr/Flak %%DATADIR%%/info.nr/Food %%DATADIR%%/info.nr/God %%DATADIR%%/info.nr/Guerrilla %%DATADIR%%/info.nr/Guide %%DATADIR%%/info.nr/Happiness %%DATADIR%%/info.nr/Hidden %%DATADIR%%/info.nr/Hints %%DATADIR%%/info.nr/History %%DATADIR%%/info.nr/Hitchance %%DATADIR%%/info.nr/Infrastructure %%DATADIR%%/info.nr/Innards %%DATADIR%%/info.nr/Interception %%DATADIR%%/info.nr/Introduction %%DATADIR%%/info.nr/Item-types %%DATADIR%%/info.nr/Kill %%DATADIR%%/info.nr/Land-units %%DATADIR%%/info.nr/LandUnits %%DATADIR%%/info.nr/Loans %%DATADIR%%/info.nr/Maintenance %%DATADIR%%/info.nr/Maps %%DATADIR%%/info.nr/Merc %%DATADIR%%/info.nr/Mobility %%DATADIR%%/info.nr/Moving %%DATADIR%%/info.nr/Nations %%DATADIR%%/info.nr/Novice %%DATADIR%%/info.nr/Nuke-types %%DATADIR%%/info.nr/Nukes %%DATADIR%%/info.nr/Occupation %%DATADIR%%/info.nr/Old-empire %%DATADIR%%/info.nr/Options %%DATADIR%%/info.nr/Overview %%DATADIR%%/info.nr/Plague %%DATADIR%%/info.nr/Plane-types %%DATADIR%%/info.nr/Planes %%DATADIR%%/info.nr/Playing %%DATADIR%%/info.nr/Populace %%DATADIR%%/info.nr/Producing %%DATADIR%%/info.nr/Products %%DATADIR%%/info.nr/Quick-ref %%DATADIR%%/info.nr/Railroad %%DATADIR%%/info.nr/Research %%DATADIR%%/info.nr/Sector-ownership %%DATADIR%%/info.nr/Sector-types %%DATADIR%%/info.nr/Sectors %%DATADIR%%/info.nr/Selector %%DATADIR%%/info.nr/Server %%DATADIR%%/info.nr/Sheep %%DATADIR%%/info.nr/Ship-types %%DATADIR%%/info.nr/Ships %%DATADIR%%/info.nr/Spies %%DATADIR%%/info.nr/Suggestions %%DATADIR%%/info.nr/Syntax %%DATADIR%%/info.nr/TOP %%DATADIR%%/info.nr/Taxes %%DATADIR%%/info.nr/Technology %%DATADIR%%/info.nr/Time %%DATADIR%%/info.nr/Trade-ships %%DATADIR%%/info.nr/Transportation %%DATADIR%%/info.nr/Unit-types %%DATADIR%%/info.nr/Update-sequence %%DATADIR%%/info.nr/Updates %%DATADIR%%/info.nr/Wolfpack %%DATADIR%%/info.nr/accept %%DATADIR%%/info.nr/add %%DATADIR%%/info.nr/all %%DATADIR%%/info.nr/announce %%DATADIR%%/info.nr/anti %%DATADIR%%/info.nr/apropos %%DATADIR%%/info.nr/arm %%DATADIR%%/info.nr/army %%DATADIR%%/info.nr/assault %%DATADIR%%/info.nr/attack %%DATADIR%%/info.nr/bdes %%DATADIR%%/info.nr/bestpath %%DATADIR%%/info.nr/bmap %%DATADIR%%/info.nr/board %%DATADIR%%/info.nr/bomb %%DATADIR%%/info.nr/break %%DATADIR%%/info.nr/budget %%DATADIR%%/info.nr/build %%DATADIR%%/info.nr/buy %%DATADIR%%/info.nr/bye %%DATADIR%%/info.nr/capital %%DATADIR%%/info.nr/cargo %%DATADIR%%/info.nr/census %%DATADIR%%/info.nr/change %%DATADIR%%/info.nr/coastwatch %%DATADIR%%/info.nr/collect %%DATADIR%%/info.nr/commodity %%DATADIR%%/info.nr/consider %%DATADIR%%/info.nr/convert %%DATADIR%%/info.nr/country %%DATADIR%%/info.nr/cutoff %%DATADIR%%/info.nr/declare %%DATADIR%%/info.nr/deliver %%DATADIR%%/info.nr/demobilize %%DATADIR%%/info.nr/designate %%DATADIR%%/info.nr/disable %%DATADIR%%/info.nr/disarm %%DATADIR%%/info.nr/distribute %%DATADIR%%/info.nr/drop %%DATADIR%%/info.nr/dump %%DATADIR%%/info.nr/echo %%DATADIR%%/info.nr/edit %%DATADIR%%/info.nr/enable %%DATADIR%%/info.nr/enlist %%DATADIR%%/info.nr/execute %%DATADIR%%/info.nr/explore %%DATADIR%%/info.nr/financial %%DATADIR%%/info.nr/fire %%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 %%DATADIR%%/info.nr/grind %%DATADIR%%/info.nr/harden %%DATADIR%%/info.nr/headlines %%DATADIR%%/info.nr/help %%DATADIR%%/info.nr/improve %%DATADIR%%/info.nr/info %%DATADIR%%/info.nr/land %%DATADIR%%/info.nr/launch %%DATADIR%%/info.nr/lbmap %%DATADIR%%/info.nr/lboard %%DATADIR%%/info.nr/lcargo %%DATADIR%%/info.nr/ldump %%DATADIR%%/info.nr/ledger %%DATADIR%%/info.nr/level %%DATADIR%%/info.nr/list %%DATADIR%%/info.nr/lload %%DATADIR%%/info.nr/llookout %%DATADIR%%/info.nr/lmap %%DATADIR%%/info.nr/lmine %%DATADIR%%/info.nr/load %%DATADIR%%/info.nr/lookout %%DATADIR%%/info.nr/lost %%DATADIR%%/info.nr/lradar %%DATADIR%%/info.nr/lretreat %%DATADIR%%/info.nr/lstat %%DATADIR%%/info.nr/ltend %%DATADIR%%/info.nr/lunload %%DATADIR%%/info.nr/map %%DATADIR%%/info.nr/march %%DATADIR%%/info.nr/market %%DATADIR%%/info.nr/mine %%DATADIR%%/info.nr/mission %%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 %%DATADIR%%/info.nr/nbmap %%DATADIR%%/info.nr/ndump %%DATADIR%%/info.nr/newcap %%DATADIR%%/info.nr/neweff %%DATADIR%%/info.nr/newspaper %%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 %%DATADIR%%/info.nr/payoff %%DATADIR%%/info.nr/pbmap %%DATADIR%%/info.nr/pboard %%DATADIR%%/info.nr/pdump %%DATADIR%%/info.nr/peek %%DATADIR%%/info.nr/plane %%DATADIR%%/info.nr/players %%DATADIR%%/info.nr/pmap %%DATADIR%%/info.nr/power %%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 %%DATADIR%%/info.nr/read %%DATADIR%%/info.nr/realm %%DATADIR%%/info.nr/recon %%DATADIR%%/info.nr/reject %%DATADIR%%/info.nr/relations %%DATADIR%%/info.nr/reload %%DATADIR%%/info.nr/repay %%DATADIR%%/info.nr/report %%DATADIR%%/info.nr/reset %%DATADIR%%/info.nr/resource %%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 %%DATADIR%%/info.nr/scuttle %%DATADIR%%/info.nr/sdump %%DATADIR%%/info.nr/sect %%DATADIR%%/info.nr/sell %%DATADIR%%/info.nr/set %%DATADIR%%/info.nr/setresource %%DATADIR%%/info.nr/setsector %%DATADIR%%/info.nr/sharebmap %%DATADIR%%/info.nr/shark %%DATADIR%%/info.nr/ship %%DATADIR%%/info.nr/shoot %%DATADIR%%/info.nr/show %%DATADIR%%/info.nr/shutdown %%DATADIR%%/info.nr/sinfrastructure %%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 %%DATADIR%%/info.nr/survey %%DATADIR%%/info.nr/swapsector %%DATADIR%%/info.nr/sweep %%DATADIR%%/info.nr/telegram %%DATADIR%%/info.nr/tend %%DATADIR%%/info.nr/territory %%DATADIR%%/info.nr/test %%DATADIR%%/info.nr/threshold %%DATADIR%%/info.nr/toggle %%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 %%DATADIR%%/info.nr/wall %%DATADIR%%/info.nr/wingadd %%DATADIR%%/info.nr/wipe %%DATADIR%%/info.nr/wire %%DATADIR%%/info.nr/work %%DATADIR%%/info.nr/xdump %%DATADIR%%/info.nr/zdone @mode 640 etc/wolfpack/schedule @unexec if cmp -s %B/econfig.orig %B/econfig; then rm -f %B/econfig; fi etc/wolfpack/econfig.orig @exec if [ ! -f %B/econfig ] ; then cp -p %D/%F %B/econfig; fi @mode 755 @dirrm %%DATADIR%%/builtin @dirrm %%DATADIR%%/info.nr @dirrm %%DATADIR%% @dirrm lib/wolfpack @mode 750 @dirrmtry etc/wolfpack -@dirrmtry var/wolfpack -@dirrmtry var +@dirrmtry /var/wolfpack