pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/games/xnibbles Use bl3, USE_LANGUAGES=c c++, various o...
details: https://anonhg.NetBSD.org/pkgsrc/rev/17ae9636c02f
branches: trunk
changeset: 470510:17ae9636c02f
user: snj <snj%pkgsrc.org@localhost>
date: Tue Mar 09 23:06:18 2004 +0000
description:
Use bl3, USE_LANGUAGES=c c++, various other cleanup stuff.
diffstat:
games/xnibbles/Makefile | 23 +++++------
games/xnibbles/distinfo | 4 +-
games/xnibbles/patches/patch-aa | 77 ++++++++++------------------------------
3 files changed, 32 insertions(+), 72 deletions(-)
diffs (171 lines):
diff -r 25c41687e157 -r 17ae9636c02f games/xnibbles/Makefile
--- a/games/xnibbles/Makefile Tue Mar 09 23:01:17 2004 +0000
+++ b/games/xnibbles/Makefile Tue Mar 09 23:06:18 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/24 13:30:57 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/09 23:06:18 snj Exp $
#
DISTNAME= xnibbles-1.0BETA4
@@ -12,19 +12,18 @@
COMMENT= Winding snakes game for X11
WRKSRC= ${WRKDIR}/xnibbles
-USE_BUILDLINK2= YES
-USE_X11= YES
+USE_BUILDLINK3= YES
USE_GNU_TOOLS+= make
-
-ALL_TARGET= netbsd
+USE_LANGUAGES= c c++
+USE_X11= YES
-CC= ${CXX}
-MAKE_FLAGS+= INSTALL_PROGRAM="${INSTALL_PROGRAM}"
-MAKE_FLAGS+= INSTALL_DATA="${INSTALL_DATA}"
-MAKE_FLAGS+= INSTALL_MAN="${INSTALL_MAN}"
-MAKE_FLAGS+= INSTALL_DIR="${INSTALL_DATA_DIR}"
+SUBST_CLASSES+= audio
+SUBST_STAGE.audio= pre-build
+SUBST_MESSAGE.audio= Adjusting path to audio device
+SUBST_FILES.audio= Makefile
+SUBST_SED.audio= -e "s|/dev/dsp|${DEVOSSAUDIO}|"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../mk/ossaudio.buildlink2.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 25c41687e157 -r 17ae9636c02f games/xnibbles/distinfo
--- a/games/xnibbles/distinfo Tue Mar 09 23:01:17 2004 +0000
+++ b/games/xnibbles/distinfo Tue Mar 09 23:06:18 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2003/11/18 14:34:33 xtraeme Exp $
+$NetBSD: distinfo,v 1.5 2004/03/09 23:06:18 snj Exp $
SHA1 (xnibbles-1.0BETA4.tar.gz) = 2f0ed0ea1184cb3e81fa56a430d3c53e96618452
Size (xnibbles-1.0BETA4.tar.gz) = 134982 bytes
-SHA1 (patch-aa) = 2f17a89e3b28a2e406cd82e72908b4c4f95cc6ac
+SHA1 (patch-aa) = e21c77eb47cfdf8e61539abc98693c0c3833878f
SHA1 (patch-ab) = faadb812447658f6f7f1a808a4361f372d095a3f
diff -r 25c41687e157 -r 17ae9636c02f games/xnibbles/patches/patch-aa
--- a/games/xnibbles/patches/patch-aa Tue Mar 09 23:01:17 2004 +0000
+++ b/games/xnibbles/patches/patch-aa Tue Mar 09 23:06:18 2004 +0000
@@ -1,37 +1,27 @@
-$NetBSD: patch-aa,v 1.3 2003/11/18 14:34:33 xtraeme Exp $
+$NetBSD: patch-aa,v 1.4 2004/03/09 23:06:18 snj Exp $
---- Makefile.orig Thu Mar 5 17:06:19 1998
-+++ Makefile
-@@ -21,30 +21,34 @@
+--- Makefile.orig 1998-03-05 14:06:19.000000000 -0800
++++ Makefile 2004-03-09 15:02:02.000000000 -0800
+@@ -21,14 +21,15 @@
### GENERAL OPTIONS ###
# Compiler to use (C++ compiler _please_)
- CC = g++
-+ #CC = g++
++ CC = ${CXX}
# Directory for XNibbles specific data
# This must be set correctly at compile time
- DATADIR = /usr/local/games/xnibbles
-+ DATADIR = $(PREFIX)/share/xnibbles
++ DATADIR=$(PREFIX)/share/xnibbles
++ CPPFLAGS+=-DDATADIR=\"$(DATADIR)\" $(SDEV)
++ CFLAGS+=-fwritable-strings
# Prefix to find bin and man directories for installation
- PREFIX = /usr/local
-+# PREFIX = $(PREFIX)
# Install program
INSTALL = /usr/bin/install
-+ INSTALL_PROGRAM = $(INSTALL) -c -g $(GROUP) -m 755 -o $(USER)
-+ INSTALL_MAN = $(INSTALL) -c -g $(GROUP) -m 644 -o $(USER)
-+ INSTALL_DATA = $(INSTALL) -c -g $(GROUP) -m 644 -o $(USER)
-+ INSTALL_DIR = $(INSTALL) -d -g $(GROUP) -m 755 -o $(USER)
-
- # User to own the program
-- USER = 0
-- GROUP = 0
-+ USER = root
-+ GROUP = wheel
-
- ### LINUX ONLY OPTIONS ###
+@@ -41,10 +42,10 @@
# Requires kernel sound support, change from 0 to 1 if you want it
SOUND = 1
@@ -44,31 +34,7 @@
JOYSTICK0DEV = /dev/js0
JOYSTICK1DEV = /dev/js1
-@@ -66,6 +70,7 @@
- @echo ""
- @echo "make linux Linux on ix86"
- @echo "make irix Irix 5.3 (6.x?)"
-+ @echo "make netbsd NetBSD 1.3 or higher"
- @echo ""
- @echo "Check the README file for help."
- @echo ""
-@@ -79,6 +84,15 @@
- -DDATADIR=\"$(DATADIR)\"' \
- all
-
-+netbsd:
-+ $(MAKE) OBJECTS='$(OBJECTS)' \
-+ CC="$(CC)" LDFLAGS="$(LDFLAGS)" \
-+ CFLAGS+='-Wall -O2 $(SDEV) \
-+ $(CFLAGS) -fwritable-strings \
-+ $(JDEV) \
-+ -DDATADIR=\"$(DATADIR)\"' \
-+ all
-+
- irix:
- $(MAKE) OBJECTS= \
- CC=$(CC) LDFLAGS='-L/usr/X11/lib' \
-@@ -90,7 +104,7 @@
+@@ -90,7 +91,7 @@ xnibbles: bodyPart.o boni.o bonus.o dead
$(CC) $(CFLAGS) $(LDFLAGS) \
bodyPart.o boni.o bonus.o levels.o people.o statusBar.o ticker.o \
timer.o walls.o worm.o xnibbles.o xpms.o $(OBJECTS) deadWorm.o counter.o \
@@ -77,7 +43,7 @@
xnleditor: xnleditor/level.o xnleditor/newWalls.o xnleditor/sideBar.o xnleditor/walls.o xnleditor/xnleditor.o xnleditor/xpms.o xnleditor/numericDisplay.o
$(CC) $(CFLAGS) $(LDFLAGS) \
-@@ -115,19 +129,19 @@
+@@ -115,19 +116,14 @@ tar: pristine
(cd ..; tar -cvzf xnibbles.tgz xnibbles/ ; chmod 644 xnibbles.tgz)
install:
@@ -94,19 +60,14 @@
- $(INSTALL) -g $(GROUP) -m 755 -o $(USER) xnibbles $(PREFIX)/bin
- $(INSTALL) -g $(GROUP) -m 755 -o $(USER) xnleditor/xnleditor $(PREFIX)/bin
- $(INSTALL) -g $(GROUP) -m 644 -o $(USER) xnibbles.6 $(PREFIX)/man/man6
-+ $(INSTALL_DIR) $(DATADIR)
-+ $(INSTALL_DIR) $(DATADIR)/levels
-+ $(INSTALL_DIR) $(DATADIR)/sounds
-+# $(INSTALL_DIR) $(PREFIX)
-+# $(INSTALL_DIR) $(PREFIX)/bin
-+# $(INSTALL_DIR) $(PREFIX)/man
-+# $(INSTALL_DIR) $(PREFIX)/man/man6
-+ $(INSTALL_DATA) levels/*.xnl $(DATADIR)/levels
-+ $(INSTALL_DATA) levels/README $(DATADIR)/levels
-+ $(INSTALL_DATA) sounds/*.ub $(DATADIR)/sounds
-+ $(INSTALL_PROGRAM) xnibbles $(PREFIX)/bin
-+ $(INSTALL_PROGRAM) xnleditor/xnleditor $(PREFIX)/bin
-+ $(INSTALL_MAN) xnibbles.6 $(PREFIX)/man/man6
++ $(BSD_INSTALL_DATA_DIR) $(DATADIR)/levels
++ $(BSD_INSTALL_DATA_DIR) $(DATADIR)/sounds
++ $(BSD_INSTALL_DATA) levels/*.xnl $(DATADIR)/levels
++ $(BSD_INSTALL_DATA) levels/README $(DATADIR)/levels
++ $(BSD_INSTALL_DATA) sounds/*.ub $(DATADIR)/sounds
++ $(BSD_INSTALL_PROGRAM) xnibbles $(PREFIX)/bin
++ $(BSD_INSTALL_PROGRAM) xnleditor/xnleditor $(PREFIX)/bin
++ $(BSD_INSTALL_MAN) xnibbles.6 $(PREFIX)/man/man6
./make-LEVELS $(DATADIR) OOGA
bodyPart.o: common.h bodyPart.h
Home |
Main Index |
Thread Index |
Old Index