- Update to 1.5.12

- portlint(1)
- Take maintainership

PR:		ports/95886
Submitted by:	me
Approved by:	krion (me)

6 files changed, 62 insertions, 101 deletions

diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index b591ef3b96e5..9ce9ff9b37f9 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	dopewars
-PORTVERSION=	1.5.9
-PORTREVISION=	2
+PORTVERSION=	1.5.12
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/
 MASTER_SITE_SUBDIR=	dopewars
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A UNIX rewrite of a game originally based on "Drug Wars"
 
 USE_GETTEXT=	yes
@@ -22,23 +21,28 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 
-CONFIGURE_ARGS=	--enable-networking --disable-plugins
+CONFIGURE_ARGS=	--enable-networking --disable-plugins --localstatedir=${DATADIR}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-.if defined(NOPORTDOCS)
-MAKE_ENV+=	NOPORTDOCS=yes
-.endif
-
+PORTDOCS=	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL LICENCE NEWS README TODO
 MAN6=	dopewars.6
 
 post-patch:
 	@${REINPLACE_CMD} -e 's!/pixmaps!/dopewars/pixmaps!' \
 		${WRKSRC}/src/Makefile.in
-	@${REINPLACE_CMD} -e 's!dopewars.sco!dopewars/dopewars.sco!g' \
-		${WRKSRC}/src/dopewars.c ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's!^CFLAGS =!CFLAGS = \@GLIB_CFLAGS\@!' \
 		${WRKSRC}/src/gui_client/Makefile.in \
 		${WRKSRC}/src/curses_client/Makefile.in
+	@${REINPLACE_CMD} -e 's!install-recursive!!g' ${WRKSRC}/doc/Makefile.in
+
+post-install:
+.ifndef NOPORTDOCS
+	@${INSTALL} -d ${DOCSDIR}/help
+	@${INSTALL_DATA} ${WRKSRC}/doc/*html ${WRKSRC}/doc/example* ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/doc/help/*html ${DOCSDIR}/help/
+	@${INSTALL_DATA} ${PORTDOCS:S.^.${WRKSRC}/.} ${DOCSDIR}/
+	@${INSTALL_MAN} ${WRKSRC}/doc/dopewars.6 ${MAN6PREFIX}/man/man6/
+.endif
 
 .include <bsd.port.mk>
diff --git a/games/dopewars/distinfo b/games/dopewars/distinfo
index 94e66d67ba67..ff6d67140f7a 100644
--- a/games/dopewars/distinfo
+++ b/games/dopewars/distinfo
@@ -1,3 +1,3 @@
-MD5 (dopewars-1.5.9.tar.gz) = 77cdbc59e7550cfda7dfb7f6b7a01050
-SHA256 (dopewars-1.5.9.tar.gz) = 5ef6a8192befaa742f2bae8f622d74d814850642eb62e5b4fcd635be98630444
-SIZE (dopewars-1.5.9.tar.gz) = 1181836
+MD5 (dopewars-1.5.12.tar.gz) = debf749de9053dc2fb2e74c37ae06206
+SHA256 (dopewars-1.5.12.tar.gz) = 23059dcdea96c6072b148ee21d76237ef3535e5be90b3b2d8239d150feee0c19
+SIZE (dopewars-1.5.12.tar.gz) = 1419725
diff --git a/games/dopewars/files/patch-doc::Makefile.in b/games/dopewars/files/patch-doc::Makefile.in
deleted file mode 100644
index 8908afc049f5..000000000000
--- a/games/dopewars/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
-
-$FreeBSD$
-
---- doc/Makefile.in.orig	Mon Oct 21 13:09:21 2002
-+++ doc/Makefile.in	Tue Mar  4 19:35:58 2003
-@@ -132,7 +132,7 @@
- install_sh = @install_sh@
- localedir = @localedir@
- plugindir = @plugindir@
--DOCPATH = ${DESTDIR}${datadir}/doc/${PACKAGE}-${VERSION}/
-+DOCPATH = ${DESTDIR}${datadir}/doc/${PACKAGE}/
- DOCS = aiplayer.html configfile.html index.html i18n.html \
-                  server.html clientplay.html credits.html example-cfg \
-                  installation.html servercommands.html commandline.html \
-@@ -449,10 +449,12 @@
- 
- 
- install-data-local:
-+ifndef NOPORTDOCS
- 	${INSTALL} -d -m 0755 ${DOCPATH}
- 	for doc in ${DOCS}; do \
- 	  ${INSTALL} -m 0644 ${srcdir}/$${doc} ${DOCPATH}; \
- 	done
-+endif
- 
- uninstall-local:
- 	for doc in ${DOCS}; do \
diff --git a/games/dopewars/files/patch-doc::help::Makefile.in b/games/dopewars/files/patch-doc::help::Makefile.in
deleted file mode 100644
index b9a1ea824408..000000000000
--- a/games/dopewars/files/patch-doc::help::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/help/Makefile.in.orig	Tue Mar  4 19:36:07 2003
-+++ doc/help/Makefile.in	Tue Mar  4 19:36:19 2003
-@@ -132,7 +132,7 @@
- install_sh = @install_sh@
- localedir = @localedir@
- plugindir = @plugindir@
--DOCPATH = ${DESTDIR}${datadir}/doc/${PACKAGE}-${VERSION}/help
-+DOCPATH = ${DESTDIR}${datadir}/doc/${PACKAGE}/help
- DOCS = cops.html general.html locations.html sounds.html \
-              drugs.html guns.html server.html
- 
diff --git a/games/dopewars/pkg-descr b/games/dopewars/pkg-descr
index 11d57aef2cd6..4cc3a1da458d 100644
--- a/games/dopewars/pkg-descr
+++ b/games/dopewars/pkg-descr
@@ -5,7 +5,7 @@ so-called "antique" mode which closely follows the original,
 introduces new features such as the ability to take part in
 multi-player games.
 
-WWW: http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/
+WWW: http://dopewars.sourceforge.net/
 
 - Pete
 petef@FreeBSD.org
diff --git a/games/dopewars/pkg-plist b/games/dopewars/pkg-plist
index 6f90558629a4..4efec593647f 100644
--- a/games/dopewars/pkg-plist
+++ b/games/dopewars/pkg-plist
@@ -1,46 +1,45 @@
-@comment $FreeBSD$
 bin/dopewars
-%%PORTDOCS%%share/doc/dopewars/LICENCE
-%%PORTDOCS%%share/doc/dopewars/aiplayer.html
-%%PORTDOCS%%share/doc/dopewars/clientplay.html
-%%PORTDOCS%%share/doc/dopewars/commandline.html
-%%PORTDOCS%%share/doc/dopewars/configfile.html
-%%PORTDOCS%%share/doc/dopewars/contribute.html
-%%PORTDOCS%%share/doc/dopewars/credits.html
-%%PORTDOCS%%share/doc/dopewars/developer.html
-%%PORTDOCS%%share/doc/dopewars/example-cfg
-%%PORTDOCS%%share/doc/dopewars/help/cops.html
-%%PORTDOCS%%share/doc/dopewars/help/drugs.html
-%%PORTDOCS%%share/doc/dopewars/help/general.html
-%%PORTDOCS%%share/doc/dopewars/help/guns.html
-%%PORTDOCS%%share/doc/dopewars/help/locations.html
-%%PORTDOCS%%share/doc/dopewars/help/server.html
-%%PORTDOCS%%share/doc/dopewars/help/sounds.html
-%%PORTDOCS%%share/doc/dopewars/i18n.html
-%%PORTDOCS%%share/doc/dopewars/index.html
-%%PORTDOCS%%share/doc/dopewars/installation.html
-%%PORTDOCS%%share/doc/dopewars/metaserver.html
-%%PORTDOCS%%share/doc/dopewars/protocol.html
-%%PORTDOCS%%share/doc/dopewars/server.html
-%%PORTDOCS%%share/doc/dopewars/servercommands.html
-%%PORTDOCS%%share/doc/dopewars/windows.html
-share/dopewars/dopewars.sco
-share/dopewars/bye.wav
-share/dopewars/colt.wav
-share/dopewars/die.wav
-share/dopewars/gun.wav
-share/dopewars/jet.wav
-share/dopewars/losebitch.wav
-share/dopewars/message.wav
-share/dopewars/murmur.wav
-share/dopewars/punch.wav
-share/dopewars/run.wav
-share/dopewars/shotdown.wav
-share/dopewars/train.wav
-@unexec if [ ! -s %D/share/dopewars/dopewars.sco.bak ]; then rm -f %D/share/dopewars/dopewars.sco.bak; fi
-share/dopewars/pixmaps/dopewars-pill.png
-share/dopewars/pixmaps/dopewars-shot.png
-share/dopewars/pixmaps/dopewars-weed.png
+%%PORTDOCS%%%%DOCSDIR%%/aiplayer.html
+%%PORTDOCS%%%%DOCSDIR%%/clientplay.html
+%%PORTDOCS%%%%DOCSDIR%%/commandline.html
+%%PORTDOCS%%%%DOCSDIR%%/configfile.html
+%%PORTDOCS%%%%DOCSDIR%%/contribute.html
+%%PORTDOCS%%%%DOCSDIR%%/credits.html
+%%PORTDOCS%%%%DOCSDIR%%/developer.html
+%%PORTDOCS%%%%DOCSDIR%%/example-cfg
+%%PORTDOCS%%%%DOCSDIR%%/example-igneous
+%%PORTDOCS%%%%DOCSDIR%%/help/cops.html
+%%PORTDOCS%%%%DOCSDIR%%/help/drugs.html
+%%PORTDOCS%%%%DOCSDIR%%/help/general.html
+%%PORTDOCS%%%%DOCSDIR%%/help/guns.html
+%%PORTDOCS%%%%DOCSDIR%%/help/locations.html
+%%PORTDOCS%%%%DOCSDIR%%/help/server.html
+%%PORTDOCS%%%%DOCSDIR%%/help/sounds.html
+%%PORTDOCS%%%%DOCSDIR%%/i18n.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/installation.html
+%%PORTDOCS%%%%DOCSDIR%%/metaserver.html
+%%PORTDOCS%%%%DOCSDIR%%/protocol.html
+%%PORTDOCS%%%%DOCSDIR%%/server.html
+%%PORTDOCS%%%%DOCSDIR%%/servercommands.html
+%%PORTDOCS%%%%DOCSDIR%%/windows.html
+%%DATADIR%%/dopewars.sco
+%%DATADIR%%/bye.wav
+%%DATADIR%%/colt.wav
+%%DATADIR%%/die.wav
+%%DATADIR%%/gun.wav
+%%DATADIR%%/jet.wav
+%%DATADIR%%/losebitch.wav
+%%DATADIR%%/message.wav
+%%DATADIR%%/murmur.wav
+%%DATADIR%%/punch.wav
+%%DATADIR%%/run.wav
+%%DATADIR%%/shotdown.wav
+%%DATADIR%%/train.wav
+@unexec if [ ! -s %D/%%DATADIR%%/dopewars.sco.bak ]; then rm -f %D/%%DATADIR%%/dopewars.sco.bak; fi
+%%DATADIR%%/pixmaps/dopewars-pill.png
+%%DATADIR%%/pixmaps/dopewars-shot.png
+%%DATADIR%%/pixmaps/dopewars-weed.png
 share/locale/de/LC_MESSAGES/dopewars.mo
 share/locale/es/LC_MESSAGES/dopewars.mo
 share/locale/fr/LC_MESSAGES/dopewars.mo
@@ -51,7 +50,6 @@ share/gnome/apps/Games/dopewars.desktop
 @dirrmtry share/gnome/apps/Games
 @dirrmtry share/gnome/apps
 @dirrmtry share/gnome
-@dirrm share/dopewars/pixmaps
-@dirrm share/dopewars
-%%PORTDOCS%%@dirrm share/doc/dopewars/help
-%%PORTDOCS%%@dirrm share/doc/dopewars
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/help