From owner-freebsd-ports Thu Sep 14 19:30:16 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 CB1E237B43E for ; Thu, 14 Sep 2000 19:30:01 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id TAA62393; Thu, 14 Sep 2000 19:30:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E46F37B422; Thu, 14 Sep 2000 19:21:23 -0700 (PDT) Message-Id: <20000915022123.4E46F37B422@hub.freebsd.org> Date: Thu, 14 Sep 2000 19:21:23 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/21282: Update port: games/xsok Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 21282 >Category: ports >Synopsis: Update port: games/xsok >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: Thu Sep 14 19:30:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.1-RELEASE i386 >Organization: >Environment: >Description: - Fix 'X manpages' error New file: patches/patch-ac >How-To-Repeat: >Fix: diff -urN /usr/ports/games/xsok/Makefile games/xsok/Makefile --- /usr/ports/games/xsok/Makefile Mon Aug 14 18:21:45 2000 +++ games/xsok/Makefile Tue Sep 12 05:02:29 2000 @@ -15,10 +15,12 @@ MAINTAINER= ports@FreeBSD.org -USE_X_PREFIX= yes -USE_XPM= yes USE_IMAKE= yes -MAN6= xsok.6x +USE_XPM= yes +MAN6= xsok.6 + +do-configure: + cd ${WRKSRC}/src && ${XMKMF} post-install: ${INSTALL_DATA} ${WRKSRC}/doc/xsok.tex ${PREFIX}/share/doc/xsok diff -urN /usr/ports/games/xsok/patches/patch-aa games/xsok/patches/patch-aa --- /usr/ports/games/xsok/patches/patch-aa Mon Jan 24 14:59:17 2000 +++ games/xsok/patches/patch-aa Tue Sep 12 05:02:57 2000 @@ -1,6 +1,6 @@ --- src/Imakefile.orig Sun Mar 17 20:54:27 1996 -+++ src/Imakefile Tue Jan 18 00:00:00 2000 -@@ -46,17 +46,17 @@ ++++ src/Imakefile Tue Sep 12 05:02:42 2000 +@@ -46,17 +46,18 @@ # BINDIR and LIBDIR should be predefined by the templates # BINDIR = /usr/bin/X11 # LIBDIR = /usr/lib/X11 @@ -10,7 +10,8 @@ -XSOKDOCDIR = /usr/doc/xsok +XSOKLIBDIR = $(LIBDIR)/xsok +APPDEFSDIR = $(LIBDIR)/app-defaults -+XSOKMANDIR = $(MANDIR)/../man6 ++XSOKMANDIR = $(MANDIR) ++MANSUFFIX = 6 +XSOKDOCDIR = $(X11BASE)/share/doc/xsok # This is the name of the save directory, where solved games are stored: @@ -23,7 +24,7 @@ # paths for installation in user's home-directory. LXSOKBINDIR = $(HOME)/bin -@@ -65,7 +65,7 @@ +@@ -65,7 +66,7 @@ # xsok needs to know where the xpm library resides XPMLIB = -L$(USRLIBDIR) -lXpm @@ -32,7 +33,7 @@ # ***************************************************************************** # I hope you don't need to change anything below this point -@@ -74,14 +74,14 @@ +@@ -74,14 +75,14 @@ CC = c89 CCOPTIONS = #else @@ -49,7 +50,7 @@ #endif #endif -@@ -109,7 +109,7 @@ +@@ -109,7 +110,7 @@ # *.c require version.h xsok.h # X*.c additionally require X-sok.h and Tableau.h # X-widget.c additionally requires TableauP.h @@ -58,7 +59,7 @@ all:: $(ALLTARGETS) -@@ -132,9 +132,9 @@ +@@ -132,9 +133,9 @@ # the install targets require that make has been run in the lib directory install:: $(MYPROGS) @@ -70,18 +71,21 @@ chmod 777 $(XSOKSAVEDIR) (cd ../lib; tar cf - $(LIBCONTS) | (cd $(XSOKLIBDIR); tar xf -)) chown -R root $(XSOKLIBDIR) $(XSOKSAVEDIR) -@@ -142,12 +142,12 @@ +@@ -142,14 +143,11 @@ (cd ../lib && ../src/mergescores $(XSOKSAVEDIR)/Xsok.score \ $(XSOKSAVEDIR)/Sokoban.score $(XSOKSAVEDIR)/Cyberbox.score) chmod 666 $(XSOKSAVEDIR)/[A-z]*.score - (umask 022 && mkdirhier $(XSOKDOCDIR)) + (umask 022 && $(MKDIRHIER) $(XSOKDOCDIR)) if [ -r ../doc/xsok.dvi ]; then cp ../doc/xsok.dvi $(XSOKDOCDIR); fi - cp ../doc/cyberbox.doc $(XSOKDOCDIR) - cp ../etc/COPYRIGHT* $(XSOKDOCDIR) +- cp ../doc/cyberbox.doc $(XSOKDOCDIR) +- cp ../etc/COPYRIGHT* $(XSOKDOCDIR) ++ $(INSTALL) $(INSTALLFLAGS) ../doc/cyberbox.doc $(XSOKDOCDIR) ++ $(INSTALL) $(INSTALLFLAGS) ../etc/COPYRIGHT* $(XSOKDOCDIR) chmod -R a+r $(XSOKDOCDIR) - mkdirhier $(XSOKMANDIR) -+ $(MKDIRHIER) $(XSOKMANDIR) - cp xsok.man $(XSOKMANDIR)/xsok.6x - chmod 644 $(XSOKMANDIR)/xsok.6x +- cp xsok.man $(XSOKMANDIR)/xsok.6x +- chmod 644 $(XSOKMANDIR)/xsok.6x + ComplexProgramTarget($(MYPROG)) + InstallAppDefaults(XSok) diff -urN /usr/ports/games/xsok/patches/patch-ac games/xsok/patches/patch-ac --- /usr/ports/games/xsok/patches/patch-ac Thu Jan 1 09:00:00 1970 +++ games/xsok/patches/patch-ac Tue Sep 12 04:39:20 2000 @@ -0,0 +1,12 @@ +--- Makefile.orig Sun Mar 17 20:56:29 1996 ++++ Makefile Tue Sep 12 04:39:08 2000 +@@ -18,6 +18,9 @@ + install: + (cd src && $(MAKE) install) + ++install.man: ++ (cd src && $(MAKE) install.man) ++ + install.local: + (cd src && $(MAKE) install.local) + >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message