- use STAGEDIR

- use OPTIONS_DEFINE

3 files changed, 102 insertions, 62 deletions

diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index c4c29ae..ccbf6b4 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -14,24 +14,18 @@ COMMENT=	X11 arcade game
 
 LICENSE=	MIT
 
-NO_STAGE=	yes
-
 USES=		imake
 USE_XORG=	xpm xext x11
 WRKSRC=		${WRKDIR}/xboing
-MAN1=		xboing.1
 
-.if defined(WITHOUT_AUDIO)
+OPTIONS_DEFINE=SOUND
+OPTIONS_DEFAULT=SOUND
+OPTIONS_SUB=yes
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MSOUND}
 MAKE_ENV+=	WITHOUT_AUDIO=True
-PLIST_SUB+=	WITH_SOUND="@comment "
-.else
-PLIST_SUB+=	WITH_SOUND=""
 .endif
 
-post-install:
-	${CHOWN} root:games ${PREFIX}/bin/xboing
-	${CHMOD} 2755 ${PREFIX}/bin/xboing
-	${CHOWN} root:games ${PREFIX}/lib/X11/xboing/.xboing.scr
-	${CHMOD} 664 ${PREFIX}/lib/X11/xboing/.xboing.scr
-
 .include <bsd.port.mk>
diff --git a/games/xboing/files/patch-Imakefile b/games/xboing/files/patch-Imakefile
index c93c8dd..7695a5e 100644
--- a/games/xboing/files/patch-Imakefile
+++ b/games/xboing/files/patch-Imakefile
@@ -1,5 +1,5 @@
---- Imakefile.orig	Thu Nov 21 19:28:46 1996
-+++ Imakefile	Sun Jun 20 18:39:19 1999
+--- Imakefile.orig	1996-11-22 02:28:46.000000000 +0100
++++ Imakefile	2014-03-30 17:51:01.000000000 +0200
 @@ -24,23 +24,28 @@
  XCOMM This is the directory where the highscore, level & sound data will be 
  XCOMM placed. Default will be the current directory.
@@ -44,3 +44,43 @@
  XCOMM   -DNEED_USLEEP=\"True\" \
  XCOMM   -DNO_LOCKING=\"True\" 
  
+@@ -182,30 +187,30 @@
+ 	@echo "XBoing directory is " $(XBOING_DIR)
+ 	@:
+ 	@echo "Creating directory " $(XBOING_DIR)
+-	@if [ ! -d $(XBOING_DIR) ]; then mkdir $(XBOING_DIR); fi
+-	$(INSTALL) -c $(INSTDATFLAGS) docs/problems.doc $(XBOING_DIR)
++	@if [ ! -d ${DESTDIR}$(XBOING_DIR) ]; then mkdir ${DESTDIR}$(XBOING_DIR); fi
++	$(INSTALL) -c $(INSTDATFLAGS) docs/problems.doc ${DESTDIR}$(XBOING_DIR)
+ 	@:
+ 	@echo "Creating directory " $(LEVEL_INSTALL_DIR)
+-	@if [ ! -d $(LEVEL_INSTALL_DIR) ]; then mkdir $(LEVEL_INSTALL_DIR); fi
++	@if [ ! -d ${DESTDIR}$(LEVEL_INSTALL_DIR) ]; then mkdir ${DESTDIR}$(LEVEL_INSTALL_DIR); fi
+ 	@:
+ 	@echo "Copying level data into directory " $(LEVEL_INSTALL_DIR)
+ 	@cd ./levels; set -x; for file in *.data; do			\
+-		$(INSTALL) -c $(INSTDATFLAGS) $$file $(LEVEL_INSTALL_DIR);\
++		$(INSTALL) -c $(INSTDATFLAGS) $$file ${DESTDIR}$(LEVEL_INSTALL_DIR);\
+ 	done
+ 	@:
+ 	@if [ "$(AUDIO_AVAILABLE)" = "True" ]; 				\
+ 	 then								\
+ 		echo "Creating directory " $(SOUNDS_DIR); 		\
+-		if [ ! -d $(SOUNDS_DIR) ]; then mkdir $(SOUNDS_DIR); fi;\
++		if [ ! -d ${DESTDIR}$(SOUNDS_DIR) ]; then mkdir ${DESTDIR}$(SOUNDS_DIR); fi;\
+ 		echo "Copying sound files into directory " $(SOUNDS_DIR);\
+ 		cd ./sounds; set -x; for file in *.au; do		\
+-		    $(INSTALL) -c $(INSTDATFLAGS) $$file $(SOUNDS_DIR);	\
++		    $(INSTALL) -c $(INSTDATFLAGS) $$file ${DESTDIR}$(SOUNDS_DIR);	\
+ 		done;							\
+ 	 fi
+ 	@:
+-	@echo "Creating a highscore file " $(HIGH_SCORE_FILE)
+-	@touch $(HIGH_SCORE_FILE);
+-	@chmod a+rw $(HIGH_SCORE_FILE);
++	@echo "Creating a highscore file " ${DESTDIR}$(HIGH_SCORE_FILE)
++	@touch ${DESTDIR}$(HIGH_SCORE_FILE);
++	@chmod a+rw ${DESTDIR}$(HIGH_SCORE_FILE);
+ 
+ XCOMM I use this for my daily backup of my code.
+ 
diff --git a/games/xboing/pkg-plist b/games/xboing/pkg-plist
index 984a629..c04ff2f 100644
--- a/games/xboing/pkg-plist
+++ b/games/xboing/pkg-plist
@@ -83,53 +83,59 @@ lib/X11/xboing/levels/level78.data
 lib/X11/xboing/levels/level79.data
 lib/X11/xboing/levels/level80.data
 lib/X11/xboing/levels/new.data
-%%WITH_SOUND%%lib/X11/xboing/sounds/Doh1.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/Doh2.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/Doh3.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/Doh4.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/ammo.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/applause.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/ball2ball.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/balllost.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/ballshot.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/boing.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/bomb.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/bonus.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/buzzer.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/click.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/ddloo.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/evillaugh.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/game_over.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/gate.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/hithere.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/hypspc.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/intro.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/key.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/looksbad.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/metal.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/mgun.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/ouch.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/paddle.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/ping.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/shark.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/shoot.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/shotgun.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/spring.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/stamp.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/sticky.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/supbons.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/toggle.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/tone.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/touch.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/wallsoff.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/warp.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/weeek.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/whizzo.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/whoosh.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/wzzz.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/wzzz2.au
-%%WITH_SOUND%%lib/X11/xboing/sounds/youagod.au
+man/man1/xboing.1.gz
+%%SOUND%%lib/X11/xboing/sounds/Doh1.au
+%%SOUND%%lib/X11/xboing/sounds/Doh2.au
+%%SOUND%%lib/X11/xboing/sounds/Doh3.au
+%%SOUND%%lib/X11/xboing/sounds/Doh4.au
+%%SOUND%%lib/X11/xboing/sounds/ammo.au
+%%SOUND%%lib/X11/xboing/sounds/applause.au
+%%SOUND%%lib/X11/xboing/sounds/ball2ball.au
+%%SOUND%%lib/X11/xboing/sounds/balllost.au
+%%SOUND%%lib/X11/xboing/sounds/ballshot.au
+%%SOUND%%lib/X11/xboing/sounds/boing.au
+%%SOUND%%lib/X11/xboing/sounds/bomb.au
+%%SOUND%%lib/X11/xboing/sounds/bonus.au
+%%SOUND%%lib/X11/xboing/sounds/buzzer.au
+%%SOUND%%lib/X11/xboing/sounds/click.au
+%%SOUND%%lib/X11/xboing/sounds/ddloo.au
+%%SOUND%%lib/X11/xboing/sounds/evillaugh.au
+%%SOUND%%lib/X11/xboing/sounds/game_over.au
+%%SOUND%%lib/X11/xboing/sounds/gate.au
+%%SOUND%%lib/X11/xboing/sounds/hithere.au
+%%SOUND%%lib/X11/xboing/sounds/hypspc.au
+%%SOUND%%lib/X11/xboing/sounds/intro.au
+%%SOUND%%lib/X11/xboing/sounds/key.au
+%%SOUND%%lib/X11/xboing/sounds/looksbad.au
+%%SOUND%%lib/X11/xboing/sounds/metal.au
+%%SOUND%%lib/X11/xboing/sounds/mgun.au
+%%SOUND%%lib/X11/xboing/sounds/ouch.au
+%%SOUND%%lib/X11/xboing/sounds/paddle.au
+%%SOUND%%lib/X11/xboing/sounds/ping.au
+%%SOUND%%lib/X11/xboing/sounds/shark.au
+%%SOUND%%lib/X11/xboing/sounds/shoot.au
+%%SOUND%%lib/X11/xboing/sounds/shotgun.au
+%%SOUND%%lib/X11/xboing/sounds/spring.au
+%%SOUND%%lib/X11/xboing/sounds/stamp.au
+%%SOUND%%lib/X11/xboing/sounds/sticky.au
+%%SOUND%%lib/X11/xboing/sounds/supbons.au
+%%SOUND%%lib/X11/xboing/sounds/toggle.au
+%%SOUND%%lib/X11/xboing/sounds/tone.au
+%%SOUND%%lib/X11/xboing/sounds/touch.au
+%%SOUND%%lib/X11/xboing/sounds/wallsoff.au
+%%SOUND%%lib/X11/xboing/sounds/warp.au
+%%SOUND%%lib/X11/xboing/sounds/weeek.au
+%%SOUND%%lib/X11/xboing/sounds/whizzo.au
+%%SOUND%%lib/X11/xboing/sounds/whoosh.au
+%%SOUND%%lib/X11/xboing/sounds/wzzz.au
+%%SOUND%%lib/X11/xboing/sounds/wzzz2.au
+%%SOUND%%lib/X11/xboing/sounds/youagod.au
 lib/X11/xboing/problems.doc
 @dirrm lib/X11/xboing/levels
-%%WITH_SOUND%%@dirrm lib/X11/xboing/sounds
+%%SOUND%%@dirrm lib/X11/xboing/sounds
 @dirrm lib/X11/xboing
+@exec chown root:games %D/bin/xboing
+@exec chmod 2755 %D/bin/xboing
+@exec touch %D/lib/X11/xboing/.xboing.scr
+@exec chown root:games %D/lib/X11/xboing/.xboing.scr
+@exec chmod 664 %D/lib/X11/xboing/.xboing.scr