Date: Sun, 02 Sep 2012 16:35:43 +0200 From: nemysis <nemysis@gmx.ch> To: FreeBSD-gnats-submit@FreeBSD.org Cc: martymac@FreeBSD.org Subject: ports/171256: [PATCH] games/trackballs: Makefile changed, added Music Support and OptionsNG Message-ID: <20120902143547.2277010656D5@hub.freebsd.org> Resent-Message-ID: <201209021440.q82EeacZ091122@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 171256
>Category: ports
>Synopsis: [PATCH] games/trackballs: Makefile changed, added Music Support and OptionsNG
>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: Sun Sep 02 14:40:35 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: nemysis
>Release: FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC
>Description:
Makefile changed:
Added
- Music support
- PLIST_FILES
- PLIST_DIRSTRY
- PORTDATA= *
- Pixmaps
OptionsNG for
- NLS, PLIST_FILES+, only if install NLS
- Music
Removed file(s):
- pkg-plist
Port maintainer (martymac@FreeBSD.org) is cc'd.
Generated and tested manually, tested with port test and with RedPorts (all RELEASES), sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:
--- trackballs-1.1.4_15.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/trackballs/Makefile ./Makefile
--- /usr/ports/games/trackballs/Makefile 2012-08-01 14:50:44.000000000 +0200
+++ ./Makefile 2012-09-02 16:10:53.000000000 +0200
@@ -1,15 +1,13 @@
-# New ports collection makefile for: trackballs
-# Date created: 21 November 2003
-# Whom: Adam Weinberger <adamw@FreeBSD.org>
-#
# $FreeBSD: ports/games/trackballs/Makefile,v 1.39 2012/08/01 12:50:44 martymac Exp $
-#
PORTNAME= trackballs
PORTVERSION= 1.1.4
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= games
-MASTER_SITES= SF
+MASTER_SITES= SF \
+ SF/${PORTNAME}/music/1.4/:music
+DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+ ${PORTNAME}-music-1.4.tar.bz2:music
MAINTAINER= martymac@FreeBSD.org
COMMENT= SDL-based Marble Madness clone
@@ -28,12 +26,42 @@
INSTALLS_ICONS= yes
MAKE_ARGS= mkinstalldirs="${MKDIR}"
-MAN6= trackballs.6
-MANCOMPRESSED= no
+MAN6= trackballs.6
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lintl
+PLIST_FILES= bin/${PORTNAME} \
+ share/pixmaps/${PORTNAME}.png \
+ share/applications/${PORTNAME}.desktop \
+ share/icons/hicolor/32x32/apps/${PORTNAME}.png \
+ share/icons/hicolor/48x48/apps/${PORTNAME}.png \
+ share/icons/hicolor/64x64/apps/${PORTNAME}.png
+PLIST_DIRSTRY= share/applications
+
+PORTDATA= *
+
+OPTIONS_DEFINE= NLS MUSIC
+NLS_DESC= Native Language Support via gettext
+MUSIC_DESC= Install additional music
+OPTIONS_DEFAULT= NLS MUSIC
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+PLIST_FILES+= share/locale/de/LC_MESSAGES/${PORTNAME}.mo \
+ share/locale/fr/LC_MESSAGES/${PORTNAME}.mo \
+ share/locale/hu/LC_MESSAGES/${PORTNAME}.mo \
+ share/locale/it/LC_MESSAGES/${PORTNAME}.mo \
+ share/locale/sk/LC_MESSAGES/${PORTNAME}.mo \
+ share/locale/sv/LC_MESSAGES/${PORTNAME}.mo
+.else
+CONFIGURE_ARGS+= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|install -D|$$(INSTALL)|' \
${WRKSRC}/share/Makefile.in
@@ -41,4 +69,12 @@
post-install:
-@update-desktop-database
+# Music
+.if ${PORT_OPTIONS:MMUSIC}
+ @${INSTALL_DATA} ${WRKDIR}/trackballs-music/*.ogg ${DATADIR}/music/
+.endif
+
+# Pixmaps
+ @${INSTALL_DATA} ${WRKSRC}/share/icons/${PORTNAME}-48x48.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
+
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/games/trackballs/distinfo ./distinfo
--- /usr/ports/games/trackballs/distinfo 2011-07-03 16:25:07.000000000 +0200
+++ ./distinfo 2012-09-02 13:59:33.000000000 +0200
@@ -1,2 +1,4 @@
SHA256 (trackballs-1.1.4.tar.gz) = 459dbaec27354fb4afff3d1aa491bc21b4fc2c0769eae86a47aaeb545cb434a6
SIZE (trackballs-1.1.4.tar.gz) = 7229541
+SHA256 (trackballs-music-1.4.tar.bz2) = bf9b793b6fab81e59fb9a373944a5724af279b0faebb2461bb98beb5aa466058
+SIZE (trackballs-music-1.4.tar.bz2) = 18825033
diff -ruN --exclude=CVS /usr/ports/games/trackballs/pkg-plist ./pkg-plist
--- /usr/ports/games/trackballs/pkg-plist 2010-11-18 10:17:51.000000000 +0100
+++ ./pkg-plist 1970-01-01 01:00:00.000000000 +0100
@@ -1,275 +0,0 @@
-bin/trackballs
-share/applications/trackballs.desktop
-share/icons/hicolor/32x32/apps/trackballs.png
-share/icons/hicolor/48x48/apps/trackballs.png
-share/icons/hicolor/64x64/apps/trackballs.png
-share/locale/de/LC_MESSAGES/trackballs.mo
-share/locale/fr/LC_MESSAGES/trackballs.mo
-share/locale/hu/LC_MESSAGES/trackballs.mo
-share/locale/it/LC_MESSAGES/trackballs.mo
-share/locale/sk/LC_MESSAGES/trackballs.mo
-share/locale/sv/LC_MESSAGES/trackballs.mo
-%%DATADIR%%/api.html
-%%DATADIR%%/customizing.html
-%%DATADIR%%/examples.html
-%%DATADIR%%/fonts/menuFont.ttf
-%%DATADIR%%/highScores
-%%DATADIR%%/images/acid.png
-%%DATADIR%%/images/difficulty0.png
-%%DATADIR%%/images/difficulty0High.png
-%%DATADIR%%/images/difficulty1.png
-%%DATADIR%%/images/difficulty1High.png
-%%DATADIR%%/images/difficulty2.png
-%%DATADIR%%/images/difficulty2High.png
-%%DATADIR%%/images/displayHighscoreBackground.jpg
-%%DATADIR%%/images/dizzy.png
-%%DATADIR%%/images/enterHighscoreBackground.jpg
-%%DATADIR%%/images/font.png
-%%DATADIR%%/images/font.rgb
-%%DATADIR%%/images/font2.png
-%%DATADIR%%/images/font3.png
-%%DATADIR%%/images/glitter.png
-%%DATADIR%%/images/header.png
-%%DATADIR%%/images/help0_1024.png
-%%DATADIR%%/images/help0_640.png
-%%DATADIR%%/images/help1_1024.png
-%%DATADIR%%/images/help1_640.png
-%%DATADIR%%/images/helpBackground.jpg
-%%DATADIR%%/images/ice.png
-%%DATADIR%%/images/left_panel.png
-%%DATADIR%%/images/levelsetup.png
-%%DATADIR%%/images/life.png
-%%DATADIR%%/images/mousePointer.png
-%%DATADIR%%/images/nolife.png
-%%DATADIR%%/images/playersetup.png
-%%DATADIR%%/images/sand.png
-%%DATADIR%%/images/setupBackground.jpg
-%%DATADIR%%/images/slide-01.jpg
-%%DATADIR%%/images/slide-02.jpg
-%%DATADIR%%/images/slide-03.jpg
-%%DATADIR%%/images/slide-04.jpg
-%%DATADIR%%/images/slide-05.jpg
-%%DATADIR%%/images/slide-06.jpg
-%%DATADIR%%/images/slide-07.jpg
-%%DATADIR%%/images/slide-08.jpg
-%%DATADIR%%/images/slide-09.jpg
-%%DATADIR%%/images/slide-10.jpg
-%%DATADIR%%/images/splashScreen.jpg
-%%DATADIR%%/images/texture.png
-%%DATADIR%%/images/texture2.png
-%%DATADIR%%/images/texture3.png
-%%DATADIR%%/images/texture4.png
-%%DATADIR%%/images/track.png
-%%DATADIR%%/images/trackballs32x32.png
-%%DATADIR%%/images/trackballs48x48.png
-%%DATADIR%%/images/wings.png
-%%DATADIR%%/index.html
-%%DATADIR%%/levels/Shop1.map
-%%DATADIR%%/levels/Shop1.scm
-%%DATADIR%%/levels/Shop2.map
-%%DATADIR%%/levels/Shop2.scm
-%%DATADIR%%/levels/bonus.map
-%%DATADIR%%/levels/bonus.scm
-%%DATADIR%%/levels/bonusb.map
-%%DATADIR%%/levels/bonusb.scm
-%%DATADIR%%/levels/boot.scm
-%%DATADIR%%/levels/bx.jpg
-%%DATADIR%%/levels/bx.set
-%%DATADIR%%/levels/bx1.map
-%%DATADIR%%/levels/bx1.scm
-%%DATADIR%%/levels/bx2.map
-%%DATADIR%%/levels/bx2.scm
-%%DATADIR%%/levels/bx3.map
-%%DATADIR%%/levels/bx3.scm
-%%DATADIR%%/levels/castle1.map
-%%DATADIR%%/levels/castle1.scm
-%%DATADIR%%/levels/castle2.map
-%%DATADIR%%/levels/castle2.scm
-%%DATADIR%%/levels/castle3.map
-%%DATADIR%%/levels/castle3.scm
-%%DATADIR%%/levels/castle4.map
-%%DATADIR%%/levels/castle4.scm
-%%DATADIR%%/levels/castles.jpg
-%%DATADIR%%/levels/castles.set
-%%DATADIR%%/levels/castles.txt
-%%DATADIR%%/levels/child.jpg
-%%DATADIR%%/levels/child.set
-%%DATADIR%%/levels/child1.map
-%%DATADIR%%/levels/child1.scm
-%%DATADIR%%/levels/child2.map
-%%DATADIR%%/levels/child2.scm
-%%DATADIR%%/levels/child3.map
-%%DATADIR%%/levels/child3.scm
-%%DATADIR%%/levels/child4.map
-%%DATADIR%%/levels/child4.scm
-%%DATADIR%%/levels/child5.map
-%%DATADIR%%/levels/child5.scm
-%%DATADIR%%/levels/child6.map
-%%DATADIR%%/levels/child6.scm
-%%DATADIR%%/levels/con1.map
-%%DATADIR%%/levels/con1.scm
-%%DATADIR%%/levels/con2.map
-%%DATADIR%%/levels/con2.scm
-%%DATADIR%%/levels/con3.map
-%%DATADIR%%/levels/con3.scm
-%%DATADIR%%/levels/con4.map
-%%DATADIR%%/levels/con4.scm
-%%DATADIR%%/levels/con5.map
-%%DATADIR%%/levels/con5.scm
-%%DATADIR%%/levels/contrib.jpg
-%%DATADIR%%/levels/contrib.set
-%%DATADIR%%/levels/dn.jpg
-%%DATADIR%%/levels/dn.set
-%%DATADIR%%/levels/dn1.map
-%%DATADIR%%/levels/dn1.scm
-%%DATADIR%%/levels/dn2.map
-%%DATADIR%%/levels/dn2.scm
-%%DATADIR%%/levels/dn3.map
-%%DATADIR%%/levels/dn3.scm
-%%DATADIR%%/levels/dn4.map
-%%DATADIR%%/levels/dn4.scm
-%%DATADIR%%/levels/dn5.map
-%%DATADIR%%/levels/dn5.scm
-%%DATADIR%%/levels/dn6.map
-%%DATADIR%%/levels/dn6.scm
-%%DATADIR%%/levels/elite.jpg
-%%DATADIR%%/levels/elite.set
-%%DATADIR%%/levels/elite1.map
-%%DATADIR%%/levels/elite1.scm
-%%DATADIR%%/levels/fourSeasons.jpg
-%%DATADIR%%/levels/fourSeasons.set
-%%DATADIR%%/levels/fourSeasons_1.map
-%%DATADIR%%/levels/fourSeasons_1.scm
-%%DATADIR%%/levels/fourSeasons_2.map
-%%DATADIR%%/levels/fourSeasons_2.scm
-%%DATADIR%%/levels/fourSeasons_3.map
-%%DATADIR%%/levels/fourSeasons_3.scm
-%%DATADIR%%/levels/fourSeasons_4.map
-%%DATADIR%%/levels/fourSeasons_4.scm
-%%DATADIR%%/levels/frg.jpg
-%%DATADIR%%/levels/frg.set
-%%DATADIR%%/levels/frg1.map
-%%DATADIR%%/levels/frg1.scm
-%%DATADIR%%/levels/frg10.map
-%%DATADIR%%/levels/frg10.scm
-%%DATADIR%%/levels/frg2.map
-%%DATADIR%%/levels/frg2.scm
-%%DATADIR%%/levels/frg3.map
-%%DATADIR%%/levels/frg3.scm
-%%DATADIR%%/levels/frg4.map
-%%DATADIR%%/levels/frg4.scm
-%%DATADIR%%/levels/frg5.map
-%%DATADIR%%/levels/frg5.scm
-%%DATADIR%%/levels/frg6.map
-%%DATADIR%%/levels/frg6.scm
-%%DATADIR%%/levels/frg7.map
-%%DATADIR%%/levels/frg7.scm
-%%DATADIR%%/levels/frg8.map
-%%DATADIR%%/levels/frg8.scm
-%%DATADIR%%/levels/frg9.map
-%%DATADIR%%/levels/frg9.scm
-%%DATADIR%%/levels/frgb.map
-%%DATADIR%%/levels/frgb.scm
-%%DATADIR%%/levels/hxtst.map
-%%DATADIR%%/levels/hxtst.scm
-%%DATADIR%%/levels/jump.jpg
-%%DATADIR%%/levels/jump.set
-%%DATADIR%%/levels/jump1.map
-%%DATADIR%%/levels/jump1.scm
-%%DATADIR%%/levels/jump2.map
-%%DATADIR%%/levels/jump2.scm
-%%DATADIR%%/levels/jump3.map
-%%DATADIR%%/levels/jump3.scm
-%%DATADIR%%/levels/jump4.map
-%%DATADIR%%/levels/jump4.scm
-%%DATADIR%%/levels/jump5.map
-%%DATADIR%%/levels/jump5.scm
-%%DATADIR%%/levels/ki.jpg
-%%DATADIR%%/levels/ki.set
-%%DATADIR%%/levels/ki1.map
-%%DATADIR%%/levels/ki1.scm
-%%DATADIR%%/levels/ki2.map
-%%DATADIR%%/levels/ki2.scm
-%%DATADIR%%/levels/ki3.map
-%%DATADIR%%/levels/ki3.scm
-%%DATADIR%%/levels/ki4.map
-%%DATADIR%%/levels/ki4.scm
-%%DATADIR%%/levels/ki5.map
-%%DATADIR%%/levels/ki5.scm
-%%DATADIR%%/levels/lv.jpg
-%%DATADIR%%/levels/lv.set
-%%DATADIR%%/levels/lv1.map
-%%DATADIR%%/levels/lv1.scm
-%%DATADIR%%/levels/lv2.map
-%%DATADIR%%/levels/lv2.scm
-%%DATADIR%%/levels/lv3.map
-%%DATADIR%%/levels/lv3.scm
-%%DATADIR%%/levels/lv4.map
-%%DATADIR%%/levels/lv4.scm
-%%DATADIR%%/levels/lv5.map
-%%DATADIR%%/levels/lv5.scm
-%%DATADIR%%/levels/lv6.map
-%%DATADIR%%/levels/lv6.scm
-%%DATADIR%%/levels/lv7.map
-%%DATADIR%%/levels/lv7.scm
-%%DATADIR%%/levels/lv8.map
-%%DATADIR%%/levels/lv8.scm
-%%DATADIR%%/levels/lv9.map
-%%DATADIR%%/levels/lv9.scm
-%%DATADIR%%/levels/mhm.jpg
-%%DATADIR%%/levels/mhm.set
-%%DATADIR%%/levels/mhm1.map
-%%DATADIR%%/levels/mhm1.scm
-%%DATADIR%%/levels/mhm2.map
-%%DATADIR%%/levels/mhm2.scm
-%%DATADIR%%/levels/mhm3.map
-%%DATADIR%%/levels/mhm3.scm
-%%DATADIR%%/levels/motion1.jpg
-%%DATADIR%%/levels/motion1.map
-%%DATADIR%%/levels/motion1.scm
-%%DATADIR%%/levels/motion1.set
-%%DATADIR%%/levels/test1.map
-%%DATADIR%%/levels/tmp.map
-%%DATADIR%%/levels/tmp.scm
-%%DATADIR%%/mapeditor.html
-%%DATADIR%%/scriptingLanguage.html
-%%DATADIR%%/sfx/badpill.wav
-%%DATADIR%%/sfx/ball_sinks.wav
-%%DATADIR%%/sfx/ball_sinks2.wav
-%%DATADIR%%/sfx/blackDie.wav
-%%DATADIR%%/sfx/capuch_monkey.wav
-%%DATADIR%%/sfx/capuchmonk.wav
-%%DATADIR%%/sfx/click.wav
-%%DATADIR%%/sfx/crash.wav
-%%DATADIR%%/sfx/crazylaugh.wav
-%%DATADIR%%/sfx/die.wav
-%%DATADIR%%/sfx/evillaugh.wav
-%%DATADIR%%/sfx/fall_death.wav
-%%DATADIR%%/sfx/ff_death.wav
-%%DATADIR%%/sfx/flag.wav
-%%DATADIR%%/sfx/goodpill.wav
-%%DATADIR%%/sfx/kill_death.wav
-%%DATADIR%%/sfx/levelComplete.wav
-%%DATADIR%%/sfx/machine_loop.wav
-%%DATADIR%%/sfx/roll_sound.wav
-%%DATADIR%%/sfx/sandcrash.wav
-%%DATADIR%%/sfx/savepoint.wav
-%%DATADIR%%/sfx/start.wav
-%%DATADIR%%/sfx/switch.wav
-%%DATADIR%%/sfx/time_warning.wav
-%%DATADIR%%/sfx/timeout.wav
-@dirrm %%DATADIR%%/sfx
-@dirrm %%DATADIR%%/music
-@dirrm %%DATADIR%%/levels
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/fonts
-@dirrm %%DATADIR%%
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@dirrmtry share/applications
--- trackballs-1.1.4_15.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120902143547.2277010656D5>