summaryrefslogtreecommitdiff
path: root/games/xnibbles/patches/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'games/xnibbles/patches/patch-aa')
-rw-r--r--games/xnibbles/patches/patch-aa30
1 files changed, 16 insertions, 14 deletions
diff --git a/games/xnibbles/patches/patch-aa b/games/xnibbles/patches/patch-aa
index c3d19c89bf0..ed697688b65 100644
--- a/games/xnibbles/patches/patch-aa
+++ b/games/xnibbles/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.5 2006/08/29 20:03:24 rillig Exp $
+$NetBSD: patch-aa,v 1.6 2008/09/21 08:17:40 dholland Exp $
---- Makefile.orig 1998-03-05 14:06:19.000000000 -0800
-+++ Makefile 2004-03-09 15:02:02.000000000 -0800
+--- Makefile.orig 1998-03-05 17:06:19.000000000 -0500
++++ Makefile 2008-09-21 02:02:55.000000000 -0400
@@ -21,14 +21,15 @@
### GENERAL OPTIONS ###
@@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.5 2006/08/29 20:03:24 rillig Exp $
- DATADIR = /usr/local/games/xnibbles
+ DATADIR=$(PREFIX)/share/xnibbles
+ CPPFLAGS+=-DDATADIR=\"$(DATADIR)\" $(SDEV)
-+ CFLAGS+=-fwritable-strings
++ #CFLAGS+=-fwritable-strings
# Prefix to find bin and man directories for installation
- PREFIX = /usr/local
@@ -43,7 +43,7 @@ $NetBSD: patch-aa,v 1.5 2006/08/29 20:03:24 rillig Exp $
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 +116,14 @@ tar: pristine
+@@ -115,20 +116,15 @@ tar: pristine
(cd ..; tar -cvzf xnibbles.tgz xnibbles/ ; chmod 644 xnibbles.tgz)
install:
@@ -60,14 +60,16 @@ $NetBSD: patch-aa,v 1.5 2006/08/29 20:03:24 rillig Exp $
- $(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
-+ $(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)/$(PKGMANDIR)/man6
- ./make-LEVELS $(DATADIR) OOGA
+- ./make-LEVELS $(DATADIR) OOGA
++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(DATADIR)/levels
++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(DATADIR)/sounds
++ $(BSD_INSTALL_DATA) levels/*.xnl $(DESTDIR)$(DATADIR)/levels
++ $(BSD_INSTALL_DATA) levels/README $(DESTDIR)$(DATADIR)/levels
++ $(BSD_INSTALL_DATA) sounds/*.ub $(DESTDIR)$(DATADIR)/sounds
++ $(BSD_INSTALL_PROGRAM) xnibbles $(DESTDIR)$(PREFIX)/bin
++ $(BSD_INSTALL_PROGRAM) xnleditor/xnleditor $(DESTDIR)$(PREFIX)/bin
++ $(BSD_INSTALL_MAN) xnibbles.6 $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man6
++ ./make-LEVELS $(DESTDIR)$(DATADIR) $(DATADIR) OOGA
bodyPart.o: common.h bodyPart.h
+ boni.o: common.h boni.h