- Update to 1.0.4

- OPTIONSify; enable GTK2 and GEOIP by default
- Improve comment and description
- Polish the port

4 files changed, 24 insertions, 31 deletions

diff --git a/games/xqf/Makefile b/games/xqf/Makefile
index 9e3e647db085..871c94d09125 100644
--- a/games/xqf/Makefile
+++ b/games/xqf/Makefile
@@ -6,22 +6,20 @@
 #
 
 PORTNAME=	xqf
-PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTVERSION=	1.0.4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Find quake servers
+COMMENT=	A server browser for many popular 3D action games
 
 RUN_DEPENDS=	qstat:${PORTSDIR}/games/qstat
 
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomehier gnometarget intlhack
+USE_GNOME=	intlhack
 USE_GETOPT_LONG=	yes
 USE_GETTEXT=	yes
-USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
@@ -31,10 +29,15 @@ MAN6=		xqf.6
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
+OPTIONS=	GTK2 "GTK+ 2.0 support" on \
+		GEOIP "GeoIP support" on \
+		BZIP2 "bzip2 compression" on
+
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_GTK2)
 USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--enable-gtk2
-PKGNAMESUFFIX=	-gtk2
 .else
 USE_GNOME+=	gdkpixbuf
 .endif
@@ -52,19 +55,10 @@ RUN_DEPENDS+=	bzip2:${PORTSDIR}/archivers/bzip2
 .endif
 .endif
 
-post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|: install-desktopDATA|:|g ; \
-		 s|$$(datadir)/pixmaps|$$(pkgdatadir)/pixmaps|g'
-
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/xqf.desktop \
-		${PREFIX}/share/gnome/applications
-	${INSTALL_DATA} ${WRKSRC}/pixmaps/xqf_32x32.png \
-		${PREFIX}/share/gnome/pixmaps
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/xqfdocs.html ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/xqf/distinfo b/games/xqf/distinfo
index 5746ac7fd91e..55148628d110 100644
--- a/games/xqf/distinfo
+++ b/games/xqf/distinfo
@@ -1,2 +1,3 @@
-MD5 (xqf-1.0.3.tar.gz) = 5ee4aa37b2a52e72fc71c9078d95c289
-SIZE (xqf-1.0.3.tar.gz) = 916425
+MD5 (xqf-1.0.4.tar.gz) = d060838d0846b3846076e4ed02fc2b34
+SHA256 (xqf-1.0.4.tar.gz) = 16f6ac5aeb25e02c34f94162a7dbbbb916e1d55a5a949d27664508ab90127756
+SIZE (xqf-1.0.4.tar.gz) = 720455
diff --git a/games/xqf/pkg-descr b/games/xqf/pkg-descr
index bc451b2dd8fc..5e955682b743 100644
--- a/games/xqf/pkg-descr
+++ b/games/xqf/pkg-descr
@@ -1,7 +1,5 @@
-XQF is a 3D action game (such as Quake, sequels and derivatives)
-server browser. It uses X and is written using the GIMP Tool Kit.
-
-XQF is a front-end to QStat, a program by Steve Jankowsk which is
-used to retrieve server info.
+XQF is a game server browser and launcher for Unix/X11 for many popular games
+such as the Quake series, Unreal Tournament series, Half-Life etc. XQF is a
+front-end to QStat, a program by Steve Jankowski and uses the GTK+ toolkit.
 
 WWW: http://www.linuxgames.com/xqf/
diff --git a/games/xqf/pkg-plist b/games/xqf/pkg-plist
index 53e5fbecc547..91ee65b8ae31 100644
--- a/games/xqf/pkg-plist
+++ b/games/xqf/pkg-plist
@@ -6,10 +6,14 @@ share/locale/ca/LC_MESSAGES/xqf.mo
 share/locale/da/LC_MESSAGES/xqf.mo
 share/locale/de/LC_MESSAGES/xqf.mo
 share/locale/es/LC_MESSAGES/xqf.mo
+share/locale/fi/LC_MESSAGES/xqf.mo
 share/locale/fr/LC_MESSAGES/xqf.mo
 share/locale/ru/LC_MESSAGES/xqf.mo
-share/gnome/applications/xqf.desktop
-share/gnome/pixmaps/xqf_32x32.png
+share/applications/xqf.desktop
+share/pixmaps/xqf_22x22.png
+share/pixmaps/xqf_32x32.png
+share/pixmaps/xqf_48x48.png
+share/pixmaps/xqf_48x48_2.png
 %%DATADIR%%/default/flags/ae.png
 %%DATADIR%%/default/flags/ag.png
 %%DATADIR%%/default/flags/ar.png
@@ -125,15 +129,11 @@ share/gnome/pixmaps/xqf_32x32.png
 %%DATADIR%%/default/trayicon/ready.ani
 %%DATADIR%%/default/trayicon/red_frame_4_4.png
 %%DATADIR%%/default/xqf_48x48.png
-%%DATADIR%%/pixmaps/xqf_22x22.png
-%%DATADIR%%/pixmaps/xqf_32x32.png
-%%DATADIR%%/pixmaps/xqf_48x48.png
-%%DATADIR%%/pixmaps/xqf_48x48_2.png
 %%DATADIR%%/qstat.cfg
 @dirrm lib/xqf
-@dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/default/trayicon
 @dirrm %%DATADIR%%/default/flags
 @dirrm %%DATADIR%%/default
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec rmdir %D/share/applications 2>/dev/null || true