5 files changed, 164 insertions, 11 deletions

diff --git a/games/xqf/Makefile b/games/xqf/Makefile
index f38e6f868913..7eae89815b62 100644
--- a/games/xqf/Makefile
+++ b/games/xqf/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xqf
-PORTVERSION=	0.9.14
-PORTREVISION=	1
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,15 +14,15 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Find quake servers
 
-RUN_DEPENDS=	qstat:${PORTSDIR}/games/qstat \
-		wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS=	qstat:${PORTSDIR}/games/qstat
 
-USE_GNOME=	gnometarget intlhack
+USE_X_PREFIX=	yes
+USE_GNOME=	gnomehier gnometarget intlhack
 USE_GETOPT_LONG=	yes
 USE_GETTEXT=	yes
 USE_REINPLACE=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN6=		xqf.6
@@ -54,12 +53,14 @@ RUN_DEPENDS+=	bzip2:${PORTSDIR}/archivers/bzip2
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|: install-ApplicationsDATA|:|g ; \
+		's|: install-desktopDATA|:|g ; \
 		 s|$$(datadir)/pixmaps|$$(pkgdatadir)/pixmaps|g'
 
 post-install:
-	@${MKDIR} ${DATADIR}/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/pixmaps/xqf_48x48.png ${DATADIR}/pixmaps
+	${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}
 	${INSTALL_DATA} ${WRKSRC}/docs/xqfdocs.html ${DOCSDIR}
diff --git a/games/xqf/distinfo b/games/xqf/distinfo
index 42ea797861c7..357905ae580b 100644
--- a/games/xqf/distinfo
+++ b/games/xqf/distinfo
@@ -1,2 +1,2 @@
-MD5 (xqf-0.9.14.tar.gz) = e2d1d5c3d3b1f6e669958752b10b8d3d
-SIZE (xqf-0.9.14.tar.gz) = 819210
+MD5 (xqf-1.0.tar.gz) = b56d76781b4444d1d25d8f772b88a477
+SIZE (xqf-1.0.tar.gz) = 894922
diff --git a/games/xqf/files/patch-src::filter.c b/games/xqf/files/patch-src::filter.c
new file mode 100644
index 000000000000..af3442472f76
--- /dev/null
+++ b/games/xqf/files/patch-src::filter.c
@@ -0,0 +1,13 @@
+--- src/filter.c.orig	Mon Aug  2 00:03:17 2004
++++ src/filter.c	Mon Aug 16 21:41:39 2004
+@@ -2140,8 +2140,9 @@
+   if(!filter_current_time)
+   {
+     struct server* s;
++    GSList* list;
+     printf("CONGRATULATION! You managed to filter more than %u times\n", UINT_MAX);
+-    GSList* list = all_servers();
++    list = all_servers();
+     for(;list; list = list->next)
+     {
+       s = (struct server *) list->data;
diff --git a/games/xqf/files/patch-src::pref.c b/games/xqf/files/patch-src::pref.c
new file mode 100644
index 000000000000..79ddacfb6ba9
--- /dev/null
+++ b/games/xqf/files/patch-src::pref.c
@@ -0,0 +1,19 @@
+--- src/pref.c.orig	Sun Aug  8 03:34:05 2004
++++ src/pref.c	Mon Aug 16 21:44:39 2004
+@@ -2486,6 +2486,7 @@
+   GtkWidget *defaults_button;
+   GtkWidget *page_vbox;
+   struct game *g;
++  gint width;
+ 
+   //tooltips = gtk_tooltips_new ();
+   
+@@ -2660,7 +2661,7 @@
+     }
+   }
+ 
+-  gint width = gtk_clist_optimal_column_width (GTK_CLIST (arguments_clist), 0);
++  width = gtk_clist_optimal_column_width (GTK_CLIST (arguments_clist), 0);
+   gtk_clist_set_column_width (GTK_CLIST (arguments_clist), 0, width?width:60);
+   gtk_clist_set_column_width (GTK_CLIST (arguments_clist), 1,
+ 	  gtk_clist_optimal_column_width (GTK_CLIST (arguments_clist), 1));
diff --git a/games/xqf/pkg-plist b/games/xqf/pkg-plist
index 60312b0681a5..376126cd258f 100644
--- a/games/xqf/pkg-plist
+++ b/games/xqf/pkg-plist
@@ -6,11 +6,131 @@ share/locale/da/LC_MESSAGES/xqf.mo
 share/locale/de/LC_MESSAGES/xqf.mo
 share/locale/es/LC_MESSAGES/xqf.mo
 share/locale/fr/LC_MESSAGES/xqf.mo
+share/gnome/applications/xqf.desktop
+share/gnome/pixmaps/xqf_32x32.png
+%%DATADIR%%/default/flags/ae.png
+%%DATADIR%%/default/flags/ag.png
+%%DATADIR%%/default/flags/ar.png
+%%DATADIR%%/default/flags/at.png
+%%DATADIR%%/default/flags/au.png
+%%DATADIR%%/default/flags/az.png
+%%DATADIR%%/default/flags/ba.png
+%%DATADIR%%/default/flags/bb.png
+%%DATADIR%%/default/flags/bd.png
+%%DATADIR%%/default/flags/be.png
+%%DATADIR%%/default/flags/bg.png
+%%DATADIR%%/default/flags/bh.png
+%%DATADIR%%/default/flags/bo.png
+%%DATADIR%%/default/flags/br.png
+%%DATADIR%%/default/flags/by.png
+%%DATADIR%%/default/flags/ca.png
+%%DATADIR%%/default/flags/ch.png
+%%DATADIR%%/default/flags/cl.png
+%%DATADIR%%/default/flags/cn.png
+%%DATADIR%%/default/flags/co.png
+%%DATADIR%%/default/flags/cr.png
+%%DATADIR%%/default/flags/cu.png
+%%DATADIR%%/default/flags/cz.png
+%%DATADIR%%/default/flags/de.png
+%%DATADIR%%/default/flags/dj.png
+%%DATADIR%%/default/flags/dk.png
+%%DATADIR%%/default/flags/do.png
+%%DATADIR%%/default/flags/dz.png
+%%DATADIR%%/default/flags/ec.png
+%%DATADIR%%/default/flags/ee.png
+%%DATADIR%%/default/flags/eg.png
+%%DATADIR%%/default/flags/es.png
+%%DATADIR%%/default/flags/fi.png
+%%DATADIR%%/default/flags/fr.png
+%%DATADIR%%/default/flags/gb.png
+%%DATADIR%%/default/flags/gd.png
+%%DATADIR%%/default/flags/gh.png
+%%DATADIR%%/default/flags/gr.png
+%%DATADIR%%/default/flags/gt.png
+%%DATADIR%%/default/flags/hn.png
+%%DATADIR%%/default/flags/hr.png
+%%DATADIR%%/default/flags/hu.png
+%%DATADIR%%/default/flags/id.png
+%%DATADIR%%/default/flags/ie.png
+%%DATADIR%%/default/flags/il.png
+%%DATADIR%%/default/flags/in.png
+%%DATADIR%%/default/flags/iq.png
+%%DATADIR%%/default/flags/ir.png
+%%DATADIR%%/default/flags/is.png
+%%DATADIR%%/default/flags/it.png
+%%DATADIR%%/default/flags/jm.png
+%%DATADIR%%/default/flags/jo.png
+%%DATADIR%%/default/flags/jp.png
+%%DATADIR%%/default/flags/kn.png
+%%DATADIR%%/default/flags/kp.png
+%%DATADIR%%/default/flags/kr.png
+%%DATADIR%%/default/flags/kw.png
 %%DATADIR%%/default/flags/lan.png
+%%DATADIR%%/default/flags/lb.png
+%%DATADIR%%/default/flags/lc.png
+%%DATADIR%%/default/flags/lt.png
+%%DATADIR%%/default/flags/lu.png
+%%DATADIR%%/default/flags/lv.png
+%%DATADIR%%/default/flags/ly.png
+%%DATADIR%%/default/flags/ma.png
+%%DATADIR%%/default/flags/mk.png
+%%DATADIR%%/default/flags/mt.png
+%%DATADIR%%/default/flags/mx.png
+%%DATADIR%%/default/flags/ni.png
+%%DATADIR%%/default/flags/nl.png
+%%DATADIR%%/default/flags/no.png
+%%DATADIR%%/default/flags/nz.png
+%%DATADIR%%/default/flags/om.png
+%%DATADIR%%/default/flags/pa.png
+%%DATADIR%%/default/flags/pe.png
+%%DATADIR%%/default/flags/pl.png
+%%DATADIR%%/default/flags/ps.png
+%%DATADIR%%/default/flags/pt.png
+%%DATADIR%%/default/flags/py.png
+%%DATADIR%%/default/flags/qa.png
+%%DATADIR%%/default/flags/ro.png
+%%DATADIR%%/default/flags/ru.png
+%%DATADIR%%/default/flags/sa.png
+%%DATADIR%%/default/flags/sd.png
+%%DATADIR%%/default/flags/se.png
+%%DATADIR%%/default/flags/si.png
+%%DATADIR%%/default/flags/sk.png
+%%DATADIR%%/default/flags/so.png
+%%DATADIR%%/default/flags/sr.png
+%%DATADIR%%/default/flags/sv.png
+%%DATADIR%%/default/flags/sy.png
+%%DATADIR%%/default/flags/th.png
+%%DATADIR%%/default/flags/tn.png
+%%DATADIR%%/default/flags/tr.png
+%%DATADIR%%/default/flags/tt.png
+%%DATADIR%%/default/flags/tw.png
+%%DATADIR%%/default/flags/ua.png
+%%DATADIR%%/default/flags/us.png
+%%DATADIR%%/default/flags/uy.png
+%%DATADIR%%/default/flags/vc.png
+%%DATADIR%%/default/flags/ve.png
+%%DATADIR%%/default/flags/vn.png
+%%DATADIR%%/default/flags/ye.png
+%%DATADIR%%/default/flags/za.png
 %%DATADIR%%/default/splash.png
+%%DATADIR%%/default/trayicon/around_frame_1.png
+%%DATADIR%%/default/trayicon/around_frame_2.png
+%%DATADIR%%/default/trayicon/around_frame_3.png
+%%DATADIR%%/default/trayicon/around_frame_4.png
+%%DATADIR%%/default/trayicon/busy.ani
+%%DATADIR%%/default/trayicon/frame_basic.png
+%%DATADIR%%/default/trayicon/ready.ani
+%%DATADIR%%/default/trayicon/red_frame_1_4.png
+%%DATADIR%%/default/trayicon/red_frame_2_4.png
+%%DATADIR%%/default/trayicon/red_frame_3_4.png
+%%DATADIR%%/default/trayicon/red_frame_4_4.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 %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/default/trayicon
 @dirrm %%DATADIR%%/default/flags
 @dirrm %%DATADIR%%/default
 @dirrm %%DATADIR%%