- Support staging

- Fix build on 10.x
- Drop maintainership

2 files changed, 19 insertions, 149 deletions

diff --git a/games/xqf/Makefile b/games/xqf/Makefile
index 1f08a362ee17..31fb8ad1a10c 100644
--- a/games/xqf/Makefile
+++ b/games/xqf/Makefile
@@ -7,47 +7,41 @@ PORTREVISION=	8
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	amdmi3@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Server browser for many popular 3D action games
 
 RUN_DEPENDS=	qstat:${PORTSDIR}/games/qstat
 
 USE_GNOME=	intlhack
 USES=		gettext gmake pkgconfig
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
-
-MAN6=		xqf.6
+CONFIGURE_ENV=	LIBS="-lX11" # uses XGetWindowAttributes but doesn't link with X11
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	GTK2 GEOIP BZIP2
-OPTIONS_DEFAULT=	GTK2 GEOIP BZIP2
+PORTDATA=	*
+PORTDOCS=	*
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	GTK2 GEOIP BZIP2 DOCS
+OPTIONS_DEFAULT=GTK2 GEOIP BZIP2
 
-.if ${PORT_OPTIONS:MGTK2}
-USE_GNOME+=	gtk20
-CONFIGURE_ARGS+=	--enable-gtk2
-.else
-USE_GNOME+=	gdkpixbuf
-.endif
+GTK2_USE=		GNOME=gtk20
+GTK2_CONFIGURE_ENABLE=	gtk2
 
-.if ${PORT_OPTIONS:MGEOIP}
-LIB_DEPENDS+=	GeoIP:${PORTSDIR}/net/GeoIP
-.else
-CONFIGURE_ARGS+=	--disable-geoip
-.endif
+GEOIP_CONFIGURE_ENABLE=	geoip
+GEOIP_LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+BZIP2_CONFIGURE_ENABLE=	bzip2
 
-.if ${PORT_OPTIONS:MBZIP2}
-CONFIGURE_ARGS+=	--enable-bzip2
+.include <bsd.port.options.mk>
+
+.if ! ${PORT_OPTIONS:MGTK2}
+USE_GNOME+=	gdkpixbuf
 .endif
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/xqfdocs.html ${DOCSDIR}
-.endif
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/xqfdocs.html ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/games/xqf/pkg-plist b/games/xqf/pkg-plist
index 0af732be23f1..e6cb2c008bdb 100644
--- a/games/xqf/pkg-plist
+++ b/games/xqf/pkg-plist
@@ -1,7 +1,5 @@
-@comment $FreeBSD$
 bin/xqf
-@exec mkdir -p %D/lib/xqf
-%%PORTDOCS%%%%DOCSDIR%%/xqfdocs.html
+man/man6/xqf.6.gz
 share/locale/ca/LC_MESSAGES/xqf.mo
 share/locale/da/LC_MESSAGES/xqf.mo
 share/locale/de/LC_MESSAGES/xqf.mo
@@ -15,125 +13,3 @@ 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
-%%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/gtkrc
-%%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_4_4.png
-%%DATADIR%%/default/xqf_48x48.png
-%%DATADIR%%/qstat.cfg
-@dirrm lib/xqf
-@dirrm %%DATADIR%%/default/trayicon
-@dirrm %%DATADIR%%/default/flags
-@dirrm %%DATADIR%%/default
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%