5 files changed, 23 insertions, 42 deletions

diff --git a/games/xabacus/Makefile b/games/xabacus/Makefile
index ce698370e464..630b7ba13ba2 100644
--- a/games/xabacus/Makefile
+++ b/games/xabacus/Makefile
@@ -6,26 +6,31 @@
 #
 
 PORTNAME=	xabacus
-PORTVERSION=	5.5.2
+PORTVERSION=	7.0.3
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_XCONTRIB} \
+MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		ftp://ftp.tux.org/pub/tux/bagleyd/xabacus/
-MASTER_SITE_SUBDIR=	applications
+MASTER_SITE_SUBDIR=	apps/math
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Abacus for X Window System
 
-WRKSRC=		${WRKDIR}/xabacus
-USE_MOTIF=	yes
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+
+MAN6=		xabacus.6
 
-MAN1=		xabacus.1
+.if defined(WITHOUT_MOTIF)
+CONFIGURE_ARGS+=	--without-motif
+.else
+USE_MOTIF=	yes
+.endif
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xabacus ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/xmabacus ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xabacus.man ${PREFIX}/man/man1/xabacus.1
-	${INSTALL_DATA} ${WRKSRC}/Abacus.ad ${X11BASE}/lib/X11/app-defaults/Abacus
+post-patch:
+	@${REINPLACE_CMD} -e 's|/games/|/|g' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/games/xabacus/distinfo b/games/xabacus/distinfo
index d1ac88777721..6113a43813de 100644
--- a/games/xabacus/distinfo
+++ b/games/xabacus/distinfo
@@ -1 +1 @@
-MD5 (xabacus-5.5.2.tar.gz) = 2ec8d651b3a24c6919aac0ccf85bbe99
+MD5 (xabacus-7.0.3.tar.bz2) = 5cee23da251f8fdbb2b9d078a76067b0
diff --git a/games/xabacus/files/patch-aa b/games/xabacus/files/patch-aa
deleted file mode 100644
index 95717baf3c62..000000000000
--- a/games/xabacus/files/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
---- Abacus.c	Sat Feb 15 02:57:06 1997
-+++ /home/andy/tmp/wrk/Abacus.c	Sun May  3 11:33:29 1998
-@@ -184,6 +184,7 @@
- #endif /* !LESS_THAN_AIX3_2 */
- #endif /* defined(SYSV) || defined(SVR4) */
- 
-+#ifndef __FreeBSD__
- static int
- usleep(long unsigned int usec)
- {
-@@ -225,6 +226,7 @@
- #endif
- 	return 0;
- }
-+#endif
- #endif
- 
- static void
diff --git a/games/xabacus/files/patch-ab b/games/xabacus/files/patch-ab
deleted file mode 100644
index 07786a3cfbd3..000000000000
--- a/games/xabacus/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed May  6 12:03:35 1998
-+++ configure	Wed May  6 12:03:46 1998
-@@ -2103,7 +2103,7 @@
-   INSTALL_XMWIDGET=""
-   UNINSTALL_XMWIDGET=""
- else
--  XMWIDGETLIBS="-lXm ${LIBS}"
-+  XMWIDGETLIBS="\${MOTIFLIB} -lXext ${LIBS}"
-   XMWIDGET="xmabacus"
-   INSTALL_XMWIDGET="install_xmabacus"
-   UNINSTALL_XMWIDGET="uninstall_xmabacus"
diff --git a/games/xabacus/pkg-plist b/games/xabacus/pkg-plist
index d98adde27dbc..6173c2192ec9 100644
--- a/games/xabacus/pkg-plist
+++ b/games/xabacus/pkg-plist
@@ -1,3 +1,8 @@
 bin/xabacus
-bin/xmabacus
 lib/X11/app-defaults/Abacus
+%%DATADIR%%/Abacus.ps
+%%DATADIR%%/Abacus1.les
+%%DATADIR%%/Abacus2.les
+%%DATADIR%%/Abacus3.les
+%%DATADIR%%/Abacus4.les
+@dirrm %%DATADIR%%