svn commit: r498490 - in head: . games games/xbill

[Alex Kozlov]

Author: ak
Date: Tue Apr  9 18:42:38 2019
New Revision: 498490
URL: https://svnweb.freebsd.org/changeset/ports/498490

Log:
  - Resurrect games/xbill

Added:
  head/games/xbill/
     - copied from r481888, head/games/xbill/
Modified:
  head/MOVED
  head/games/Makefile
  head/games/xbill/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Tue Apr  9 18:07:29 2019	(r498489)
+++ head/MOVED	Tue Apr  9 18:42:38 2019	(r498490)
@@ -10776,7 +10776,6 @@ editors/manedit||2018-12-21|Has expired: Uses obsolete
 misc/gtkfind||2018-12-21|Has expired: Uses obsolete glib12
 games/mindguard||2018-12-21|Has expired: Uses obsolete glib12
 games/xbattle||2018-12-21|Has expired: Uses obsolete glib12
-games/xbill||2018-12-21|Has expired: Uses obsolete glib12
 games/corewars||2018-12-21|Has expired: Uses obsolete glib12
 games/dopewars||2018-12-21|Has expired: Uses obsolete glib12
 games/garith||2018-12-21|Has expired: Uses obsolete glib12

Modified: head/games/Makefile
==============================================================================
--- head/games/Makefile	Tue Apr  9 18:07:29 2019	(r498489)
+++ head/games/Makefile	Tue Apr  9 18:42:38 2019	(r498490)
@@ -1046,6 +1046,7 @@
     SUBDIR += xasteroids
     SUBDIR += xataxx
     SUBDIR += xbat
+    SUBDIR += xbill
     SUBDIR += xbl
     SUBDIR += xblackjack
     SUBDIR += xblast

Modified: head/games/xbill/Makefile
==============================================================================
--- head/games/xbill/Makefile	Fri Oct 12 09:19:04 2018	(r481888)
+++ head/games/xbill/Makefile	Tue Apr  9 18:42:38 2019	(r498490)
@@ -5,17 +5,13 @@ PORTNAME=	xbill
 PORTVERSION=	2.1
 PORTREVISION=	9
 CATEGORIES=	games
-MASTER_SITES=	http://www.xbill.org/download/ \
-		http://mirror.amdmi3.ru/distfiles/
+MASTER_SITES=	http://www.xbill.org/download/
 
-MAINTAINER=	amdmi3 at FreeBSD.org
+MAINTAINER=	ak at FreeBSD.org
 COMMENT=	Save your computers from the evil clutches of Bill
 
-DEPRECATED=	Uses obsolete glib12
-EXPIRATION_DATE=	2018-12-20
-
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=${SCORES_DIR}
+CONFIGURE_ARGS=	--localstatedir=${SCORES_DIR} --disable-gtk
 
 SCORES_DIR?=	${DATADIR}/scores
 
@@ -31,28 +27,20 @@ PLIST_FILES=	bin/${PORTNAME} \
 
 PORTDATA=	*
 
+USE_XORG=	xt x11 sm ice xpm
+
 OPTIONS_SINGLE=	WIDGETSET
-OPTIONS_SINGLE_WIDGETSET=	ATHENA GTK MOTIF
-OPTIONS_DEFAULT=	GTK
+OPTIONS_SINGLE_WIDGETSET=	ATHENA MOTIF
+OPTIONS_DEFAULT=	ATHENA
 
 ATHENA_DESC=	Athena widget set
-GTK_DESC=	GTK widget set
 MOTIF_DESC=	Motif widget set
 
-.include <bsd.port.options.mk>
+ATHENA_CONFIGURE_ARGS_ON=	--disable-motif
+ATHENA_USE=	xorg=xaw,xmu
 
-.if ${PORT_OPTIONS:MATHENA}
-CONFIGURE_ARGS+=	--disable-gtk --disable-motif
-USE_XORG=	xaw xmu xt x11 sm ice
-.elif ${PORT_OPTIONS:MMOTIF}
-CONFIGURE_ARGS+=	--disable-athena --disable-gtk
-USE_XORG=	xt x11 sm ice xpm
-USES=		motif
-.else # ${PORT_OPTIONS:MGTK}
-CONFIGURE_ARGS+=	--disable-athena --disable-motif
-USE_GNOME=	gtk12
-USE_XORG=	sm ice
-.endif
+MOTIF_CONFIGURE_ARGS_ON=	--disable-athena
+MOTIF_USES=	motif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/WIDGET_LIBS=/ s|-lXm"$$|-lXm -lXpm"|' \