From owner-freebsd-ports Mon Nov 20 11:10:31 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 D5A6737B4CF for ; Mon, 20 Nov 2000 11:10:01 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id LAA10505; Mon, 20 Nov 2000 11:10:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 74DD137B479; Mon, 20 Nov 2000 11:07:33 -0800 (PST) Message-Id: <20001120190733.74DD137B479@hub.freebsd.org> Date: Mon, 20 Nov 2000 11:07:33 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/22987: Update port: databases/typhoon Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 22987 >Category: ports >Synopsis: Update port: databases/typhoon >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: Mon Nov 20 11:10:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.1.1-RELEASE i386 >Organization: >Environment: >Description: - Support CC/CFLAGS properly New file: files/patch-ad files/patch-ae files/patch-af files/patch-ag files/patch-ah Remove file: files/patch-ab >How-To-Repeat: >Fix: diff -urN /usr/ports/databases/typhoon/Makefile databases/typhoon/Makefile --- /usr/ports/databases/typhoon/Makefile Sat Jun 17 08:41:28 2000 +++ databases/typhoon/Makefile Sat Nov 18 03:20:06 2000 @@ -17,16 +17,24 @@ HAS_CONFIGURE= yes INSTALLS_SHLIB= yes -MAN3=d_close.3 d_crget.3 d_crread.3 d_crset.3 d_dbdpath.3 d_dbfpath.3 \ - d_dbget.3 d_dbset.3 d_delete.3 d_fillnew.3 d_getsequence.3 d_keyfind.3 \ - d_keyfrst.3 d_keylast.3 d_keynext.3 d_keyprev.3 d_keyread.3 d_open.3 \ - d_recfrst.3 d_reclast.3 d_recnext.3 d_recprev.3 d_recread.3 \ - d_recwrite.3 d_setfiles.3 -MAN1=ddlp.1 +MAN1= ddlp.1 +MAN3= d_close.3 d_crget.3 d_crread.3 d_crset.3 d_dbdpath.3 d_dbfpath.3 \ + d_dbget.3 d_dbset.3 d_delete.3 d_fillnew.3 d_getsequence.3 \ + d_keyfind.3 d_keyfrst.3 d_keylast.3 d_keynext.3 d_keyprev.3 \ + d_keyread.3 d_open.3 d_recfrst.3 d_reclast.3 d_recnext.3 d_recprev.3 \ + d_recread.3 d_recwrite.3 d_setfiles.3 post-install: +.for file in ${MAN1} + ${INSTALL_MAN} ${WRKSRC}/man/${file} ${PREFIX}/man/man1 +.endfor +.for file in ${MAN3} + ${INSTALL_MAN} ${WRKSRC}/man/${file} ${PREFIX}/man/man3 +.endfor @${MKDIR} ${PREFIX}/share/typhoon - @${INSTALL_DATA} ${WRKSRC}/man/manual.asc ${PREFIX}/share/typhoon - @${INSTALL_DATA} ${WRKSRC}/include/environ.h ${WRKSRC}/include/typhoon.h ${PREFIX}/include + ${INSTALL_DATA} ${WRKSRC}/man/manual.asc ${PREFIX}/share/typhoon +.for file in environ.h typhoon.h + ${INSTALL_DATA} ${WRKSRC}/include/${file} ${PREFIX}/include +.endfor .include diff -urN /usr/ports/databases/typhoon/files/patch-aa databases/typhoon/files/patch-aa --- /usr/ports/databases/typhoon/files/patch-aa Thu Dec 12 11:41:11 1996 +++ databases/typhoon/files/patch-aa Sat Nov 18 02:56:45 2000 @@ -1,48 +1,27 @@ ---- configure~ Wed Dec 11 15:21:16 1996 -+++ configure Wed Dec 11 15:22:18 1996 -@@ -1,6 +1,7 @@ +--- configure.orig Mon May 22 01:47:06 1995 ++++ configure Sat Nov 18 02:56:37 2000 +@@ -1,7 +1,7 @@ # # configure script # +-CC=cc +alias type=which - CC=cc compile='$CC -o conftest conftest.c >/dev/null 2>&1' -@@ -152,10 +153,10 @@ + compiled_ok='test -s conftest && (./conftest) >/dev/null 2>/dev/null;' +@@ -151,11 +151,11 @@ + # echo Checking for cc if test -z "$CC" && type cc >/dev/null 2>/dev/null ; then - CC=cc +- CC=cc - CFLAGS="-g $(DEFINES)" -+ CFLAGS="-O2 $(DEFINES)" ++ CC="$CC" ++ CFLAGS="$CFLAGS $(DEFINES)" else - CC=gcc +- CC=gcc - CFLAGS="-g -W -Wunused -Wpointer-arith -Wswitch \$(DEFINES)" -+ CFLAGS="-O2 -W -Wunused -Wpointer-arith -Wswitch \$(DEFINES)" ++ CC="$CC" ++ CFLAGS="$CFLAGS -W -Wunused -Wpointer-arith -Wswitch \$(DEFINES)" fi # ---- Makefile.orig Sun May 21 11:47:05 1995 -+++ Makefile Wed Dec 11 16:33:44 1996 -@@ -1,11 +1,10 @@ - # Makefile for: typhoon - top level makefile - - MANEXT = l --PREFIX = /usr/local - DESTMAN = $(PREFIX)/man/man$(MANEXT) - DESTCAT = $(PREFIX)/man/cat$(MANEXT) --DESTOWN = root --DESTGRP = local -+DESTOWN = bin -+DESTGRP = bin - SHELL = /bin/sh - MAKE = make - -@@ -14,8 +13,6 @@ - all install uninstall: include/ansi.h include/environ.h - cd src; $(MAKE) $@ - cd util; $(MAKE) $@ -- cd examples; $(MAKE) $@ -- cd man; $(MAKE) $@ - - include/ansi.h include/environ.h: - configure diff -urN /usr/ports/databases/typhoon/files/patch-ab databases/typhoon/files/patch-ab --- /usr/ports/databases/typhoon/files/patch-ab Thu Dec 12 11:41:11 1996 +++ databases/typhoon/files/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,145 +0,0 @@ ---- src/os.c~ Wed Dec 11 15:24:29 1996 -+++ src/os.c Wed Dec 11 15:25:06 1996 -@@ -42,7 +42,7 @@ - # include - # include - #endif --#ifdef __linux__ -+#if defined( __linux__ ) || defined( __FreeBSD__ ) - # include - # define F_TLOCK LOCK_NB - # define F_LOCK LOCK_EX ---- src/unix.c~ Wed Dec 11 15:26:04 1996 -+++ src/unix.c Wed Dec 11 15:26:20 1996 -@@ -50,7 +50,7 @@ - #include - #include - #include --#ifdef __linux__ -+#if defined( __linux__ ) || defined( __FreeBSD__ ) - # include - # define F_TLOCK LOCK_NB - # define F_LOCK LOCK_EX ---- src/Makefile.in.orig Sun May 21 11:47:27 1995 -+++ src/Makefile.in Wed Dec 11 16:09:00 1996 -@@ -6,15 +6,20 @@ - CC = @cc@ - CFLAGS = @cflags@ - RANLIB = @ranlib@ --PREFIX = /usr/local --DESTLIB = $(PREFIX)/lib -+SHLIB_MAJOR = 1 -+SHLIB_MINOR = 10 -+DESTDIR = -+LIBDIR = $(PREFIX)/lib -+MANDIR = ${PREFIX}/man/man -+NOMANCOMPRESS= yup - DESTHDR = $(PREFIX)/include --DESTOWN = root --DESTGRP = local -+DESTHDR = $(PREFIX)/include -+LIBOWN = bin -+LIBGRP = bin - SHELL = /bin/sh --LIBRARY = libtyphoon.a -+LIB = typhoon - LIBHDRS = ../include/environ.h ../include/typhoon.h --LIBID = TYPHOON 1.0 $(DESTLIB)/$(LIBRARY) -+ - SRCS = bt_del.c bt_funcs.c bt_io.c bt_open.c cmpfuncs.c os.c \ - readdbd.c record.c ty_auxfn.c ty_find.c ty_ins.c \ - ty_io.c ty_log.c ty_open.c ty_refin.c ty_repl.c \ -@@ -27,67 +31,30 @@ - ty_repl.o ty_util.o unix.o vlr.o ansi.o sequence.o - UNUSED = dos.c os2.c ty_lock.c - --.DEFAULT: -- co $@ -- --.PHONY: all lint tags install uninstall clean -- --.c.o: -- $(CC) -c $(CFLAGS) $< --# -mcs -d -a '@(#)$(LIBID)' $@ -- --all: $(LIBRARY) -- --$(LIBRARY): $(OBJS) -- ar cru $(LIBRARY) $(OBJS) -- $(RANLIB) $(LIBRARY) -- --#catalog.dbd: catalog.ddl --# ddlp -f -hcatalog.h -a4 catalog -- --lint: -- lint -u $(DEFINES) $(SRCS) -- --tags: $(HDRS) $(SRCS) -- ctags -w $(HDRS) $(SRCS) -- --install: $(LIBRARY) -- cp $(LIBRARY) $(DESTLIB) -- -ranlib $(DESTLIB)/$(LIBRARY) -- chmod 644 $(DESTLIB)/$(LIBRARY) -- chown $(DESTOWN) $(DESTLIB)/$(LIBRARY) -- chgrp $(DESTGRP) $(DESTLIB)/$(LIBRARY) -- cp $(LIBHDRS) $(DESTHDR) -- cd $(DESTHDR) && chmod 644 $(LIBHDRS) -- cd $(DESTHDR) && chown $(DESTOWN) $(LIBHDRS) -- cd $(DESTHDR) && chgrp $(DESTGRP) $(LIBHDRS) -- --uninstall: -- rm -f $(DESTLIB)/$(LIBRARY) -- cd $(DESTHDR) && rm -f $(LIBHDRS) -- --clean: -- -rcsclean -u -- -rm -f $(LIBRARY) $(OBJS) -- -rm -f Makefile lib.a tags made *.o -+MAN3=../man/d_close.3 \ -+ ../man/d_crget.3 \ -+ ../man/d_crread.3 \ -+ ../man/d_crset.3 \ -+ ../man/d_dbdpath.3 \ -+ ../man/d_dbfpath.3 \ -+ ../man/d_dbget.3 \ -+ ../man/d_dbset.3 \ -+ ../man/d_delete.3 \ -+ ../man/d_fillnew.3 \ -+ ../man/d_getsequence.3 \ -+ ../man/d_keyfind.3 \ -+ ../man/d_keyfrst.3 \ -+ ../man/d_keylast.3 \ -+ ../man/d_keynext.3 \ -+ ../man/d_keyprev.3 \ -+ ../man/d_keyread.3 \ -+ ../man/d_open.3 \ -+ ../man/d_recfrst.3 \ -+ ../man/d_reclast.3 \ -+ ../man/d_recnext.3 \ -+ ../man/d_recprev.3 \ -+ ../man/d_recread.3 \ -+ ../man/d_recwrite.3 \ -+ ../man/d_setfiles.3 - --### Do NOT edit this or the following lines. --bt_del.o: ty_dbd.h ty_type.h ty_prot.h ty_glob.h btree.h --bt_funcs.o: ty_dbd.h ty_type.h ty_prot.h ty_glob.h btree.h --bt_io.o: ty_dbd.h ty_type.h btree.h --bt_open.o: ty_dbd.h ty_type.h ty_prot.h ty_glob.h btree.h --cmpfuncs.o: ty_dbd.h ty_type.h ty_glob.h ty_prot.h --readdbd.o: ty_dbd.h ty_type.h ty_glob.h --record.o: ty_dbd.h ty_type.h ty_prot.h ty_glob.h --ty_auxfn.o: ty_dbd.h ty_type.h ty_glob.h ty_prot.h --ty_find.o: ty_dbd.h ty_type.h ty_glob.h ty_prot.h --ty_ins.o: ty_dbd.h ty_type.h ty_glob.h ty_prot.h --ty_io.o: ty_dbd.h ty_type.h ty_glob.h ty_prot.h --ty_log.o: ty_dbd.h ty_type.h ty_glob.h ty_prot.h ty_log.h --ty_open.o: ty_dbd.h ty_type.h ty_glob.h ty_prot.h --ty_refin.o: ty_dbd.h ty_type.h ty_glob.h ty_prot.h --ty_repl.o: ty_dbd.h ty_type.h ty_glob.h ty_prot.h ty_repif.h catalog.h --ty_util.o: ty_dbd.h ty_type.h ty_glob.h ty_prot.h --unix.o: ty_dbd.h ty_type.h --vlr.o: ty_dbd.h ty_type.h ty_prot.h ty_glob.h --sequence.o: ty_dbd.h ty_type.h ty_prot.h ty_glob.h -+.include diff -urN /usr/ports/databases/typhoon/files/patch-ac databases/typhoon/files/patch-ac --- /usr/ports/databases/typhoon/files/patch-ac Tue Oct 20 10:30:07 1998 +++ databases/typhoon/files/patch-ac Sat Nov 18 03:18:54 2000 @@ -1,16 +1,5 @@ ---- examples/Makefile.in~ Wed Dec 11 15:42:53 1996 -+++ examples/Makefile.in Wed Dec 11 15:41:41 1996 -@@ -28,7 +28,7 @@ - $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $(PROGRAM) - - demo.h demo.dbd: demo.ddl -- ../util/ddlp -a4 -f demo -+ env LD_LIBRARY_PATH=../src ../util/ddlp -a4 -f demo - - lint: - lint -u $(DEFINES) $(SRCS) ---- util/Makefile.in~ Sun May 21 11:47:41 1995 -+++ util/Makefile.in Thu Oct 15 17:09:03 1998 +--- util/Makefile.in.orig Mon May 22 01:47:41 1995 ++++ util/Makefile.in Sat Nov 18 03:18:42 2000 @@ -8,11 +8,10 @@ CC = @cc@ CFLAGS = @cflags@ @@ -25,7 +14,7 @@ SHELL = /bin/sh PROGRAMS = ddlp dbdview tyexport tyimport # tybackup tyrestore MADESRCS = ddl.c exp.c imp.c -@@ -74,11 +73,11 @@ +@@ -74,7 +73,6 @@ install: $(PROGRAMS) cp $(PROGRAMS) $(DESTBIN) @@ -33,8 +22,3 @@ cd $(DESTBIN) && strip $(PROGRAMS) cd $(DESTBIN) && chmod 755 $(PROGRAMS) cd $(DESTBIN) && chown $(DESTOWN) $(PROGRAMS) - cd $(DESTBIN) && chgrp $(DESTGRP) $(PROGRAMS) -+ install -c -m 644 ../man/ddlp.1 ${PREFIX}/man/man1 - - uninstall: - cd $(DESTBIN) && rm -f $(PROGRAMS) diff -urN /usr/ports/databases/typhoon/files/patch-ad databases/typhoon/files/patch-ad --- /usr/ports/databases/typhoon/files/patch-ad Thu Jan 1 09:00:00 1970 +++ databases/typhoon/files/patch-ad Sat Nov 18 02:11:59 2000 @@ -0,0 +1,25 @@ +--- Makefile.orig Mon May 22 01:47:05 1995 ++++ Makefile Sat Nov 18 02:11:18 2000 +@@ -1,11 +1,10 @@ + # Makefile for: typhoon - top level makefile + + MANEXT = l +-PREFIX = /usr/local + DESTMAN = $(PREFIX)/man/man$(MANEXT) + DESTCAT = $(PREFIX)/man/cat$(MANEXT) +-DESTOWN = root +-DESTGRP = local ++DESTOWN = bin ++DESTGRP = bin + SHELL = /bin/sh + MAKE = make + +@@ -14,8 +13,6 @@ + all install uninstall: include/ansi.h include/environ.h + cd src; $(MAKE) $@ + cd util; $(MAKE) $@ +- cd examples; $(MAKE) $@ +- cd man; $(MAKE) $@ + + include/ansi.h include/environ.h: + configure diff -urN /usr/ports/databases/typhoon/files/patch-ae databases/typhoon/files/patch-ae --- /usr/ports/databases/typhoon/files/patch-ae Thu Jan 1 09:00:00 1970 +++ databases/typhoon/files/patch-ae Sat Nov 18 02:12:25 2000 @@ -0,0 +1,11 @@ +--- examples/Makefile.in.orig Mon May 22 01:47:11 1995 ++++ examples/Makefile.in Sat Nov 18 02:11:19 2000 +@@ -28,7 +28,7 @@ + $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $(PROGRAM) + + demo.h demo.dbd: demo.ddl +- ../util/ddlp -a4 -f demo ++ env LD_LIBRARY_PATH=../src ../util/ddlp -a4 -f demo + + lint: + lint -u $(DEFINES) $(SRCS) diff -urN /usr/ports/databases/typhoon/files/patch-af databases/typhoon/files/patch-af --- /usr/ports/databases/typhoon/files/patch-af Thu Jan 1 09:00:00 1970 +++ databases/typhoon/files/patch-af Sat Nov 18 03:21:31 2000 @@ -0,0 +1,94 @@ +--- src/Makefile.in.orig Mon May 22 01:47:27 1995 ++++ src/Makefile.in Sat Nov 18 03:21:22 2000 +@@ -6,15 +6,15 @@ + CC = @cc@ + CFLAGS = @cflags@ + RANLIB = @ranlib@ +-PREFIX = /usr/local +-DESTLIB = $(PREFIX)/lib +-DESTHDR = $(PREFIX)/include +-DESTOWN = root +-DESTGRP = local ++SHLIB_MAJOR = 1 ++SHLIB_MINOR = 10 ++LIBDIR = $(PREFIX)/lib ++LIBOWN = bin ++LIBGRP = bin + SHELL = /bin/sh +-LIBRARY = libtyphoon.a ++LIB = typhoon + LIBHDRS = ../include/environ.h ../include/typhoon.h +-LIBID = TYPHOON 1.0 $(DESTLIB)/$(LIBRARY) ++ + SRCS = bt_del.c bt_funcs.c bt_io.c bt_open.c cmpfuncs.c os.c \ + readdbd.c record.c ty_auxfn.c ty_find.c ty_ins.c \ + ty_io.c ty_log.c ty_open.c ty_refin.c ty_repl.c \ +@@ -27,67 +27,4 @@ + ty_repl.o ty_util.o unix.o vlr.o ansi.o sequence.o + UNUSED = dos.c os2.c ty_lock.c + +-.DEFAULT: +- co $@ +- +-.PHONY: all lint tags install uninstall clean +- +-.c.o: +- $(CC) -c $(CFLAGS) $< +-# -mcs -d -a '@(#)$(LIBID)' $@ +- +-all: $(LIBRARY) +- +-$(LIBRARY): $(OBJS) +- ar cru $(LIBRARY) $(OBJS) +- $(RANLIB) $(LIBRARY) +- +-#catalog.dbd: catalog.ddl +-# ddlp -f -hcatalog.h -a4 catalog +- +-lint: +- lint -u $(DEFINES) $(SRCS) +- +-tags: $(HDRS) $(SRCS) +- ctags -w $(HDRS) $(SRCS) +- +-install: $(LIBRARY) +- cp $(LIBRARY) $(DESTLIB) +- -ranlib $(DESTLIB)/$(LIBRARY) +- chmod 644 $(DESTLIB)/$(LIBRARY) +- chown $(DESTOWN) $(DESTLIB)/$(LIBRARY) +- chgrp $(DESTGRP) $(DESTLIB)/$(LIBRARY) +- cp $(LIBHDRS) $(DESTHDR) +- cd $(DESTHDR) && chmod 644 $(LIBHDRS) +- cd $(DESTHDR) && chown $(DESTOWN) $(LIBHDRS) +- cd $(DESTHDR) && chgrp $(DESTGRP) $(LIBHDRS) +- +-uninstall: +- rm -f $(DESTLIB)/$(LIBRARY) +- cd $(DESTHDR) && rm -f $(LIBHDRS) +- +-clean: +- -rcsclean -u +- -rm -f $(LIBRARY) $(OBJS) +- -rm -f Makefile lib.a tags made *.o +- +-### Do NOT edit this or the following lines. +-bt_del.o: ty_dbd.h ty_type.h ty_prot.h ty_glob.h btree.h +-bt_funcs.o: ty_dbd.h ty_type.h ty_prot.h ty_glob.h btree.h +-bt_io.o: ty_dbd.h ty_type.h btree.h +-bt_open.o: ty_dbd.h ty_type.h ty_prot.h ty_glob.h btree.h +-cmpfuncs.o: ty_dbd.h ty_type.h ty_glob.h ty_prot.h +-readdbd.o: ty_dbd.h ty_type.h ty_glob.h +-record.o: ty_dbd.h ty_type.h ty_prot.h ty_glob.h +-ty_auxfn.o: ty_dbd.h ty_type.h ty_glob.h ty_prot.h +-ty_find.o: ty_dbd.h ty_type.h ty_glob.h ty_prot.h +-ty_ins.o: ty_dbd.h ty_type.h ty_glob.h ty_prot.h +-ty_io.o: ty_dbd.h ty_type.h ty_glob.h ty_prot.h +-ty_log.o: ty_dbd.h ty_type.h ty_glob.h ty_prot.h ty_log.h +-ty_open.o: ty_dbd.h ty_type.h ty_glob.h ty_prot.h +-ty_refin.o: ty_dbd.h ty_type.h ty_glob.h ty_prot.h +-ty_repl.o: ty_dbd.h ty_type.h ty_glob.h ty_prot.h ty_repif.h catalog.h +-ty_util.o: ty_dbd.h ty_type.h ty_glob.h ty_prot.h +-unix.o: ty_dbd.h ty_type.h +-vlr.o: ty_dbd.h ty_type.h ty_prot.h ty_glob.h +-sequence.o: ty_dbd.h ty_type.h ty_prot.h ty_glob.h ++.include diff -urN /usr/ports/databases/typhoon/files/patch-ag databases/typhoon/files/patch-ag --- /usr/ports/databases/typhoon/files/patch-ag Thu Jan 1 09:00:00 1970 +++ databases/typhoon/files/patch-ag Sat Nov 18 02:12:50 2000 @@ -0,0 +1,11 @@ +--- src/os.c.orig Mon May 22 01:47:31 1995 ++++ src/os.c Sat Nov 18 02:11:18 2000 +@@ -42,7 +42,7 @@ + # include + # include + #endif +-#ifdef __linux__ ++#if defined( __linux__ ) || defined( __FreeBSD__ ) + # include + # define F_TLOCK LOCK_NB + # define F_LOCK LOCK_EX diff -urN /usr/ports/databases/typhoon/files/patch-ah databases/typhoon/files/patch-ah --- /usr/ports/databases/typhoon/files/patch-ah Thu Jan 1 09:00:00 1970 +++ databases/typhoon/files/patch-ah Sat Nov 18 02:13:04 2000 @@ -0,0 +1,11 @@ +--- src/unix.c.orig Mon May 22 01:47:40 1995 ++++ src/unix.c Sat Nov 18 02:11:18 2000 +@@ -50,7 +50,7 @@ + #include + #include + #include +-#ifdef __linux__ ++#if defined( __linux__ ) || defined( __FreeBSD__ ) + # include + # define F_TLOCK LOCK_NB + # define F_LOCK LOCK_EX >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message