2 files changed, 42 insertions, 60 deletions

diff --git a/games/gnubg/Makefile b/games/gnubg/Makefile
index 5af8380be426..4d416c0c461d 100644
--- a/games/gnubg/Makefile
+++ b/games/gnubg/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gnubg
 PORTVERSION=	1.03.001
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.c-s.li/ports/ \
 		http://files.gnubg.org/media/sources/
@@ -16,45 +17,34 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison
 RUN_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3
 LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
-		libgtkextra-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtkextra2 \
-		libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
-
-OPTIONS_DEFINE=	ESOUND NLS DOCS
-OPTIONS_DEFAULT=ESOUND NLS
-
-CONFIGURE_ARGS=	--with-board3d --with-sqlite --with-python
+		libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext \
+		libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra
 
+CONFIGURE_ARGS=	--with-board3d --with-sqlite --with-python=${LOCALBASE}/bin/python
 CONFIGURE_ENV=	ac_cv_path_ARTSC_CONFIG=no ac_cv_path_LIBART_CONFIG=no
-
-INSTALLS_ICONS=	yes
-USE_GNOME=	libxml2
-USES=		gmake libtool pathfix shebangfix python
-USE_AUTOTOOLS=	automake libtoolize
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
+INSTALLS_ICONS=	yes
+INSTALL_TARGET=	install-strip
+USES=		gmake libtool pathfix shebangfix python pkgconfig
+USE_AUTOTOOLS=	aclocal automake libtoolize
+USE_GNOME=	glib20
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	NLS DOCS
+OPTIONS_DEFAULT=NLS
 
-.if ${PORT_OPTIONS:MESOUND}
-USE_GNOME+=	esound
-.else
-CONFIGURE_ENV+=	ac_cv_path_AUDIOFILE_CONFIG=no ac_cv_path_ESD_CONFIG=no
-.endif
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB+=	NLS=""
-CONFIGURE_ARGS+=	--enable-nls
 .else
 PLIST_SUB+=	NLS="@comment "
 CONFIGURE_ARGS+=	--disable-nls
 .endif
 
-INFO=	gnubg
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-pre-configure:
-	cd ${WRKSRC} && ./autogen.sh
+#pre-configure:
+#	cd ${WRKSRC} && ./autogen.sh
 
 .include <bsd.port.mk>
diff --git a/games/gnubg/pkg-plist b/games/gnubg/pkg-plist
index 4c5526747ac0..731b25b9d5f8 100644
--- a/games/gnubg/pkg-plist
+++ b/games/gnubg/pkg-plist
@@ -3,7 +3,11 @@ bin/gnubg
 bin/makebearoff
 bin/makehyper
 bin/makeweights
+man/man6/bearoffdump.6.gz
 man/man6/gnubg.6.gz
+man/man6/makebearoff.6.gz
+man/man6/makehyper.6.gz
+man/man6/makeweights.6.gz
 %%PORTDOCS%%%%DOCSDIR%%/allabout.html
 %%PORTDOCS%%%%DOCSDIR%%/gnubg.html
 %%PORTDOCS%%%%DOCSDIR%%/images/1540d81e.png
@@ -209,39 +213,27 @@ share/icons/hicolor/22x22/apps/gnubg.png
 share/icons/hicolor/24x24/apps/gnubg.png
 share/icons/hicolor/32x32/apps/gnubg.png
 share/icons/hicolor/48x48/apps/gnubg.png
-%%NLS%%share/locale/cs/LC_MESSAGES/gnubg.mo
-%%NLS%%share/locale/da/LC_MESSAGES/gnubg.mo
-%%NLS%%share/locale/de/LC_MESSAGES/gnubg.mo
-%%NLS%%share/locale/en_US/LC_MESSAGES/gnubg.mo
-%%NLS%%share/locale/es/LC_MESSAGES/gnubg.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/gnubg.mo
-%%NLS%%share/locale/is/LC_MESSAGES/gnubg.mo
-%%NLS%%share/locale/it/LC_MESSAGES/gnubg.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/gnubg.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/gnubg.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/gnubg.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/gnubg.mo
-@dirrmtry share/locale/en_US/LC_MESSAGES
-@dirrmtry share/locale/en_US
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/24x24/apps
-@dirrmtry share/icons/hicolor/24x24
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@dirrmtry %%DATADIR%%/textures
-@dirrmtry %%DATADIR%%/sounds
-@dirrmtry %%DATADIR%%/scripts
-@dirrmtry %%DATADIR%%/pixmaps
-@dirrmtry %%DATADIR%%/met
-@dirrmtry %%DATADIR%%/fonts
-@dirrmtry %%DATADIR%%/flags
-@dirrmtry %%DATADIR%%
+share/locale/cs/LC_MESSAGES/gnubg.mo
+share/locale/da/LC_MESSAGES/gnubg.mo
+share/locale/de/LC_MESSAGES/gnubg.mo
+share/locale/en_US/LC_MESSAGES/gnubg.mo
+share/locale/es/LC_MESSAGES/gnubg.mo
+share/locale/fr/LC_MESSAGES/gnubg.mo
+share/locale/is/LC_MESSAGES/gnubg.mo
+share/locale/it/LC_MESSAGES/gnubg.mo
+share/locale/ja/LC_MESSAGES/gnubg.mo
+share/locale/ro/LC_MESSAGES/gnubg.mo
+share/locale/ru/LC_MESSAGES/gnubg.mo
+share/locale/tr/LC_MESSAGES/gnubg.mo
 %%PORTDOCS%%@dirrmtry %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrmtry %%DATADIR%%/flags
+@dirrmtry %%DATADIR%%/fonts
+@dirrmtry %%DATADIR%%/met
+@dirrmtry %%DATADIR%%/pixmaps
+@dirrmtry %%DATADIR%%/scripts
+@dirrmtry %%DATADIR%%/sounds
+@dirrmtry %%DATADIR%%/textures
+@dirrmtry %%DATADIR%%
+@dirrmtry share/locale/en_US/LC_MESSAGES
+@dirrmtry share/locale/en_US