Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Apr 2014 03:25:40 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/188355: games/xabacus: Update to version 8.0.0
Message-ID:  <20140408032540.a9cdf6f378cf34ad4909a6bc@yahoo.com>
Resent-Message-ID: <201404071840.s37Ie1Ib013890@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         188355
>Category:       ports
>Synopsis:       games/xabacus: Update to version 8.0.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 07 18:40:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p7 i386
>Organization:
>Environment:
>Description:
- Update to version 8.0.0

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/games/xabacus/Makefile games/xabacus/Makefile
--- /usr/ports/games/xabacus/Makefile	2013-11-13 06:17:43.000000000 +0900
+++ games/xabacus/Makefile	2014-04-08 00:00:00.000000000 +0900
@@ -2,7 +2,7 @@
 # $FreeBSD: head/games/xabacus/Makefile 333619 2013-11-12 20:50:59Z danilo $
 
 PORTNAME=	xabacus
-PORTVERSION=	7.7.1
+PORTVERSION=	8.0.0
 CATEGORIES=	games
 MASTER_SITES=	http://www.tux.org/~bagleyd/abacus/ \
 		http://ftp.tux.org/pub/tux/bagleyd/xabacus/
@@ -12,31 +12,38 @@
 
 LICENSE=	BSD
 
-OPTIONS_DEFINE=	MOTIF ESOUND
-OPTIONS_DEFAULT=	MOTIF
-
-USE_BZIP2=	yes
+USES=		tar:bzip2
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-nas
+INSTALLS_ICONS=	yes
 
-MOTIF_USES=	motif
-MOTIF_CONFIGURE_WITH=	motif
+DESKTOP_ENTRIES="XAbacus" "" "abacus" "${PORTNAME}" "" ""
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=		ESOUND MOTIF
+OPTIONS_DEFAULT=	MOTIF
 
-.if ${PORT_OPTIONS:MESOUND}
-USE_GNOME+=	esound
-CONFIGURE_ARGS+=	--without-rplay --with-esound
-.else
-LIB_DEPENDS+=		librplay.so:${PORTSDIR}/audio/rplay
-CONFIGURE_ARGS+=	--with-rplay --without-esound
-.endif
+ESOUND_LIB_DEPENDS_OFF=	librplay.so:${PORTSDIR}/audio/rplay
+ESOUND_USE=		gnome=esound
+ESOUND_CONFIGURE_ON=	--without-rplay --with-esound
+ESOUND_CONFIGURE_OFF=	--with-rplay --without-esound
+ESOUND_LDFLAGS=		-L${LOCALBASE}/lib -laudiofile
+MOTIF_USES=	motif
+MOTIF_CONFIGURE_WITH=	motif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/games/|/|g' ${WRKSRC}/Makefile.in
-
-post-configure:
-	@${REINPLACE_CMD} -e '/^XWIDGETLDFLAGS/d' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e \
+		's|\($$(datadir)\)/games|\1| ; \
+		 s|@XWIDGETLDFLAGS@|@LDFLAGS@| ; \
+		 s|\([[:blank:]]\)/usr/games|\1$$(DESTDIR)$$(bindir)| ; \
+		 /chmod/s|^|#| ; \
+		 /chown/s|^|#|' ${WRKSRC}/Makefile.in
+
+post-install:
+.for i in 16 22 24 32 48
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps
+	(cd ${WRKSRC}/pixmaps/${i}x${i} && ${INSTALL_DATA} abacus.png \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps)
+.endfor
 
 .include <bsd.port.mk>
diff -urN /usr/ports/games/xabacus/distinfo games/xabacus/distinfo
--- /usr/ports/games/xabacus/distinfo	2013-11-06 22:01:22.000000000 +0900
+++ games/xabacus/distinfo	2014-04-08 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (xabacus-7.7.1.tar.bz2) = f5d409b62dbbe8e4dc091f4c4b9823edb85a4f4b6286505a0eb2cf5bf6945fd1
-SIZE (xabacus-7.7.1.tar.bz2) = 296037
+SHA256 (xabacus-8.0.0.tar.bz2) = e81aa183f2f0e1ed962709ed9aed0646ae1ad8cf57b4e60866201e8af54ea874
+SIZE (xabacus-8.0.0.tar.bz2) = 285620
diff -urN /usr/ports/games/xabacus/pkg-plist games/xabacus/pkg-plist
--- /usr/ports/games/xabacus/pkg-plist	2014-01-23 05:20:48.000000000 +0900
+++ games/xabacus/pkg-plist	2014-04-08 00:00:00.000000000 +0900
@@ -1,6 +1,15 @@
+@group games
+@owner games
 bin/xabacus
-man/man6/xabacus.6.gz
+@owner
+@group
 lib/X11/app-defaults/Abacus
+man/man6/xabacus.6.gz
+share/icons/hicolor/16x16/apps/abacus.png
+share/icons/hicolor/22x22/apps/abacus.png
+share/icons/hicolor/24x24/apps/abacus.png
+share/icons/hicolor/32x32/apps/abacus.png
+share/icons/hicolor/48x48/apps/abacus.png
 %%DATADIR%%/Abacus.ps
 %%DATADIR%%/Abacus1_1.les
 %%DATADIR%%/Abacus1_2.les
@@ -27,5 +36,6 @@
 %%DATADIR%%/Abacusru4_1.les
 %%DATADIR%%/Abacusru5_1.les
 %%DATADIR%%/bump.au
+%%DATADIR%%/drip.au
 %%DATADIR%%/move.au
 @dirrm %%DATADIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140408032540.a9cdf6f378cf34ad4909a6bc>