diff --git a/games/trackballs/Makefile b/games/trackballs/Makefile index 47620fd43478..af5a42ed4a9c 100644 --- a/games/trackballs/Makefile +++ b/games/trackballs/Makefile @@ -6,7 +6,7 @@ # PORTNAME= trackballs -PORTVERSION= 1.0.0 +PORTVERSION= 1.1.0 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -19,25 +19,27 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash USE_X_PREFIX= yes USE_SDL= image mixer sdl ttf +USE_GETTEXT= yes USE_GETOPT_LONG= yes USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +MAKE_ARGS= mkinstalldirs="${MKDIR}" MAN6= ${PORTNAME}.6 CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -lintl post-patch: @${FIND} ${WRKSRC} -name '*.h' -o -name '*.cc' | ${XARGS} \ - ${REINPLACE_CMD} -e "/^#include/s|SDL/SDL|SDL|; \ - /stdint.h/d" - @${REINPLACE_CMD} -e "s|/bin/bash|${LOCALBASE}/bin/bash|" \ + ${REINPLACE_CMD} -e '/^#include/s|SDL/SDL|SDL|; \ + /stdint.h/d' + @${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \ ${WRKSRC}/share/icons/installIcons - @${REINPLACE_CMD} -e "s|install -D|install|" \ + @${REINPLACE_CMD} -e 's|install -D|$$(INSTALL)|' \ ${WRKSRC}/share/Makefile.in .include diff --git a/games/trackballs/distinfo b/games/trackballs/distinfo index 9ddc7597c820..e11dcc90c296 100644 --- a/games/trackballs/distinfo +++ b/games/trackballs/distinfo @@ -1,2 +1,2 @@ -MD5 (trackballs-1.0.0.tar.gz) = 0d3ce4903aa60fba18c0e8c02b3cd563 -SIZE (trackballs-1.0.0.tar.gz) = 4826294 +MD5 (trackballs-1.1.0.tar.gz) = 4d1c4be3274ac88038bc03e2d470546c +SIZE (trackballs-1.1.0.tar.gz) = 5674366 diff --git a/games/trackballs/files/patch-po-Makefile.in b/games/trackballs/files/patch-po-Makefile.in new file mode 100644 index 000000000000..5a5d139b58f7 --- /dev/null +++ b/games/trackballs/files/patch-po-Makefile.in @@ -0,0 +1,18 @@ +--- po/Makefile.in.in.orig Wed Feb 16 02:16:34 2005 ++++ po/Makefile.in.in Fri Jun 3 03:18:21 2005 +@@ -21,13 +21,13 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + datadir = @datadir@ +-localedir = $(datadir)/${PACKAGE}/locale ++localedir = $(datadir)/locale + gettextsrcdir = $(datadir)/gettext/po + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + MKINSTALLDIRS = @MKINSTALLDIRS@ +-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` ++mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) + + GMSGFMT = @GMSGFMT@ + MSGFMT = @MSGFMT@ diff --git a/games/trackballs/files/patch-src-Makefile.in b/games/trackballs/files/patch-src-Makefile.in new file mode 100644 index 000000000000..c83c2b25cdd2 --- /dev/null +++ b/games/trackballs/files/patch-src-Makefile.in @@ -0,0 +1,11 @@ +--- src/Makefile.in.orig Sat Mar 5 03:26:01 2005 ++++ src/Makefile.in Fri Jun 3 03:10:32 2005 +@@ -301,7 +301,7 @@ + EXTRA_trackballs_SOURCES = trackballsIcon.rc + trackballs_LDADD = @WINRESOURCES@ + trackballs_DEPENDENCIES = @WINRESOURCES@ +-snarfcppopts = $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) ++snarfcppopts = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) + localedir = $(datadir)/locale + all: all-am + diff --git a/games/trackballs/files/patch-src-pipe.cc b/games/trackballs/files/patch-src-pipe.cc new file mode 100644 index 000000000000..377616124977 --- /dev/null +++ b/games/trackballs/files/patch-src-pipe.cc @@ -0,0 +1,13 @@ +--- src/pipe.cc.orig Wed Feb 23 00:10:31 2005 ++++ src/pipe.cc Fri Jun 3 02:54:26 2005 +@@ -96,8 +96,8 @@ + } + void Pipe::computeBoundingBox() { + for(int i=0;i<3;i++) { +- boundingBox[0][i]=fmin(from[i]-radius,to[i]-radius)-position[i]; +- boundingBox[1][i]=fmax(from[i]+radius,to[i]+radius)-position[i]; ++ boundingBox[0][i]=((from[i]-radius)>(to[i]-radius)?(to[i]-radius):(from[i]-radius))-position[i]; ++ boundingBox[1][i]=((from[i]+radius)>(to[i]+radius)?(from[i]+radius):(to[i]+radius))-position[i]; + } + } + void Pipe::onRemove() {Animated::onRemove(); pipes->erase(this);} diff --git a/games/trackballs/pkg-plist b/games/trackballs/pkg-plist index 90ea7b817287..ab7e60687e95 100644 --- a/games/trackballs/pkg-plist +++ b/games/trackballs/pkg-plist @@ -1,4 +1,7 @@ bin/trackballs +share/locale/de/LC_MESSAGES/trackballs.mo +share/locale/it/LC_MESSAGES/trackballs.mo +share/locale/sv/LC_MESSAGES/trackballs.mo %%DATADIR%%/fonts/menuFont.ttf %%DATADIR%%/highScores %%DATADIR%%/images/acid.png @@ -9,9 +12,12 @@ bin/trackballs %%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/gamesettings.png +%%DATADIR%%/images/font2.png +%%DATADIR%%/images/font3.png %%DATADIR%%/images/glitter.png %%DATADIR%%/images/header.png %%DATADIR%%/images/help0_1024.png @@ -23,33 +29,12 @@ bin/trackballs %%DATADIR%%/images/left_panel.png %%DATADIR%%/images/levelsetup.png %%DATADIR%%/images/life.png -%%DATADIR%%/images/menu0.png -%%DATADIR%%/images/menu1.png -%%DATADIR%%/images/menu2.png -%%DATADIR%%/images/menu3.png -%%DATADIR%%/images/menu4.png -%%DATADIR%%/images/menuHigh0.png -%%DATADIR%%/images/menuHigh1.png -%%DATADIR%%/images/menuHigh2.png -%%DATADIR%%/images/menuHigh3.png -%%DATADIR%%/images/menuHigh4.png -%%DATADIR%%/images/moreHelp.png -%%DATADIR%%/images/moreHelpHigh.png %%DATADIR%%/images/mousePointer.png %%DATADIR%%/images/nolife.png %%DATADIR%%/images/playersetup.png -%%DATADIR%%/images/return2menu.png -%%DATADIR%%/images/return2menuHigh.png %%DATADIR%%/images/sand.png -%%DATADIR%%/images/setup1.png -%%DATADIR%%/images/setup2.png -%%DATADIR%%/images/setup3.png -%%DATADIR%%/images/setup4.png %%DATADIR%%/images/setupBackground.jpg -%%DATADIR%%/images/setupTitle.png %%DATADIR%%/images/splashScreen.jpg -%%DATADIR%%/images/start.png -%%DATADIR%%/images/startHigh.png %%DATADIR%%/images/texture.png %%DATADIR%%/images/texture2.png %%DATADIR%%/images/texture3.png @@ -61,6 +46,15 @@ bin/trackballs %%DATADIR%%/levels/bonus.map %%DATADIR%%/levels/bonus.scm %%DATADIR%%/levels/boot.scm +%%DATADIR%%/levels/boxofun.map +%%DATADIR%%/levels/boxofun.scm +%%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/con1.map %%DATADIR%%/levels/con1.scm %%DATADIR%%/levels/con2.map @@ -119,6 +113,8 @@ bin/trackballs %%DATADIR%%/levels/ki3.scm %%DATADIR%%/levels/ki4.map %%DATADIR%%/levels/ki4.scm +%%DATADIR%%/levels/ki5.map +%%DATADIR%%/levels/ki5.scm %%DATADIR%%/levels/lv.set %%DATADIR%%/levels/lv1.map %%DATADIR%%/levels/lv1.scm @@ -138,11 +134,21 @@ bin/trackballs %%DATADIR%%/levels/lv8.scm %%DATADIR%%/levels/lv9.map %%DATADIR%%/levels/lv9.scm +%%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/tmp.map %%DATADIR%%/levels/tmp.scm %%DATADIR%%/sfx/badpill.wav %%DATADIR%%/sfx/blackDie.wav +%%DATADIR%%/sfx/capuchmonk.wav +%%DATADIR%%/sfx/crazylaugh.wav %%DATADIR%%/sfx/die.wav +%%DATADIR%%/sfx/evillaugh.wav %%DATADIR%%/sfx/ff_death.wav %%DATADIR%%/sfx/flag.wav %%DATADIR%%/sfx/goodpill.wav