Date: Wed, 28 Feb 2007 13:31:09 -0800 (PST) From: "Eric P. Scott" <eps+pbug0702@ana.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/109697: net/zebra-server: attempt to unbreak; upgrade to 1.3.48 Message-ID: <200702282131.l1SLV9w9016923@anna.ana.com> Resent-Message-ID: <200702282130.l1SLU5Yu048061@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 109697 >Category: ports >Synopsis: net/zebra-server: attempt to unbreak; upgrade to 1.3.48 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Feb 28 21:30:05 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Eric P. Scott >Release: FreeBSD 6.2-RELEASE i386 >Organization: ana-systems, Inc. >Environment: System: FreeBSD sixofone 6.2-RELEASE FreeBSD 6.2-RELEASE #0: Fri Jan 12 10:40:27 UTC 2007 root@dessler.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: zebra-server-1.3.24 had build errors on sparc64; a lot has changed in the upstream source since then. N.B. I've only built this on i386, where it does compile (albeit with a few warnings) and passes all its "make check" tests. >How-To-Repeat: >Fix: diff -ruN /usr/ports/net/zebra-server/Makefile net/zebra-server/Makefile --- /usr/ports/net/zebra-server/Makefile Sat Feb 10 17:23:32 2007 +++ net/zebra-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME= zebra-server -PORTVERSION= 1.3.24 +PORTVERSION= 1.3.48 CATEGORIES= net MASTER_SITES= http://ftp.indexdata.dk/pub/zebra/ DISTNAME= idzebra-${PORTVERSION} @@ -14,21 +14,24 @@ MAINTAINER= demon@FreeBSD.org COMMENT= Z39.50/SR server software -BUILD_DEPENDS= ${LOCALBASE}/bin/tclsh8.4:${PORTSDIR}/lang/tcl84 -LIB_DEPENDS= yaz.2:${PORTSDIR}/net/yaz -RUN_DEPENDS= ${LOCALBASE}/bin/tclsh8.4:${PORTSDIR}/lang/tcl84 - -BROKEN= Does not compile -DEPRECATED= ${BROKEN} -EXPIRATION_DATE=2007-04-10 +LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ + yaz.2:${PORTSDIR}/net/yaz GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-yaz=${LOCALBASE}/bin \ - --with-tclconfig=${LOCALBASE}/lib/tcl8.4 \ +CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \ + --with-yaz=${LOCALBASE}/bin \ + --with-tclconfig=${TCL_LIBDIR} \ --with-iconv=${LOCALBASE} --with-expat=${LOCALBASE} -CONFIGURE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS} -MAN1= zebraidx.1 -MAN8= zebrasrv.8 +USE_ICONV= yes +USE_TCL_BUILD= 84 +USE_TCL= 84 + +MAN1= zebraidx-1.3.1 +MAN8= zebrasrv-1.3.8 +MLINKS= zebraidx-1.3.1 zebraidx.1 \ + zebrasrv-1.3.8 zebrasrv.8 + +PORTSCOUT= limit:^1\. .include <bsd.port.mk> diff -ruN /usr/ports/net/zebra-server/distinfo net/zebra-server/distinfo --- /usr/ports/net/zebra-server/distinfo Sun Jan 22 13:24:05 2006 +++ net/zebra-server/distinfo Fri Dec 22 10:56:13 2006 @@ -1,3 +1,3 @@ -MD5 (idzebra-1.3.24.tar.gz) = a3316d5e5bc83bc925d56b4aefa49ae8 -SHA256 (idzebra-1.3.24.tar.gz) = 731d36281e9a6927495898ba1eabc74a81a8b90350cd4705b14579521eb31b73 -SIZE (idzebra-1.3.24.tar.gz) = 1044122 +MD5 (idzebra-1.3.48.tar.gz) = 59ce8c61d587b4d8f576fb589cf77eee +SHA256 (idzebra-1.3.48.tar.gz) = cc0e22126482c91969b2a4e495b2f989ff82ddd7507b3c23944c7f87222f9686 +SIZE (idzebra-1.3.48.tar.gz) = 1282679 diff -ruN /usr/ports/net/zebra-server/files/patch-configure net/zebra-server/files/patch-configure --- /usr/ports/net/zebra-server/files/patch-configure Thu Aug 19 04:28:34 2004 +++ net/zebra-server/files/patch-configure Wed Dec 31 16:00:00 1969 @@ -1,10 +0,0 @@ ---- configure.orig Tue Aug 17 11:00:14 2004 -+++ configure Thu Aug 19 15:15:49 2004 -@@ -6262,6 +6262,7 @@ - s,@ECHO_N@,$ECHO_N,;t t - s,@ECHO_T@,$ECHO_T,;t t - s,@LIBS@,$LIBS,;t t -+s%@PTHREAD_LIBS@%$PTHREAD_LIBS%g - s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t - s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t - s,@INSTALL_DATA@,$INSTALL_DATA,;t t diff -ruN /usr/ports/net/zebra-server/files/patch-dfa-Makefile.in net/zebra-server/files/patch-dfa-Makefile.in --- /usr/ports/net/zebra-server/files/patch-dfa-Makefile.in Thu Aug 19 04:28:34 2004 +++ net/zebra-server/files/patch-dfa-Makefile.in Wed Dec 31 16:00:00 1969 @@ -1,11 +0,0 @@ ---- dfa/Makefile.in.orig Tue Aug 17 11:00:25 2004 -+++ dfa/Makefile.in Thu Aug 19 15:16:58 2004 -@@ -91,7 +91,7 @@ - noinst_PROGRAMS = agrep lexer grepper - - AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) --LDADD = libdfa.a ../util/libutil.a $(YAZLIB) $(TCL_LIB) -+LDADD = libdfa.a ../util/libutil.a $(YAZLIB) $(TCL_LIB) @PTHREAD_LIBS@ - - agrep_SOURCES = agrep.c - diff -ruN /usr/ports/net/zebra-server/files/patch-dict-Makefile.in net/zebra-server/files/patch-dict-Makefile.in --- /usr/ports/net/zebra-server/files/patch-dict-Makefile.in Sat Aug 17 04:41:43 2002 +++ net/zebra-server/files/patch-dict-Makefile.in Wed Dec 31 16:00:00 1969 @@ -1,11 +0,0 @@ ---- dict/Makefile.in.orig Sat Aug 17 14:58:12 2002 -+++ dict/Makefile.in Sat Aug 17 14:58:39 2002 -@@ -113,7 +113,7 @@ - CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) @PTHREAD_LIBS@ -o $@ - DIST_COMMON = Makefile.am Makefile.in - - diff -ruN /usr/ports/net/zebra-server/files/patch-tab-Makefile.in net/zebra-server/files/patch-tab-Makefile.in --- /usr/ports/net/zebra-server/files/patch-tab-Makefile.in Thu Aug 19 04:28:34 2004 +++ net/zebra-server/files/patch-tab-Makefile.in @@ -1,11 +1,11 @@ ---- tab/Makefile.in.orig Thu Aug 19 15:18:29 2004 -+++ tab/Makefile.in Thu Aug 19 15:18:37 2004 -@@ -86,7 +86,7 @@ - ZPERL_LIBS = @ZPERL_LIBS@ +--- tab/Makefile.in.orig Fri Dec 22 10:43:49 2006 ++++ tab/Makefile.in +@@ -147,7 +147,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ yazconfig = @yazconfig@ - -tabdatadir = $(pkgdatadir)/tab +tabdatadir = $(datadir)/@PACKAGE@/tab - tabdata_DATA = bib1.att dan1.att danbib.abs danmarc.abs danmarc.mar default.idx explain.abs explain.att explain.tag generic.tag gils.abs gils-a.est gils.att gils-b.est gils-f.est gils-g.est gils-summary.map gils.tag gils-usmarc.map gils-variant.est hci.flt mail.flt meta.abs meta-b.est meta.tag meta-usmarc.map news.flt numeric.chr nwi.flt refer.flt scan.chr sgml.flt soif.flt string.chr summary.abs summary.tag tagsetg.tag tagsetm.tag urx.chr usmarc.abs usmarc-b.est usmarc.flt usmarc.mar usmarc.tag var1.var wais.abs wais-b.est wais-variant.est - - + tabdata_DATA = bib1.att dan1.att danbib.abs danmarc.abs danmarc.mar \ + default.idx explain.abs explain.att explain.tag generic.tag gils.abs \ + gils-a.est gils.att gils-b.est gils-f.est gils-g.est gils-summary.map \ diff -ruN /usr/ports/net/zebra-server/files/patch-util-Makefile.in net/zebra-server/files/patch-util-Makefile.in --- /usr/ports/net/zebra-server/files/patch-util-Makefile.in Wed Dec 26 00:48:01 2001 +++ net/zebra-server/files/patch-util-Makefile.in Wed Dec 31 16:00:00 1969 @@ -1,11 +0,0 @@ ---- util/Makefile.in.orig Wed Dec 26 11:42:17 2001 -+++ util/Makefile.in Wed Dec 26 11:42:51 2001 -@@ -108,7 +108,7 @@ - CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) @PTHREAD_LIBS@ -o $@ - DIST_COMMON = Makefile.am Makefile.in - - diff -ruN /usr/ports/net/zebra-server/pkg-plist net/zebra-server/pkg-plist --- /usr/ports/net/zebra-server/pkg-plist Thu Aug 19 04:28:34 2004 +++ net/zebra-server/pkg-plist @@ -1,6 +1,7 @@ bin/zebraidx -bin/zebrash +bin/zebraidx-1.3 bin/zebrasrv +bin/zebrasrv-1.3 include/zebraapi.h include/zebraver.h share/doc/idzebra/zebra.html @@ -66,6 +67,7 @@ share/idzebra/tab/gils.abs share/idzebra/tab/gils.att share/idzebra/tab/gils.tag +share/idzebra/tab/marc21.abs share/idzebra/tab/meta-b.est share/idzebra/tab/meta-usmarc.map share/idzebra/tab/meta.abs >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200702282131.l1SLV9w9016923>