Fix Imakefile breakage under XFree86 4.x

Merge plists

PR:		21974
Submitted by:	Ports Fury

4 files changed, 114 insertions, 24 deletions

diff --git a/games/xkoules/Makefile b/games/xkoules/Makefile
index c6c28bbe8e84..5d8538d971e0 100644
--- a/games/xkoules/Makefile
+++ b/games/xkoules/Makefile
@@ -15,22 +15,19 @@ EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
-.if ${MACHINE_ARCH} == "alpha"
-PLIST=		${PKGDIR}/pkg-plist.alpha
+.if ${MACHINE_ARCH} == "i386"
+PLIST_SUB=	SNDSRV:=""
+.else
+PLIST_SUB=	SNDSRV:="@comment "
 .endif
 
 USE_IMAKE=	yes
 MAN6=		xkoules.6
-MANCOMPRESSED=	no
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xkoules ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/share/xkoules
-.if ${MACHINE_ARCH} == "i386"
-	${INSTALL_PROGRAM} ${WRKSRC}/koules.sndsrv.freebsd ${PREFIX}/share/xkoules
-.endif
-	${INSTALL_DATA} ${WRKSRC}/sounds/*.raw ${PREFIX}/share/xkoules
-	${INSTALL_MAN} ${WRKSRC}/xkoules.6 ${PREFIX}/man/man6
+post-extract:
+	@${CP} ${WRKSRC}/xkoules.6 ${WRKSRC}/xkoules.man
+
+post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/xkoules
 .for file in ANNOUNCE BUGS Card ChangeLog Koules.FAQ TODO
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					\
diff --git a/games/xkoules/pkg-plist b/games/xkoules/pkg-plist
index bd47c64b28b3..180c7316e632 100644
--- a/games/xkoules/pkg-plist
+++ b/games/xkoules/pkg-plist
@@ -5,13 +5,13 @@ share/doc/xkoules/Card
 share/doc/xkoules/ChangeLog
 share/doc/xkoules/Koules.FAQ
 share/doc/xkoules/TODO
-share/xkoules/koules.sndsrv.freebsd
-share/xkoules/colize.raw
-share/xkoules/creator1.raw
-share/xkoules/creator2.raw
-share/xkoules/destroy1.raw
-share/xkoules/destroy2.raw
-share/xkoules/end.raw
-share/xkoules/start.raw
+%%SNDSRV:%%libexec/koules.sndsrv.freebsd
+%%SNDSRV:%%share/xkoules/colize.raw
+%%SNDSRV:%%share/xkoules/creator1.raw
+%%SNDSRV:%%share/xkoules/creator2.raw
+%%SNDSRV:%%share/xkoules/destroy1.raw
+%%SNDSRV:%%share/xkoules/destroy2.raw
+%%SNDSRV:%%share/xkoules/end.raw
+%%SNDSRV:%%share/xkoules/start.raw
+%%SNDSRV:%%@dirrm share/xkoules
 @dirrm share/doc/xkoules
-@dirrm share/xkoules