From owner-freebsd-ports Fri Jul 7 14:30:28 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 6D7E837BDE4 for ; Fri, 7 Jul 2000 14:30:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id OAA49438; Fri, 7 Jul 2000 14:30:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id E224537BDE4; Fri, 7 Jul 2000 14:29:38 -0700 (PDT) Message-Id: <20000707212938.E224537BDE4@hub.freebsd.org> Date: Fri, 7 Jul 2000 14:29:38 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/19757: Update port: http://home.sol.no/~sverrehu/ -> http://shh.thathost.com/ Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 19757 >Category: ports >Synopsis: Update port: http://home.sol.no/~sverrehu/ -> http://shh.thathost.com/ >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 Jul 07 14:30:00 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.0-RELEASE i386 >Organization: >Environment: >Description: - Update MASTER_SITES and WWW: line of pkg/DESCR - Support CC/CFLAGS/PREFIX/LOCALBASE/X11BASE properly >How-To-Repeat: >Fix: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # devel_libshhmsg.patch # devel_libshhopt.patch # devel_libxalloc.patch # games_biorythm.patch # games_libshhcards.patch # games_sol.patch # echo x - devel_libshhmsg.patch sed 's/^X//' >devel_libshhmsg.patch << 'END-of-devel_libshhmsg.patch' Xdiff -urN /usr/ports/devel/libshhmsg/Makefile devel/libshhmsg/Makefile X--- /usr/ports/devel/libshhmsg/Makefile Sat Jun 17 08:42:35 2000 X+++ devel/libshhmsg/Makefile Tue Jul 4 22:04:51 2000 X@@ -8,7 +8,7 @@ X PORTNAME= libshhmsg X PORTVERSION= 1.4.0 X CATEGORIES= devel X-MASTER_SITES= http://home.sol.no/~sverrehu/pub-unix/files/ X+MASTER_SITES= http://shh.thathost.com/pub-unix/files/ X DISTNAME= shhmsg-${PORTVERSION} X X MAINTAINER= obrien@FreeBSD.org X@@ -18,9 +18,9 @@ X X post-install: X .if !defined(NOPORTDOCS) X- @ ${MKDIR} ${PREFIX}/share/doc/libshhmsg X+ @${MKDIR} ${PREFIX}/share/doc/libshhmsg X .for file in CREDITS README shhmsg.txt X- @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/libshhmsg X+ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/libshhmsg X .endfor X .endif X Xdiff -urN /usr/ports/devel/libshhmsg/patches/patch-aa devel/libshhmsg/patches/patch-aa X--- /usr/ports/devel/libshhmsg/patches/patch-aa Sat Apr 3 10:20:09 1999 X+++ devel/libshhmsg/patches/patch-aa Tue Jul 4 21:39:52 2000 X@@ -1,6 +1,6 @@ X---- Makefile.orig Tue Oct 13 13:11:42 1998 X-+++ Makefile Fri Apr 2 15:33:32 1999 X-@@ -6,10 +6,10 @@ X+--- Makefile.orig Wed Oct 14 03:11:42 1998 X++++ Makefile Tue Jul 4 21:39:46 2000 X+@@ -6,7 +6,7 @@ X VERSION = $(VERMAJ).$(VERMIN).$(VERPAT) X X # Define SHARED as 1 for Linux shared ELF library X@@ -8,39 +8,53 @@ X +SHARED = 1 X X ifeq ($(SHARED),1) X--LIBTARGET = lib$(DIST).so.$(VERSION) X-+LIBTARGET = lib$(DIST).so.$(VERMAJ) X- LIBTARGETSO = lib$(DIST).so X- LIBTARGETSOMAJ = $(LIBTARGETSO).$(VERMAJ) X- CCSHRD = -fPIC X-@@ -23,8 +23,8 @@ X- INSTBASEDIR = /usr/local X+ LIBTARGET = lib$(DIST).so.$(VERSION) X+@@ -20,19 +20,19 @@ X+ LIBHEAD = $(DIST).h X+ TARGETS = $(LIBTARGET) X+ X+-INSTBASEDIR = /usr/local X++INSTBASEDIR = ${PREFIX} X INSTLIBDIR = $(INSTBASEDIR)/lib X INSTINCDIR = $(INSTBASEDIR)/include X -INSTALL = install -m 644 X -INSTALLPROG = install -m 755 X-+INSTALL = install -c -m 644 X-+INSTALLPROG = install -c -m 755 X- MKDIRP = install -d -m 755 X- X- CC = gcc X-@@ -32,7 +32,7 @@ X+-MKDIRP = install -d -m 755 X++INSTALL = ${BSD_INSTALL_DATA} X++INSTALLPROG = ${BSD_INSTALL_PROGRAM} X++MKDIRP = mkdir -p X+ X+-CC = gcc X++#CC = gcc X+ OPTIM = -O2 X X INCDIR = -I. X X -CCOPT = -s -Wall $(OPTIM) $(INCDIR) X-+CCOPT = -s -Wall $(OPTIM) $(INCDIR) -D_POSIX_SOURCE X++CCOPT = $(INCDIR) $(CFLAGS) X X # Object files to store in the library X LIBOBJS = vars.o streams.o progname.o \ X-@@ -59,9 +59,7 @@ X- $(INSTALL) $(LIBTARGET) $(INSTLIBDIR) X+@@ -43,7 +43,7 @@ X+ X+ $(LIBTARGET): $(LIBOBJS) X+ ifeq ($(SHARED),1) X+- $(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS) X++ $(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGETSOMAJ) $(LIBOBJS) X+ else X+ ar rcs $(LIBTARGET) $(LIBOBJS) X+ endif X+@@ -56,12 +56,10 @@ X+ X+ install: $(LIBTARGET) X+ $(MKDIRP) $(INSTLIBDIR) $(INSTINCDIR) X+- $(INSTALL) $(LIBTARGET) $(INSTLIBDIR) X++ $(INSTALL) $(LIBTARGETSOMAJ) $(INSTLIBDIR) X $(INSTALL) $(LIBHEAD) $(INSTINCDIR) X ifeq ($(SHARED),1) X - ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSOMAJ) X-- ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO) X+ ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO) X - echo "If you use GNU/Linux, remember to run ldconfig" X-+ ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSO) X endif X X clean: Xdiff -urN /usr/ports/devel/libshhmsg/pkg/DESCR devel/libshhmsg/pkg/DESCR X--- /usr/ports/devel/libshhmsg/pkg/DESCR Sat Apr 3 10:20:09 1999 X+++ devel/libshhmsg/pkg/DESCR Tue Jul 4 21:08:31 2000 X@@ -1,3 +1,5 @@ X shhmsg - library for displaying messages. It contains X C-functions for error messages, verbose messages and X `normal' messages in terminalbased programs. X+ X+WWW: http://shh.thathost.com/pub-unix/#shhmsg END-of-devel_libshhmsg.patch echo x - devel_libshhopt.patch sed 's/^X//' >devel_libshhopt.patch << 'END-of-devel_libshhopt.patch' Xdiff -urN /usr/ports/devel/libshhopt/Makefile devel/libshhopt/Makefile X--- /usr/ports/devel/libshhopt/Makefile Sat Jun 17 08:42:35 2000 X+++ devel/libshhopt/Makefile Tue Jul 4 22:05:06 2000 X@@ -5,25 +5,25 @@ X # $FreeBSD: ports/devel/libshhopt/Makefile,v 1.9 2000/06/16 21:50:06 asami Exp $ X # X X-PORTNAME= libshhopt X-PORTVERSION= 1.1.6 X-CATEGORIES= devel X-MASTER_SITES= http://home.sol.no/~sverrehu/pub-unix/files/ X-DISTNAME= shhopt-${PORTVERSION} X+PORTNAME= libshhopt X+PORTVERSION= 1.1.6 X+CATEGORIES= devel X+MASTER_SITES= http://shh.thathost.com/pub-unix/files/ X+DISTNAME= shhopt-${PORTVERSION} X X-MAINTAINER= obrien@FreeBSD.org X+MAINTAINER= obrien@FreeBSD.org X X-USE_GMAKE= yes X-INSTALLS_SHLIB= yes X+USE_GMAKE= yes X+INSTALLS_SHLIB= yes X X post-install: X+ @${MKDIR} ${PREFIX}/share/examples/libshhopt X+ ${INSTALL_DATA} ${FILESDIR}/Makefile ${PREFIX}/share/examples/libshhopt X+ ${INSTALL_DATA} ${WRKSRC}/example.c ${PREFIX}/share/examples/libshhopt X .if !defined(NOPORTDOCS) X- @ ${MKDIR} ${PREFIX}/share/doc/libshhopt X- @ ${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/libshhopt X- @ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libshhopt X+ @${MKDIR} ${PREFIX}/share/doc/libshhopt X+ ${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/libshhopt X+ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libshhopt X .endif X- @ ${MKDIR} ${PREFIX}/share/examples/libshhopt X- @ ${INSTALL_DATA} ${FILESDIR}/Makefile ${PREFIX}/share/examples/libshhopt X- @ ${INSTALL_DATA} ${WRKSRC}/example.c ${PREFIX}/share/examples/libshhopt X X .include Xdiff -urN /usr/ports/devel/libshhopt/patches/patch-aa devel/libshhopt/patches/patch-aa X--- /usr/ports/devel/libshhopt/patches/patch-aa Tue Mar 21 10:11:04 2000 X+++ devel/libshhopt/patches/patch-aa Tue Jul 4 21:40:31 2000 X@@ -1,6 +1,6 @@ X---- Makefile Fri Mar 10 11:45:19 2000 X-+++ /home/andy/tmp/wrk/Makefile Sun Mar 19 16:34:15 2000 X-@@ -6,10 +6,10 @@ X+--- Makefile.orig Fri Mar 10 17:45:19 2000 X++++ Makefile Tue Jul 4 21:40:24 2000 X+@@ -6,7 +6,7 @@ X VERSION = $(VERMAJ).$(VERMIN).$(VERPAT) X X # Define SHARED as 1 for Linux shared ELF library X@@ -8,41 +8,53 @@ X +SHARED = 1 X X ifeq ($(SHARED),1) X--LIBTARGET = lib$(DIST).so.$(VERSION) X-+LIBTARGET = lib$(DIST).so.$(VERMAJ) X- LIBTARGETSO = lib$(DIST).so X- LIBTARGETSOMAJ = $(LIBTARGETSO).$(VERMAJ) X- CCSHRD = -fPIC X-@@ -20,15 +20,16 @@ X+ LIBTARGET = lib$(DIST).so.$(VERSION) X+@@ -20,19 +20,19 @@ X LIBHEAD = $(DIST).h X TARGETS = $(LIBTARGET) X X -INSTBASEDIR = /usr/local X-+PREFIX ?= /usr/local X-+INSTBASEDIR = $(PREFIX) X++INSTBASEDIR = ${PREFIX} X INSTLIBDIR = $(INSTBASEDIR)/lib X INSTINCDIR = $(INSTBASEDIR)/include X -INSTALL = install -m 644 X -INSTALLPROG = install -m 755 X-+INSTALL = install -c -m 644 X-+INSTALLPROG = install -c -m 755 X- MKDIRP = install -d -m 755 X+-MKDIRP = install -d -m 755 X++INSTALL = ${BSD_INSTALL_DATA} X++INSTALLPROG = ${BSD_INSTALL_PROGRAM} X++MKDIRP = mkdir -p X X -CC = gcc X--OPTIM = -O2 X-+CC ?= gcc X-+OPTIM = $(CFLAGS) X++#CC = gcc X+ OPTIM = -O2 X X INCDIR = -I. X X-@@ -67,9 +68,7 @@ X- $(INSTALL) $(LIBTARGET) $(INSTLIBDIR) X+-CCOPT = -s -Wall $(OPTIM) $(INCDIR) X++CCOPT = $(INCDIR) $(CFLAGS) X+ X+ # Object files to store in the library X+ LIBOBJS = shhopt.o X+@@ -45,7 +45,7 @@ X+ # separately. This error is harmless. X+ $(LIBTARGET): $(LIBOBJS) X+ ifeq ($(SHARED),1) X+- $(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS) X++ $(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGETSOMAJ) $(LIBOBJS) X+ else X+ ar rc $(LIBTARGET) $(LIBOBJS) X+ ranlib $(LIBTARGET) || true X+@@ -64,12 +64,10 @@ X+ X+ install: $(LIBTARGET) X+ $(MKDIRP) $(INSTLIBDIR) $(INSTINCDIR) X+- $(INSTALL) $(LIBTARGET) $(INSTLIBDIR) X++ $(INSTALL) $(LIBTARGETSOMAJ) $(INSTLIBDIR) X $(INSTALL) $(LIBHEAD) $(INSTINCDIR) X ifeq ($(SHARED),1) X - ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSOMAJ) X-- ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO) X+ ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO) X - echo "If you use GNU/Linux, remember to run ldconfig" X-+ ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSO) X endif X X clean: Xdiff -urN /usr/ports/devel/libshhopt/pkg/DESCR devel/libshhopt/pkg/DESCR X--- /usr/ports/devel/libshhopt/pkg/DESCR Tue Mar 21 10:11:05 2000 X+++ devel/libshhopt/pkg/DESCR Tue Jul 4 21:08:48 2000 X@@ -2,4 +2,4 @@ X C-functions for parsing command line options, both traditional X one-character options, and GNU'ish --long-options. X X-WWW: http://home.sol.no/~sverrehu/pub-unix/ X+WWW: http://shh.thathost.com/pub-unix/#shhopt END-of-devel_libshhopt.patch echo x - devel_libxalloc.patch sed 's/^X//' >devel_libxalloc.patch << 'END-of-devel_libxalloc.patch' Xdiff -urN /usr/ports/devel/libxalloc/Makefile devel/libxalloc/Makefile X--- /usr/ports/devel/libxalloc/Makefile Sat Jun 17 08:42:37 2000 X+++ devel/libxalloc/Makefile Tue Jul 4 22:05:23 2000 X@@ -8,7 +8,7 @@ X PORTNAME= libxalloc X PORTVERSION= 1.0.3 X CATEGORIES= devel X-MASTER_SITES= http://home.sol.no/~sverrehu/pub-unix/files/ X+MASTER_SITES= http://shh.thathost.com/pub-unix/files/ X DISTNAME= xalloc-${PORTVERSION} X X MAINTAINER= obrien@FreeBSD.org X@@ -18,9 +18,9 @@ X X post-install: X .if !defined(NOPORTDOCS) X- @ ${MKDIR} ${PREFIX}/share/doc/libxalloc X- @ ${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/libxalloc X- @ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libxalloc X+ @${MKDIR} ${PREFIX}/share/doc/libxalloc X+ ${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/libxalloc X+ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libxalloc X .endif X X .include Xdiff -urN /usr/ports/devel/libxalloc/patches/patch-aa devel/libxalloc/patches/patch-aa X--- /usr/ports/devel/libxalloc/patches/patch-aa Sat Apr 3 10:23:32 1999 X+++ devel/libxalloc/patches/patch-aa Tue Jul 4 21:41:06 2000 X@@ -1,6 +1,6 @@ X---- Makefile.orig Sun Jul 5 12:15:59 1998 X-+++ Makefile Fri Apr 2 15:26:22 1999 X-@@ -8,10 +8,10 @@ X+--- Makefile.orig Mon Jul 6 02:15:59 1998 X++++ Makefile Tue Jul 4 21:40:59 2000 X+@@ -8,7 +8,7 @@ X ########################################################################### X X # Define SHARED as 1 for Linux shared ELF library X@@ -8,28 +8,54 @@ X +SHARED = 1 X X ifeq ($(SHARED),1) X--LIBTARGET = lib$(DIST).so.$(VERSION) X-+LIBTARGET = lib$(DIST).so.$(VERMAJ) X- LIBTARGETSO = lib$(DIST).so X- LIBTARGETSOMAJ = $(LIBTARGETSO).$(VERMAJ) X- CCSHRD = -fPIC X-@@ -27,7 +27,7 @@ X- INSTBASEDIR = /usr/local X+ LIBTARGET = lib$(DIST).so.$(VERSION) X+@@ -24,21 +24,21 @@ X+ X+ ########################################################################### X+ X+-INSTBASEDIR = /usr/local X++INSTBASEDIR = ${PREFIX} X INSTLIBDIR = $(INSTBASEDIR)/lib X INSTINCDIR = $(INSTBASEDIR)/include X -INSTALL = install -m 644 X-+INSTALL = install -c -m 644 X- MKDIRP = install -d -m 755 X+-MKDIRP = install -d -m 755 X++INSTALL = ${BSD_INSTALL_DATA} X++MKDIRP = mkdir -p X X ########################################################################### X-@@ -66,9 +66,7 @@ X- $(INSTALL) $(LIBTARGET) $(INSTLIBDIR) X+ X+-CC = gcc X++#CC = gcc X+ OPTIM = -O2 X+ X+ LIBDIR = -L. X+ INCDIR = -I. X+ X+-CCOPT = -Wall $(OPTIM) $(INCDIR) X++CCOPT = $(INCDIR) $(CFLAGS) X+ LDOPT = $(LIBDIR) X+ X+ # Object files to store in the library X+@@ -50,7 +50,7 @@ X+ X+ $(LIBTARGET): $(LIBOBJS) X+ ifeq ($(SHARED),1) X+- $(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS) X++ $(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGETSOMAJ) $(LIBOBJS) X+ else X+ ar rcs $(LIBTARGET) $(LIBOBJS) X+ endif X+@@ -63,12 +63,10 @@ X+ X+ install: $(LIBTARGET) X+ $(MKDIRP) $(INSTLIBDIR) $(INSTINCDIR) X+- $(INSTALL) $(LIBTARGET) $(INSTLIBDIR) X++ $(INSTALL) $(LIBTARGETSOMAJ) $(INSTLIBDIR) X $(INSTALL) $(LIBHEAD) $(INSTINCDIR) X ifeq ($(SHARED),1) X - ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSOMAJ) X-- ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO) X+ ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO) X - echo "If you use GNU/Linux, remember to run ldconfig" X-+ ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSO) X endif X X clean: Xdiff -urN /usr/ports/devel/libxalloc/pkg/DESCR devel/libxalloc/pkg/DESCR X--- /usr/ports/devel/libxalloc/pkg/DESCR Sat Apr 3 10:23:32 1999 X+++ devel/libxalloc/pkg/DESCR Tue Jul 4 21:09:16 2000 X@@ -1,3 +1,5 @@ X xalloc is a memory allocation library with error checking. X It contains wrappers including error checking for memory X allocating C-functions. X+ X+WWW: http://shh.thathost.com/pub-unix/#xalloc END-of-devel_libxalloc.patch echo x - games_biorythm.patch sed 's/^X//' >games_biorythm.patch << 'END-of-games_biorythm.patch' Xdiff -urN /usr/ports/games/biorythm/Makefile games/biorythm/Makefile X--- /usr/ports/games/biorythm/Makefile Fri Apr 14 18:48:49 2000 X+++ games/biorythm/Makefile Tue Jul 4 22:06:41 2000 X@@ -5,31 +5,25 @@ X # $FreeBSD: ports/games/biorythm/Makefile,v 1.4 2000/04/14 00:45:29 mharo Exp $ X # X X-PORTNAME= biorythm X-PORTVERSION= 1.1.1 X-CATEGORIES= games X-MASTER_SITES= ${MASTER_SITE_SUNSITE} \ X- http://home.sol.no/~sverrehu/pub-unix/files/ X-MASTER_SITE_SUBDIR= games/amusements X+PORTNAME= biorythm X+PORTVERSION= 1.1.1 X+CATEGORIES= games X+MASTER_SITES= http://shh.thathost.com/pub-unix/files/ X X-MAINTAINER= ports@FreeBSD.org X+MAINTAINER= ports@FreeBSD.org X X-LIB_DEPENDS= shhmsg.1:${PORTSDIR}/devel/libshhmsg \ X- shhopt.1:${PORTSDIR}/devel/libshhopt X+LIB_DEPENDS= shhmsg.1:${PORTSDIR}/devel/libshhmsg \ X+ shhopt.1:${PORTSDIR}/devel/libshhopt X X-USE_GMAKE= yes X+USE_GMAKE= yes X X-MAN6= biorythm.6 X- X-do-install: X- @ ${INSTALL_PROGRAM} ${WRKSRC}/biorythm ${PREFIX}/bin X- @ ${INSTALL_MAN} ${WRKSRC}/biorythm.6 ${PREFIX}/man/man6 X+MAN6= biorythm.6 X X post-install: X-.if !defined (NOPORTDOCS) X- @ ${MKDIR} ${PREFIX}/share/doc/biorythm X+.if !defined(NOPORTDOCS) X+ @${MKDIR} ${PREFIX}/share/doc/biorythm X .for file in CREDITS ChangeLog README X- @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/biorythm X+ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/biorythm X .endfor X .endif X Xdiff -urN /usr/ports/games/biorythm/patches/patch-aa games/biorythm/patches/patch-aa X--- /usr/ports/games/biorythm/patches/patch-aa Wed May 5 01:26:51 1999 X+++ games/biorythm/patches/patch-aa Tue Jul 4 21:47:27 2000 X@@ -1,28 +1,40 @@ X---- Makefile Sun Jul 5 19:55:11 1998 X-+++ /home/andy/tmp/wrk/Makefile Tue May 4 10:55:11 1999 X-@@ -11,10 +11,10 @@ X+--- Makefile.orig Mon Jul 6 00:55:11 1998 X++++ Makefile Tue Jul 4 21:47:21 2000 X+@@ -11,15 +11,15 @@ X ########################################################################### X X # where are shhmsg and shhopt? X -INCDIR = -I/usr/local/include X -LIBDIR = -L/usr/local/lib X-+INCDIR = -I$(LOCALBASE)/include X-+LIBDIR = -L$(LOCALBASE)/lib X++INCDIR = -I${LOCALBASE}/include X++LIBDIR = -L${LOCALBASE}/lib X X -INSTBASEDIR = /usr/local X-+INSTBASEDIR = $(PREFIX) X- INSTBINDIR = $(INSTBASEDIR)/games X+-INSTBINDIR = $(INSTBASEDIR)/games X++INSTBASEDIR = ${PREFIX} X++INSTBINDIR = $(INSTBASEDIR)/bin X INSTMANDIR = $(INSTBASEDIR)/man/man6 X- INSTALL = install -m 644 X-@@ -27,9 +27,9 @@ X+-INSTALL = install -m 644 X+-INSTALLPROG = install -s -m 755 X+-MKDIRP = install -d -m 755 X++INSTALL = ${BSD_INSTALL_DATA} X++INSTALLPROG = ${BSD_INSTALL_PROGRAM} X++MKDIRP = mkdir -p X+ X+ DEFINES = -DVERSION=\"$(VERSION)\" \ X+ "-DCOMPILED_DATE=\"$(COMPILED_DATE)\"" \ X+@@ -27,11 +27,11 @@ X X ########################################################################### X X -CC = gcc X +#CC = gcc X X--OPTIM = -O2 X-+OPTIM = $(CFLAGS) X- CCOPT = -Wall $(OPTIM) $(INCDIR) $(DEFINES) $(CFLAGS) X- LDOPT = -s $(LIBDIR) $(LDFLAGS) X+ OPTIM = -O2 X+-CCOPT = -Wall $(OPTIM) $(INCDIR) $(DEFINES) $(CFLAGS) X+-LDOPT = -s $(LIBDIR) $(LDFLAGS) X++CCOPT = $(INCDIR) $(DEFINES) $(CFLAGS) X++LDOPT = $(LIBDIR) $(LDFLAGS) X X+ LIBS = -lshhmsg -lshhopt -lm X+ OBJS = $(PROG).o date.o Xdiff -urN /usr/ports/games/biorythm/pkg/DESCR games/biorythm/pkg/DESCR X--- /usr/ports/games/biorythm/pkg/DESCR Wed May 5 01:26:51 1999 X+++ games/biorythm/pkg/DESCR Tue Jul 4 21:07:44 2000 X@@ -12,4 +12,4 @@ X The author has no idea how to interpret the plot, so please don't ask X him about it. X X-WWW: http://home.sol.no/~sverrehu/pub-unix/ X+WWW: http://shh.thathost.com/pub-unix/#biorythm END-of-games_biorythm.patch echo x - games_libshhcards.patch sed 's/^X//' >games_libshhcards.patch << 'END-of-games_libshhcards.patch' Xdiff -urN /usr/ports/games/libshhcards/Makefile games/libshhcards/Makefile X--- /usr/ports/games/libshhcards/Makefile Fri Jun 30 19:47:15 2000 X+++ games/libshhcards/Makefile Tue Jul 4 21:43:51 2000 X@@ -5,42 +5,25 @@ X # $FreeBSD: ports/games/libshhcards/Makefile,v 1.14 2000/06/29 07:02:13 obrien Exp $ X # X X-PORTNAME= libshhcards X-PORTVERSION= 1.0.4 X-CATEGORIES= devel X-MASTER_SITES= ${MASTER_SITE_SUNSITE} \ X- http://home.sol.no/~sverrehu/pub-unix/files/ \ X- ${MASTER_SITE_LOCAL} X-MASTER_SITE_SUBDIR= libs/ui mph X-DISTNAME= shhcards-${PORTVERSION} X- X-MAINTAINER= ports@FreeBSD.org X- X-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm X- X-USE_GMAKE= yes X-USE_X_PREFIX= yes X-INSTALLS_SHLIB= yes X-SOLIB= libshhcards.so X- X-.include X- X-.if ${PORTOBJFORMAT} == "elf" X-SOVERSION= 1 X-.else X-SOVERSION= 1.1 X-.endif X- X-do-install: X- @ ${INSTALL_DATA} ${WRKSRC}/shhcards.h ${PREFIX}/include X- @ ${INSTALL_DATA} ${WRKSRC}/${SOLIB}.${SOVERSION} ${PREFIX}/lib X- @ ${LN} -sf ${SOLIB}.${SOVERSION} ${PREFIX}/lib/${SOLIB} X+PORTNAME= libshhcards X+PORTVERSION= 1.0.4 X+CATEGORIES= games X+MASTER_SITES= http://shh.thathost.com/pub-unix/files/ X+DISTNAME= shhcards-${PORTVERSION} X+ X+MAINTAINER= ports@FreeBSD.org X+ X+LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm X+ X+USE_GMAKE= yes X+USE_X_PREFIX= yes X+INSTALLS_SHLIB= yes X X post-install: X .if !defined(NOPORTDOCS) X- @ ${MKDIR} ${PREFIX}/share/doc/libshhcards X- @ ${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/libshhcards X- @ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libshhcards X+ @${MKDIR} ${PREFIX}/share/doc/libshhcards X+ ${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/libshhcards X+ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libshhcards X .endif X X-.include X+.include Xdiff -urN /usr/ports/games/libshhcards/patches/patch-aa games/libshhcards/patches/patch-aa X--- /usr/ports/games/libshhcards/patches/patch-aa Mon May 31 13:55:32 1999 X+++ games/libshhcards/patches/patch-aa Tue Jul 4 21:38:53 2000 X@@ -1,19 +1,6 @@ X---- Makefile.orig Sun Jul 5 11:52:26 1998 X-+++ Makefile Sun May 30 21:07:36 1999 X-@@ -1,14 +1,17 @@ X- # $Id: Makefile,v 1.4 1998/07/05 16:52:26 sverrehu Exp $ X- DIST = shhcards X- VERMAJ = 1 X--VERMIN = 0 X--VERPAT = 4 X--VERSION = $(VERMAJ).$(VERMIN).$(VERPAT) X-+VERMIN = 1 X-+ifeq ($(PORTOBJFORMAT),elf) X-+VERSION = $(VERMAJ) X-+else X-+VERSION = $(VERMAJ).$(VERMIN) X-+endif X- X+--- Makefile.orig Mon Jul 6 01:52:26 1998 X++++ Makefile Tue Jul 4 21:38:46 2000 X+@@ -8,7 +8,7 @@ X ########################################################################### X X # Define SHARED as 1 for Linux shared ELF library X@@ -22,18 +9,36 @@ X X ifeq ($(SHARED),1) X LIBTARGET = lib$(DIST).so.$(VERSION) X-@@ -28,8 +31,8 @@ X- INSTALL = install -m 644 X- MKDIRP = install -d -m 755 X+@@ -22,13 +22,13 @@ X+ LIBHEAD = $(DIST).h X+ TARGETS = $(LIBTARGET) X+ X+-INSTBASEDIR = /usr/local X++INSTBASEDIR = ${PREFIX} X+ INSTLIBDIR = $(INSTBASEDIR)/lib X+ INSTINCDIR = $(INSTBASEDIR)/include X+-INSTALL = install -m 644 X+-MKDIRP = install -d -m 755 X++INSTALL = ${BSD_INSTALL_DATA} X++MKDIRP = mkdir -p X X -CC = gcc X--OPTIM = -O2 X +#CC = gcc X-+OPTIM = $(CFLAGS) X+ OPTIM = -O2 X X ########################################################################### X+@@ -36,8 +36,8 @@ X+ # Where are Xpm and X11? X+ X+ # GNU/Linux at home X+-INCDIR = -I. -I/usr/local/include -I/usr/X11R6/include X+-LIBDIR = -L. -L/usr/local/lib -L/usr/X11R6/lib -L/usr/local/lib/X11 X++INCDIR = -I. -I${X11BASE}/include X++LIBDIR = -L. -L${X11BASE}/lib X+ EXTRA_LD_OPT = X+ EXTRA_LIBS = X X-@@ -68,10 +71,10 @@ X+@@ -68,14 +68,14 @@ X endif X X # Alpha at USIT X@@ -48,16 +53,31 @@ X X ########################################################################### X X-@@ -87,7 +90,11 @@ X+-CCOPT = -Wall $(OPTIM) $(INCDIR) $(CFLAGS) X++CCOPT = $(INCDIR) $(CFLAGS) X+ LDOPT = $(LIBDIR) $(LDFLAGS) X+ X+ # Object files to store in the library X+@@ -87,7 +87,7 @@ X X $(LIBTARGET): $(LIBOBJS) X ifeq ($(SHARED),1) X - $(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS) X-+ifeq ($(PORTOBJFORMAT),elf) X-+ $(CC) -shared -Wl,-soname,$(LIBTARGET) -o $(LIBTARGET) $(LIBOBJS) X-+else X-+ $(CC) -shared -o $(LIBTARGET) $(LIBOBJS) X-+endif X++ $(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGETSOMAJ) $(LIBOBJS) X else X ar rcs $(LIBTARGET) $(LIBOBJS) X endif X+@@ -106,12 +106,10 @@ X+ X+ install: $(LIBTARGET) X+ $(MKDIRP) $(INSTLIBDIR) $(INSTINCDIR) X+- $(INSTALL) $(LIBTARGET) $(INSTLIBDIR) X++ $(INSTALL) $(LIBTARGETSOMAJ) $(INSTLIBDIR) X+ $(INSTALL) $(LIBHEAD) $(INSTINCDIR) X+ ifeq ($(SHARED),1) X+- ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSOMAJ) X+ ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO) X+- echo "If you use GNU/Linux, remember to run ldconfig" X+ endif X+ X+ depend dep: Xdiff -urN /usr/ports/games/libshhcards/pkg/DESCR games/libshhcards/pkg/DESCR X--- /usr/ports/games/libshhcards/pkg/DESCR Sun May 3 03:02:44 1998 X+++ games/libshhcards/pkg/DESCR Tue Jul 4 21:08:05 2000 X@@ -1,3 +1,5 @@ X shhcards is a library for displaying game cards on X11. X It provides pixmaps for card games, and functions for X using the cards in X11 programs. X+ X+WWW: http://shh.thathost.com/pub-unix/#shhcards Xdiff -urN /usr/ports/games/libshhcards/pkg/PLIST games/libshhcards/pkg/PLIST X--- /usr/ports/games/libshhcards/pkg/PLIST Fri Jun 16 21:42:07 2000 X+++ games/libshhcards/pkg/PLIST Tue Jul 4 21:07:13 2000 X@@ -1,6 +1,6 @@ X include/shhcards.h X lib/libshhcards.so X-lib/libshhcards.so.1.1 X+lib/libshhcards.so.1 X share/doc/libshhcards/CREDITS X share/doc/libshhcards/README X @dirrm share/doc/libshhcards END-of-games_libshhcards.patch echo x - games_sol.patch sed 's/^X//' >games_sol.patch << 'END-of-games_sol.patch' Xdiff -urN /usr/ports/games/sol/Makefile games/sol/Makefile X--- /usr/ports/games/sol/Makefile Sat Apr 15 00:24:02 2000 X+++ games/sol/Makefile Tue Jul 4 20:59:11 2000 X@@ -8,7 +8,7 @@ X PORTNAME= sol X PORTVERSION= 1.0.6 X CATEGORIES= games X-MASTER_SITES= http://home.sol.no/~sverrehu/pub-unix/files/ X+MASTER_SITES= http://shh.thathost.com/pub-unix/files/ X X MAINTAINER= ports@FreeBSD.org X X@@ -24,17 +24,19 @@ X MAN6= sol.6 X X do-install: X- @ ${INSTALL_PROGRAM} ${WRKSRC}/sol ${PREFIX}/bin X- @ ${MKDIR} ${PREFIX}/share/sol X- @ ${INSTALL_DATA} ${WRKSRC}/sol.score ${PREFIX}/share/sol X- @ ${INSTALL_MAN} ${WRKSRC}/sol.6 ${PREFIX}/man/man6 X- @ ${MKDIR} ${PREFIX}/share/doc/sol X- @ ${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/sol X- @ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/sol X- @ ${CHOWN} root:games ${PREFIX}/bin/sol X- @ ${CHOWN} root:games ${PREFIX}/share/sol/sol.score X- @ ${CHMOD} 2755 ${PREFIX}/bin/sol X- @ ${CHMOD} 770 ${PREFIX}/share/sol X- @ ${CHMOD} 660 ${PREFIX}/share/sol/sol.score X+ ${INSTALL_PROGRAM} ${WRKSRC}/sol ${PREFIX}/bin X+ ${INSTALL_MAN} ${WRKSRC}/sol.6 ${PREFIX}/man/man6 X+ @${MKDIR} ${PREFIX}/share/sol X+ ${INSTALL_DATA} ${WRKSRC}/sol.score ${PREFIX}/share/sol X+ @${CHOWN} root:games ${PREFIX}/bin/sol X+ @${CHOWN} root:games ${PREFIX}/share/sol/sol.score X+ @${CHMOD} 2755 ${PREFIX}/bin/sol X+ @${CHMOD} 770 ${PREFIX}/share/sol X+ @${CHMOD} 660 ${PREFIX}/share/sol/sol.score X+.if !defined(NOPORTDOCS) X+ @${MKDIR} ${PREFIX}/share/doc/sol X+ ${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/sol X+ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/sol X+.endif X X .include Xdiff -urN /usr/ports/games/sol/patches/patch-aa games/sol/patches/patch-aa X--- /usr/ports/games/sol/patches/patch-aa Mon May 31 13:51:19 1999 X+++ games/sol/patches/patch-aa Tue Jul 4 21:59:17 2000 X@@ -1,6 +1,18 @@ X---- Makefile.orig Sun Jul 5 03:30:26 1998 X-+++ Makefile Sun May 30 21:12:31 1999 X-@@ -53,16 +53,16 @@ X+--- Makefile.orig Sun Jul 5 17:30:26 1998 X++++ Makefile Tue Jul 4 21:59:11 2000 X+@@ -13,9 +13,8 @@ X+ # Where are shhmsg, shhopt, xalloc, shhcards, Xpm and X11? X+ X+ # GNU/Linux at home X+-INCDIR = -I/usr/local/include -I/usr/X11R6/include \ X+- -I/usr/local/include/X11 X+-LIBDIR = -L/usr/local/lib -L/usr/X11R6/lib -L/usr/local/lib/X11 X++INCDIR = -I${LOCALBASE}/include -I${X11BASE}/include X++LIBDIR = -L${LOCALBASE}/lib -L${X11BASE}/lib X+ X+ # Irix at Ifi X+ ifeq ($(HOSTTYPE),sgi) X+@@ -53,18 +52,18 @@ X endif X X # DEC Alpha at USIT X@@ -19,7 +31,26 @@ X X # Where do you want to install the program and the highscore file? X -INSTLIBDIR = /var/local/lib/games X-+INSTLIBDIR = /usr/X11R6/share/sol X- INSTBINDIR = /usr/local/games X- INSTMANDIR = /usr/local/man/man6 X+-INSTBINDIR = /usr/local/games X+-INSTMANDIR = /usr/local/man/man6 X++INSTLIBDIR = ${PREFIX}/share/sol X++INSTBINDIR = ${PREFIX}/bin X++INSTMANDIR = ${PREFIX}/man/man6 X #INSTLIBDIR = /hom/sverrehu/lib X+ #INSTBINDIR = /hom/sverrehu/bin/$$HOSTTYPE X+ #INSTMANDIR = /hom/sverrehu/man/man6 X+@@ -84,11 +83,11 @@ X+ X+ ########################################################################### X+ X+-CC = gcc X++#CC = gcc X+ X+ OPTIM = -s -O2 X+-CCOPT = -Wall $(OPTIM) $(INCDIR) $(DEFINES) $(CFLAGS) X+-LDOPT = -s $(LIBDIR) $(LDFLAGS) $(EXTRA_LD_OPT) X++CCOPT = $(INCDIR) $(DEFINES) $(CFLAGS) X++LDOPT = $(LIBDIR) $(LDFLAGS) $(EXTRA_LD_OPT) X+ X+ LIBS = -lshhopt -lshhmsg -lxalloc -lshhcards \ X+ -lXaw -lXt -lXpm -lXext -lXmu -lX11 $(EXTRA_LIBS) Xdiff -urN /usr/ports/games/sol/pkg/DESCR games/sol/pkg/DESCR X--- /usr/ports/games/sol/pkg/DESCR Mon May 3 07:15:20 1999 X+++ games/sol/pkg/DESCR Tue Jul 4 20:59:05 2000 X@@ -2,4 +2,4 @@ X bundeled with a well known "operating system". Features X a site-wide highscore table. X X-WWW: http://home.sol.no/~sverrehu/pub-unix/html/sol.html X+WWW: http://shh.thathost.com/pub-unix/#sol END-of-games_sol.patch exit >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message