Changes 1.5.12:

This really fixes the potential exploit against
the Windows server, which was not correctly fixed in 1.5.11.

Changes 1.5.11:
This is largely a security bugfix release, fixing a potential exploit against
the Windows server when running as an NT serivce.

Pkgsrc:
Use options.mk to build Curses and/or GTK user interface.

4 files changed, 38 insertions, 18 deletions

diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index d8284522b99..af2f003500d 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2006/02/05 23:09:14 joerg Exp $
+# $NetBSD: Makefile,v 1.37 2006/02/14 21:40:44 adam Exp $
 
-DISTNAME=	dopewars-1.5.10
-PKGREVISION=	1
+DISTNAME=	dopewars-1.5.12
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dopewars/}
 
@@ -10,15 +9,11 @@ HOMEPAGE=	http://dopewars.sourceforge.net/
 COMMENT=	Make a fortune dealing drugs on the streets of New York
 
 USE_DIRS+=		xdg-1.1
-USE_LIBTOOL=		YES
-USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake
-
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--enable-ncurses
+USE_LIBTOOL=		yes
+USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		gmake pkg-config
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-networking
-CONFIGURE_ARGS+=	--disable-gui-client
-CONFIGURE_ARGS+=	--disable-glib2
 CONFIGURE_ARGS+=	--without-esd
 CONFIGURE_ARGS+=	--without-sdl
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/games
@@ -26,8 +21,8 @@ CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/games
 INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
 INCOMPAT_CURSES+=	NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-K]*-*
 
+.include "options.mk"
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/dopewars/PLIST b/games/dopewars/PLIST
index 0e9f2e12a0e..085269b5ad9 100644
--- a/games/dopewars/PLIST
+++ b/games/dopewars/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/11/05 09:44:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/02/14 21:40:44 adam Exp $
 bin/dopewars
 man/man6/dopewars.6
 share/doc/${PKGNAME}/help/cops.html
@@ -17,6 +17,7 @@ share/doc/${PKGNAME}/contribute.html
 share/doc/${PKGNAME}/credits.html
 share/doc/${PKGNAME}/developer.html
 share/doc/${PKGNAME}/example-cfg
+share/doc/${PKGNAME}/example-igneous
 share/doc/${PKGNAME}/i18n.html
 share/doc/${PKGNAME}/index.html
 share/doc/${PKGNAME}/installation.html
@@ -41,6 +42,7 @@ ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/dopewars.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/dopewars.mo
 ${PKGLOCALEDIR}/locale/es_ES/LC_MESSAGES/dopewars.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/dopewars.mo
+${PKGLOCALEDIR}/locale/fr_CA/LC_MESSAGES/dopewars.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/dopewars.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/dopewars.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/dopewars.mo
diff --git a/games/dopewars/distinfo b/games/dopewars/distinfo
index 96c935fa866..019e661e681 100644
--- a/games/dopewars/distinfo
+++ b/games/dopewars/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2005/02/23 23:11:56 agc Exp $
+$NetBSD: distinfo,v 1.14 2006/02/14 21:40:44 adam Exp $
 
-SHA1 (dopewars-1.5.10.tar.gz) = 75eea20b5070690f5f6cd2d81be4ebd08cab7db8
-RMD160 (dopewars-1.5.10.tar.gz) = 423eb7bedf6e6e942007f37475408634d2197963
-Size (dopewars-1.5.10.tar.gz) = 1243670 bytes
+SHA1 (dopewars-1.5.12.tar.gz) = ad46a38e225680e591b078eeec563d47b96684bc
+RMD160 (dopewars-1.5.12.tar.gz) = 66c86bceb67657a9fb2ef7944b1a069dafab8ae0
+Size (dopewars-1.5.12.tar.gz) = 1419725 bytes
 SHA1 (patch-aa) = df0e51ad4da9ce3963682ba246de9c4f1496a6ec
 SHA1 (patch-ac) = 529cf6e5b9f28a7fa547f81841c5199a1f8f84ae
 SHA1 (patch-ad) = 471c30b8b8e75d687e7891037f2427cb8ee51c14
diff --git a/games/dopewars/options.mk b/games/dopewars/options.mk
new file mode 100644
index 00000000000..6f296946ed0
--- /dev/null
+++ b/games/dopewars/options.mk
@@ -0,0 +1,23 @@
+# $NetBSD: options.mk,v 1.1 2006/02/14 21:40:44 adam Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.dopewars
+PKG_SUPPORTED_OPTIONS=	curses gtk
+PKG_SUGGESTED_OPTIONS=	curses gtk
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mcurses)
+.  include "../../devel/ncurses/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-curses-client
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtk)
+CONFIGURE_ARGS+=	--enable-gui-client
+CONFIGURE_ARGS+=	--enable-gui-server
+.  include "../../x11/gtk2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-gui-client
+CONFIGURE_ARGS+=	--disable-glib2
+.  include "../../devel/glib/buildlink3.mk"
+.endif