diff options
author | Ade Lovett <ade@FreeBSD.org> | 2000-10-14 19:48:02 +0000 |
---|---|---|
committer | Ade Lovett <ade@FreeBSD.org> | 2000-10-14 19:48:02 +0000 |
commit | 6397d6d2f26fe148de514a0ad74aaf50e1aade61 (patch) | |
tree | 12a5530ce987d52cd366549a13bb09dafb6f3f71 /games/xkoules/files | |
parent | Fix Imakefile breakage under XFree86 4.x (diff) |
Fix Imakefile breakage under XFree86 4.x
Merge plists
PR: 21974
Submitted by: Ports Fury
Notes
Notes:
svn path=/head/; revision=33834
Diffstat (limited to 'games/xkoules/files')
-rw-r--r-- | games/xkoules/files/patch-aa | 8 | ||||
-rw-r--r-- | games/xkoules/files/patch-ac | 93 |
2 files changed, 97 insertions, 4 deletions
diff --git a/games/xkoules/files/patch-aa b/games/xkoules/files/patch-aa index 961404c592c4..3bb3eb067408 100644 --- a/games/xkoules/files/patch-aa +++ b/games/xkoules/files/patch-aa @@ -1,5 +1,5 @@ ---- Iconfig.orig Wed Mar 4 14:29:05 1998 -+++ Iconfig Sat Jun 19 16:50:40 1999 +--- Iconfig.orig Thu Mar 5 05:29:05 1998 ++++ Iconfig Sat Oct 14 08:48:54 2000 @@ -34,9 +34,9 @@ recomended for linux*/ /*#define I386ASSEMBLY*/ @@ -7,9 +7,9 @@ -KOULESDIR =/usr/bin/X11 -SOUNDDIR =/usr/local/lib/koules -MANDIR =/usr/local/man/man6 -+KOULESDIR =$(PREFIX)/bin ++KOULESDIR =$(LIBEXECDIR) +SOUNDDIR =$(PREFIX)/share/xkoules -+MANDIR =$(PREFIX)/man/man6 ++MANSUFFIX =6 /*You need some extra libraryes for BSD sockets compatibility?*/ /* TOP_INCLUDES = /* Sun users with GCC need this */ diff --git a/games/xkoules/files/patch-ac b/games/xkoules/files/patch-ac new file mode 100644 index 000000000000..9fc513795ce4 --- /dev/null +++ b/games/xkoules/files/patch-ac @@ -0,0 +1,93 @@ +--- Imakefile.orig Thu Mar 5 03:59:19 1998 ++++ Imakefile Sat Oct 14 08:58:09 2000 +@@ -56,7 +56,7 @@ + + DEFINES = -DONLYANSI -DSOUND $(JOYSTICK1) $(NET) $(MITSHM1) $(HAVEUSLEEP1) $(SYSDEFS) $(JOYSTICK) -Ixlib\ + $(NAMEDEF) $(ASMDEF)\ +- -DSOUNDSERVER=\"$(SOUNDDIR)/$(SOUNDSERVER)\" \ ++ -DSOUNDSERVER=\"$(KOULESDIR)/$(SOUNDSERVER)\" \ + -DSOUNDDIR=\"$(SOUNDDIR)\" \ + -DSOUNDDEV=\"$(SOUNDDEV)\" + #endif +@@ -84,9 +84,6 @@ + all::xkoules + #endif + +-BINDIR = $(KOULESDIR) +-DESTDIR = / +- + ComplexProgramTarget(xkoules) + + +@@ -97,19 +94,15 @@ + install:: $(PROGRAMS) $(SOUNDSERVER) + @echo "Koules directory is " $(KOULESDIR) + @: +- @echo "Instalin man page to " $(MANDIR) +- @mkdirhier $(MANDIR) +- $(INSTALL) -c $(INSTBINFLAGS) xkoules.6 $(MANDIR); +- @: + @echo "Creating directory " $(KOULESDIR) +- @if [ ! -d $(KOULESDIR) ]; then mkdirhier $(KOULESDIR); fi ++ @if [ ! -d $(KOULESDIR) ]; then $(MKDIRHIER) $(KOULESDIR); fi + @: + @if [ "$(INSTALLSOUND)" = "True" ]; \ + then \ + echo "Creating directory " $(SOUNDDIR); \ +- if [ ! -d $(SOUNDDIR) ]; then mkdirhier $(SOUNDDIR); fi; \ +- echo "Copying sound server to directory " $(SOUNDDIR); \ +- $(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(SOUNDDIR); \ ++ if [ ! -d $(SOUNDDIR) ]; then $(MKDIRHIER) $(SOUNDDIR); fi; \ ++ echo "Copying sound server to directory " $(KOULESDIR); \ ++ $(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(KOULESDIR); \ + echo "Copying sound files into directory " $(SOUNDDIR); \ + cd ./sounds; set -x; \ + for file in *.raw; do \ +@@ -125,19 +118,15 @@ + install:: $(PROGRAMS) $(SOUNDSERVER) + @echo "Koules directory is " $(KOULESDIR) + @: +- @echo "Instalin man page to " $(MANDIR) +- @mkdirhier $(MANDIR) +- $(INSTALL) -c $(INSTBINFLAGS) xkoules.6 $(MANDIR); +- @: + @echo "Creating directory " $(KOULESDIR) +- @if [ ! -d $(KOULESDIR) ]; then mkdirhier $(KOULESDIR); fi ++ @if [ ! -d $(KOULESDIR) ]; then $(MKDIRHIER) $(KOULESDIR); fi + @: + @if [ "$(INSTALLSOUND)" = "True" ]; \ + then \ + echo "Creating directory " $(SOUNDDIR); \ +- if [ ! -d $(SOUNDDIR) ]; then mkdirhier $(SOUNDDIR); fi; \ +- echo "Copying sound server to directory " $(SOUNDDIR); \ +- $(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(SOUNDDIR); \ ++ if [ ! -d $(SOUNDDIR) ]; then $(MKDIRHIER) $(SOUNDDIR); fi; \ ++ echo "Copying sound server to directory " $(KOULESDIR); \ ++ $(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(KOULESDIR); \ + echo "Copying sound files into directory " $(SOUNDDIR); \ + cd ./sounds; set -x; \ + for file in *.raw; do \ +@@ -155,19 +144,15 @@ + install:: $(PROGRAMS) $(SOUNDSERVER) + @echo "Koules directory is " $(KOULESDIR) + @: +- @echo "Instalin man page to " $(MANDIR) +- @mkdirhier $(MANDIR) +- $(INSTALL) -c $(INSTBINFLAGS) xkoules.6 $(MANDIR); +- @: + @echo "Creating directory " $(KOULESDIR) +- @if [ ! -d $(KOULESDIR) ]; then mkdirhier $(KOULESDIR); fi ++ @if [ ! -d $(KOULESDIR) ]; then $(MKDIRHIER) $(KOULESDIR); fi + @: + @if [ "$(INSTALLSOUND)" = "True" ]; \ + then \ + echo "Creating directory " $(SOUNDDIR); \ +- if [ ! -d $(SOUNDDIR) ]; then mkdirhier $(SOUNDDIR); fi; \ +- echo "Copying sound server to directory " $(SOUNDDIR); \ +- $(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(SOUNDDIR); \ ++ if [ ! -d $(SOUNDDIR) ]; then $(MKDIRHIER) $(SOUNDDIR); fi; \ ++ echo "Copying sound server to directory " $(KOULESDIR); \ ++ $(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(KOULESDIR); \ + echo "Copying sound files into directory " $(SOUNDDIR); \ + cd ./sounds; set -x; \ + for file in *.raw; do \ |