Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Nov 2013 13:23:10 +0000 (UTC)
From:      Ganael LAPLANCHE <martymac@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r334485 - in head/games/trackballs: . files
Message-ID:  <201311211323.rALDNAtr000722@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: martymac
Date: Thu Nov 21 13:23:10 2013
New Revision: 334485
URL: http://svnweb.freebsd.org/changeset/ports/334485

Log:
  - Enable staging
  - Use new LIB_DEPENDS format
  - Update USES
  - Use new OPTIONS framework
  - Rework pkg-descr

Added:
  head/games/trackballs/files/patch-share-icons-Makefile.in   (contents, props changed)
Modified:
  head/games/trackballs/Makefile
  head/games/trackballs/pkg-descr   (contents, props changed)
  head/games/trackballs/pkg-plist   (contents, props changed)

Modified: head/games/trackballs/Makefile
==============================================================================
--- head/games/trackballs/Makefile	Thu Nov 21 13:20:15 2013	(r334484)
+++ head/games/trackballs/Makefile	Thu Nov 21 13:23:10 2013	(r334485)
@@ -3,7 +3,7 @@
 
 PORTNAME=	trackballs
 PORTVERSION=	1.1.4
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	games
 MASTER_SITES=	SF \
 		SF/${PORTNAME}/music/1.4/:music
@@ -15,53 +15,36 @@ COMMENT=	SDL-based Marble Madness clone
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	guile:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 USE_GL=		gl
 USE_SDL=	image mixer sdl ttf
-USES=		desktop-file-utils gettext
-USE_GMAKE=	yes
+USES=		gmake gettext desktop-file-utils
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 MAKE_ARGS=	mkinstalldirs="${MKDIR}"
 
-MAN6=	trackballs.6
-MANCOMPRESSED=	no
-
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
-OPTIONS_DEFINE=	NLS MUSIC
+OPTIONS_DEFINE=	MUSIC NLS
+OPTIONS_DEFAULT=	MUSIC NLS
+OPTIONS_SUB=	yes
 MUSIC_DESC=	Install additional music
-OPTIONS_DEFAULT=	NLS MUSIC
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=	--enable-nls
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMUSIC}
-PLIST_SUB+=	MUSIC=""
-.else
-PLIST_SUB+=	MUSIC="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|install -D|$$(INSTALL)|' \
 		${WRKSRC}/share/Makefile.in
 
 post-install:
 .if ${PORT_OPTIONS:MMUSIC}
-	@${INSTALL_DATA} ${WRKDIR}/trackballs-music/*.ogg ${DATADIR}/music/
+	@${INSTALL_DATA} ${WRKDIR}/trackballs-music/*.ogg ${STAGEDIR}${DATADIR}/music/
 .endif
-	@${INSTALL_DATA} ${WRKSRC}/share/icons/${PORTNAME}-48x48.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
+	@${INSTALL_DATA} ${WRKSRC}/share/icons/${PORTNAME}-48x48.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 
 .include <bsd.port.mk>

Added: head/games/trackballs/files/patch-share-icons-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/trackballs/files/patch-share-icons-Makefile.in	Thu Nov 21 13:23:10 2013	(r334485)
@@ -0,0 +1,29 @@
+--- share/icons/Makefile.in.orig	2013-11-20 07:09:14.000000000 +0100
++++ share/icons/Makefile.in	2013-11-20 07:11:37.000000000 +0100
+@@ -374,17 +374,17 @@
+ 	echo "Exec=$(bindir)/trackballs" >> trackballs.desktop
+ 
+ install-iconsDATA:
+-	$(mkinstalldirs) $(iconsdir)/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/trackballs-32x32.png $(iconsdir)/32x32/apps/trackballs.png
+-	$(mkinstalldirs) $(iconsdir)/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/trackballs-48x48.png $(iconsdir)/48x48/apps/trackballs.png
+-	$(mkinstalldirs) $(iconsdir)/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/trackballs-64x64.png $(iconsdir)/64x64/apps/trackballs.png
++	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/trackballs-32x32.png $(DESTDIR)$(iconsdir)/32x32/apps/trackballs.png
++	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/trackballs-48x48.png $(DESTDIR)$(iconsdir)/48x48/apps/trackballs.png
++	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/trackballs-64x64.png $(DESTDIR)$(iconsdir)/64x64/apps/trackballs.png
+ 
+ uninstall-iconsDATA:
+-	-rm -f $(iconsdir)/32x32/apps/trackballs.png
+-	-rm -f $(iconsdir)/48x48/apps/trackballs.png
+-	-rm -f $(iconsdir)/64x64/apps/trackballs.png
++	-rm -f $(DESTDIR)$(iconsdir)/32x32/apps/trackballs.png
++	-rm -f $(DESTDIR)$(iconsdir)/48x48/apps/trackballs.png
++	-rm -f $(DESTDIR)$(iconsdir)/64x64/apps/trackballs.png
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:

Modified: head/games/trackballs/pkg-descr
==============================================================================
--- head/games/trackballs/pkg-descr	Thu Nov 21 13:20:15 2013	(r334484)
+++ head/games/trackballs/pkg-descr	Thu Nov 21 13:23:10 2013	(r334485)
@@ -1,20 +1,7 @@
-Trackballs is a simple game similar to the classical game Marble Madness
-on the Amiga in the 80's. By steering a marble ball through a labyrinth
-filled with vicious hammers, pools of acid and other obstacles the player
-collects points. When the ball reaches the destination it continues
-at the next, more difficult level - unless the time runs out. 
-
-It should be noted that this game is not intended to be a replica of 
-marble madness but rather inspired by it. For instance the game uses 
-advanced 3D graphics even though the original game had no real use for 
-it. Also we aim at making the game highly configurable by a scripting 
-extension (Guile) and provide a simple editor by which new levels easily 
-can be created. The current status of the project is very early in 
-development and is thus barely playable.
-
-You start /Trackballs/ by giving the command 'trackballs' which
-instructs the game to load the first level. If you wish to cheat or simply
-are testing out a level you are currently designing you can give the command
-'trackballs -l foo' which jumps to level "foo".
+Trackballs is a simple game similar to the classical game Marble Madness on the
+Amiga in the 80's. By steering a marble ball through a labyrinth filled with
+vicious hammers, pools of acid and other obstacles the player collects points.
+When the ball reaches the destination it continues at the next, more difficult
+level - unless the time runs out.
 
 WWW: http://trackballs.sourceforge.net/

Modified: head/games/trackballs/pkg-plist
==============================================================================
--- head/games/trackballs/pkg-plist	Thu Nov 21 13:20:15 2013	(r334484)
+++ head/games/trackballs/pkg-plist	Thu Nov 21 13:23:10 2013	(r334485)
@@ -1,4 +1,5 @@
 bin/trackballs
+man/man6/trackballs.6.gz
 share/applications/trackballs.desktop
 share/icons/hicolor/32x32/apps/trackballs.png
 share/icons/hicolor/48x48/apps/trackballs.png



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