Bug 188355 - games/xabacus: Update to version 8.0.0
Summary: games/xabacus: Update to version 8.0.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-04-07 19:40 UTC by tkato432
Modified: 2014-04-26 03:40 UTC (History)
0 users

See Also:


Attachments
file.diff (3.27 KB, patch)
2014-04-07 19:40 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2014-04-07 19:40:01 UTC
- Update to version 8.0.0
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-04-07 19:40:10 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Comment 2 Martin Wilke freebsd_committer freebsd_triage 2014-04-26 03:30:32 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 3 dfilter service freebsd_committer freebsd_triage 2014-04-26 03:30:45 UTC
Author: miwi
Date: Sat Apr 26 02:30:39 2014
New Revision: 352213
URL: http://svnweb.freebsd.org/changeset/ports/352213
QAT: https://qat.redports.org/buildarchive/r352213/

Log:
  - Update to version 8.0.0
  - Convert to USES
  - Convert to OPTIONS helper
  
  PR:		188355
  Submitted by:	ports fury

Modified:
  head/games/xabacus/Makefile
  head/games/xabacus/distinfo
  head/games/xabacus/pkg-plist

Modified: head/games/xabacus/Makefile
==============================================================================
--- head/games/xabacus/Makefile	Sat Apr 26 02:29:07 2014	(r352212)
+++ head/games/xabacus/Makefile	Sat Apr 26 02:30:39 2014	(r352213)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 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 @@ COMMENT=	Abacus for X Window System
 
 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>

Modified: head/games/xabacus/distinfo
==============================================================================
--- head/games/xabacus/distinfo	Sat Apr 26 02:29:07 2014	(r352212)
+++ head/games/xabacus/distinfo	Sat Apr 26 02:30:39 2014	(r352213)
@@ -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

Modified: head/games/xabacus/pkg-plist
==============================================================================
--- head/games/xabacus/pkg-plist	Sat Apr 26 02:29:07 2014	(r352212)
+++ head/games/xabacus/pkg-plist	Sat Apr 26 02:30:39 2014	(r352213)
@@ -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 @@ lib/X11/app-defaults/Abacus
 %%DATADIR%%/Abacusru4_1.les
 %%DATADIR%%/Abacusru5_1.les
 %%DATADIR%%/bump.au
+%%DATADIR%%/drip.au
 %%DATADIR%%/move.au
 @dirrm %%DATADIR%%
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"