From owner-freebsd-ports Fri Oct 13 18:20:25 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 049ED37B672 for ; Fri, 13 Oct 2000 18:20:01 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id SAA69512; Fri, 13 Oct 2000 18:20:00 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AEB9037B674; Fri, 13 Oct 2000 18:10:15 -0700 (PDT) Message-Id: <20001014011015.AEB9037B674@hub.freebsd.org> Date: Fri, 13 Oct 2000 18:10:15 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/21974: Update port: games/xkoules Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 21974 >Category: ports >Synopsis: Update port: games/xkoules >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Oct 13 18:20:00 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.1.1-RELEASE i386 >Organization: >Environment: >Description: - Fix Imakefile breakage under XFree86 4.x - Merge pkg-plist.alpha to pkg-plist New file: patches/patch-ac Remove file: pkg-plist.alpha >How-To-Repeat: >Fix: diff -urN /usr/ports/games/xkoules/Makefile games/xkoules/Makefile --- /usr/ports/games/xkoules/Makefile Tue Oct 10 23:42:39 2000 +++ games/xkoules/Makefile Sat Oct 14 08:32:55 2000 @@ -15,22 +15,19 @@ 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 -urN /usr/ports/games/xkoules/files/patch-aa games/xkoules/files/patch-aa --- /usr/ports/games/xkoules/files/patch-aa Wed Jun 23 03:07:45 1999 +++ games/xkoules/files/patch-aa Sat Oct 14 09:03:23 2000 @@ -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 -urN /usr/ports/games/xkoules/files/patch-ac games/xkoules/files/patch-ac --- /usr/ports/games/xkoules/files/patch-ac Thu Jan 1 09:00:00 1970 +++ games/xkoules/files/patch-ac Sat Oct 14 08:58:37 2000 @@ -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 -urN /usr/ports/games/xkoules/pkg-plist games/xkoules/pkg-plist --- /usr/ports/games/xkoules/pkg-plist Thu Jun 22 19:05:54 2000 +++ games/xkoules/pkg-plist Sat Oct 14 08:44:15 2000 @@ -5,13 +5,13 @@ 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 diff -urN /usr/ports/games/xkoules/pkg-plist.alpha games/xkoules/pkg-plist.alpha --- /usr/ports/games/xkoules/pkg-plist.alpha Thu Jun 22 19:05:54 2000 +++ games/xkoules/pkg-plist.alpha Thu Jan 1 09:00:00 1970 @@ -1,16 +0,0 @@ -bin/xkoules -share/doc/xkoules/ANNOUNCE -share/doc/xkoules/BUGS -share/doc/xkoules/Card -share/doc/xkoules/ChangeLog -share/doc/xkoules/Koules.FAQ -share/doc/xkoules/TODO -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 -@dirrm share/doc/xkoules -@dirrm share/xkoules >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message