7 files changed, 51 insertions, 73 deletions

diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index f4997f7546de..9acaa68c9367 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -6,16 +6,33 @@
 #
 
 PORTNAME=	xinvaders
-PORTVERSION=	1.1
+PORTVERSION=	2.1.1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade/invaders
-DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+
 NO_CDROM=	"don't sell for profit"
-USE_IMAKE=	yes
+
+USE_X_PREFIX=	yes
+USE_AUTOMAKE=	yes
+AUTOMAKE_ARGS=	--include-deps
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ARGS=	--enable-scorefile=${PREFIX}/share/xinvaders/xinvaders.scores
+
 MAN6=		xinvaders.6
 
+post-install:
+	${INSTALL_DATA} ${FILESDIR}/Vaders.ad ${PREFIX}/lib/X11/app-defaults/Vaders
+	@${MKDIR} ${PREFIX}/share/xinvaders
+	@${ECHO} '0' > ${PREFIX}/share/xinvaders/xinvaders.scores
+	@${CHOWN} root:games ${PREFIX}/bin/xinvaders
+	@${CHMOD} 2555 ${PREFIX}/bin/xinvaders
+	@${CHOWN} root:games ${PREFIX}/share/xinvaders/xinvaders.scores
+	@${CHMOD} 0660 ${PREFIX}/share/xinvaders/xinvaders.scores
+
 .include <bsd.port.mk>
diff --git a/games/xinvaders/distinfo b/games/xinvaders/distinfo
index 6af0de5e189c..2e804e0f5e04 100644
--- a/games/xinvaders/distinfo
+++ b/games/xinvaders/distinfo
@@ -1 +1 @@
-MD5 (xinvaders.tar.gz) = 531cea11e29f5560a1fb663356d6d15d
+MD5 (xinvaders-2.1.1.tar.gz) = 0b069e3498a72cca7629fb44fb1d991f
diff --git a/games/xinvaders/files/Imakefile b/games/xinvaders/files/Imakefile
deleted file mode 100644
index d4458ac31abf..000000000000
--- a/games/xinvaders/files/Imakefile
+++ /dev/null
@@ -1,37 +0,0 @@
-INVADERDIR=$(LIBDIR)/xinvaders
-
-
-LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-
-OBJS = spacers.o base.o widget.o main.o vaders.o shot.o score.o
-
-SRCS = spacers.c base.c widget.c main.c vaders.c shot.c score.c
-
-ComplexProgramTarget(xinvaders)
-InstallAppDefaults(Vaders)
-MakeDirectories(install,$(INVADERDIR))
-InstallNonExec(base1.bit,$(INVADERDIR))
-InstallNonExec(spacer2.bit,$(INVADERDIR))
-InstallNonExec(vader1a1.bit,$(INVADERDIR))
-InstallNonExec(vader2a2.bit,$(INVADERDIR))
-InstallNonExec(vader3b1.bit,$(INVADERDIR))
-InstallNonExec(base2.bit,$(INVADERDIR))
-InstallNonExec(sperma1.bit,$(INVADERDIR))
-InstallNonExec(vader1a2.bit,$(INVADERDIR))
-InstallNonExec(vader2b1.bit,$(INVADERDIR))
-InstallNonExec(vader3b2.bit,$(INVADERDIR))
-InstallNonExec(explode1.bit,$(INVADERDIR))
-InstallNonExec(sperma2.bit,$(INVADERDIR))
-InstallNonExec(vader1b1.bit,$(INVADERDIR))
-InstallNonExec(vader2b2.bit,$(INVADERDIR))
-InstallNonExec(vexplod1.bit,$(INVADERDIR))
-InstallNonExec(explode2.bit,$(INVADERDIR))
-InstallNonExec(spermb1.bit,$(INVADERDIR))
-InstallNonExec(vader1b2.bit,$(INVADERDIR))
-InstallNonExec(vader3a1.bit,$(INVADERDIR))
-InstallNonExec(vexplod2.bit,$(INVADERDIR))
-InstallNonExec(spacer1.bit,$(INVADERDIR))
-InstallNonExec(spermb2.bit,$(INVADERDIR))
-InstallNonExec(vader2a1.bit,$(INVADERDIR))
-InstallNonExec(vader3a2.bit,$(INVADERDIR))
-MANSUFFIX=6
diff --git a/games/xinvaders/files/Vaders.ad b/games/xinvaders/files/Vaders.ad
index e671af0a082c..e8ad03083d21 100644
--- a/games/xinvaders/files/Vaders.ad
+++ b/games/xinvaders/files/Vaders.ad
@@ -1,4 +1,4 @@
-Vaders*BitmapDirectory:        /usr/X11R6/lib/X11/xinvaders/
+Vaders*font:                   -*-*-*-*-*-sans-14-*-*-*-m-*-*-*
 Vaders*Scale:                  2
 Vaders*defaultfore:            white
 Vaders*defaultback:            black
diff --git a/games/xinvaders/files/patch-aa b/games/xinvaders/files/patch-aa
new file mode 100644
index 000000000000..af50edce9f96
--- /dev/null
+++ b/games/xinvaders/files/patch-aa
@@ -0,0 +1,26 @@
+--- Makefile.am.orig	Sat Sep 16 16:31:29 2000
++++ Makefile.am	Sat Feb  3 11:18:31 2001
+@@ -3,8 +3,7 @@
+ SUBDIRS=intl po
+ EXTRA_DIST=debian Vaders xinvaders.6 icon.xpm xinvaders.lsm
+ 
+-execgamesdir=$(prefix)/games
+-execgames_PROGRAMS = xinvaders
++bin_PROGRAMS = xinvaders
+ 
+ xinvaders_SOURCES = base.c main.c score.c shot.c spacers.c vaders.c \
+ widget.c me.h patchlevel.h vaders.h base1.bit base2.bit explode1.bit \
+@@ -14,13 +13,3 @@
+ vader3b1.bit vader3b2.bit vexplod1.bit vexplod2.bit
+ 
+ man_MANS = xinvaders.6
+-
+-install-data-local:
+-	mkdir -p $(shell dirname $(DESTDIR)$(SCOREFILE) )
+-	echo 0 > $(DESTDIR)$(SCOREFILE)
+-	chgrp games $(DESTDIR)$(SCOREFILE)
+-	chmod 0660 $(DESTDIR)$(SCOREFILE)
+-
+-install-exec-local:
+-	chgrp games $(DESTDIR)$(execgamesdir)/xinvaders
+-	chmod g+s $(DESTDIR)$(execgamesdir)/xinvaders
diff --git a/games/xinvaders/pkg-plist b/games/xinvaders/pkg-plist
index 82bd0fd134cf..e2fb2d9e1b81 100644
--- a/games/xinvaders/pkg-plist
+++ b/games/xinvaders/pkg-plist
@@ -1,27 +1,5 @@
 bin/xinvaders
 lib/X11/app-defaults/Vaders
-lib/X11/xinvaders/base1.bit
-lib/X11/xinvaders/base2.bit
-lib/X11/xinvaders/explode1.bit
-lib/X11/xinvaders/explode2.bit
-lib/X11/xinvaders/spacer1.bit
-lib/X11/xinvaders/spacer2.bit
-lib/X11/xinvaders/sperma1.bit
-lib/X11/xinvaders/sperma2.bit
-lib/X11/xinvaders/spermb1.bit
-lib/X11/xinvaders/spermb2.bit
-lib/X11/xinvaders/vader1a1.bit
-lib/X11/xinvaders/vader1a2.bit
-lib/X11/xinvaders/vader1b1.bit
-lib/X11/xinvaders/vader1b2.bit
-lib/X11/xinvaders/vader2a1.bit
-lib/X11/xinvaders/vader2a2.bit
-lib/X11/xinvaders/vader2b1.bit
-lib/X11/xinvaders/vader2b2.bit
-lib/X11/xinvaders/vader3a1.bit
-lib/X11/xinvaders/vader3a2.bit
-lib/X11/xinvaders/vader3b1.bit
-lib/X11/xinvaders/vader3b2.bit
-lib/X11/xinvaders/vexplod1.bit
-lib/X11/xinvaders/vexplod2.bit
-@dirrm lib/X11/xinvaders
+share/locale/es/LC_MESSAGES/xinvaders.mo
+share/xinvaders/xinvaders.scores
+@dirrm share/xinvaders
diff --git a/games/xinvaders/scripts/pre-configure b/games/xinvaders/scripts/pre-configure
deleted file mode 100644
index ada250270826..000000000000
--- a/games/xinvaders/scripts/pre-configure
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-cp -f ${CURDIR}/files/Imakefile ${WRKSRC}
-cp -f ${CURDIR}/files/Vaders.ad ${WRKSRC}
-
-exit 0