Update to version 1.3.4.

6 files changed, 60 insertions, 23 deletions

diff --git a/net/zebra-server/Makefile b/net/zebra-server/Makefile
index f4a3dae3562b..5e6a98d02bf5 100644
--- a/net/zebra-server/Makefile
+++ b/net/zebra-server/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	zebra-server
-PORTVERSION=	1.3.0
+PORTVERSION=	1.3.4
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.indexdata.dk/pub/zebra/
-DISTNAME=	zebra-${PORTVERSION}
+DISTNAME=	idzebra-${PORTVERSION}
 
 MAINTAINER=	demon@FreeBSD.org
 
@@ -22,9 +22,7 @@ CONFIGURE_ARGS=	--with-yazconfig=${LOCALBASE}/bin \
 		--with-tclconfig=${LOCALBASE}/lib/tcl8.3
 CONFIGURE_ENV+=	PTHREAD_LIBS=${PTHREAD_LIBS}
 
-post-install:
-.if !defined(NOPORTDOCS)
-		@(cd ${WRKSRC}/doc; ${MAKE} install)
-.endif
+MAN1=		zebraidx.1
+MAN8=		zebrasrv.8
 
 .include <bsd.port.mk>
diff --git a/net/zebra-server/distinfo b/net/zebra-server/distinfo
index 3657776a162d..d9ddbd3a5d4a 100644
--- a/net/zebra-server/distinfo
+++ b/net/zebra-server/distinfo
@@ -1 +1 @@
-MD5 (zebra-1.3.0.tar.gz) = d6fdb07a83256b3caf5b8e2cf37d4c5f
+MD5 (idzebra-1.3.4.tar.gz) = 355650a4f5f81296598a7aaaa45bdc7d
diff --git a/net/zebra-server/files/patch-configure b/net/zebra-server/files/patch-configure
index a4fa60833a21..b993683f4a2f 100644
--- a/net/zebra-server/files/patch-configure
+++ b/net/zebra-server/files/patch-configure
@@ -1,15 +1,15 @@
---- configure.orig	Sat Aug 17 14:52:11 2002
-+++ configure	Sat Aug 17 14:53:16 2002
-@@ -697,7 +697,7 @@
+--- configure.orig	Sat Jan  4 16:33:07 2003
++++ configure	Sat Jan  4 16:33:58 2003
+@@ -705,7 +705,7 @@
  fi
  
  
--PACKAGE=zebra
+-PACKAGE=idzebra
 +PACKAGE=zebra-server
  
- VERSION=1.3.0
+ VERSION=1.3.4
  
-@@ -2005,6 +2005,7 @@
+@@ -2329,6 +2329,7 @@
  s%@DEFS@%$DEFS%g
  s%@LDFLAGS@%$LDFLAGS%g
  s%@LIBS@%$LIBS%g
diff --git a/net/zebra-server/files/patch-dfa-Makefile.in b/net/zebra-server/files/patch-dfa-Makefile.in
index 14a159381b94..58bd1d59edb6 100644
--- a/net/zebra-server/files/patch-dfa-Makefile.in
+++ b/net/zebra-server/files/patch-dfa-Makefile.in
@@ -1,11 +1,11 @@
---- dfa/Makefile.in.orig	Wed Dec 26 11:44:33 2001
-+++ dfa/Makefile.in	Wed Dec 26 11:45:00 2001
-@@ -78,7 +78,7 @@
+--- dfa/Makefile.in.orig	Sat Jan  4 16:35:12 2003
++++ dfa/Makefile.in	Sat Jan  4 16:35:30 2003
+@@ -84,7 +84,7 @@
  noinst_PROGRAMS = agrep lexer grepper
  
  INCLUDES = -I$(srcdir)/../include @YAZINC@
--LDADD = libdfa.a ../util/libutil.a @YAZLIB@ @LIBS@
-+LDADD = libdfa.a ../util/libutil.a @YAZLIB@ @LIBS@ @PTHREAD_LIBS@
+-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 --git a/net/zebra-server/files/patch-tab-Makefile.in b/net/zebra-server/files/patch-tab-Makefile.in
index 146eb1495f32..ef7329489f75 100644
--- a/net/zebra-server/files/patch-tab-Makefile.in
+++ b/net/zebra-server/files/patch-tab-Makefile.in
@@ -1,11 +1,11 @@
---- tab/Makefile.in.orig	Sun Dec 23 14:36:49 2001
-+++ tab/Makefile.in	Sun Dec 23 14:40:13 2001
-@@ -73,7 +73,7 @@
- YAZVERSION = @YAZVERSION@
+--- tab/Makefile.in.orig	Sat Jan  4 16:36:23 2003
++++ tab/Makefile.in	Sat Jan  4 16:36:52 2003
+@@ -79,7 +79,7 @@
+ ZPERL_LIBS = @ZPERL_LIBS@
  yazconfig = @yazconfig@
  
 -tabdatadir = $(pkgdatadir)/tab
 +tabdatadir = $(datadir)/@PACKAGE@/tab
+ tabdata_DATA = bib1.att dan1.att 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 = default.idx hci.flt mail.flt news.flt  numeric.chr nwi.flt refer.flt scan.chr sgml.flt soif.flt  string.chr urx.chr usmarc.flt
  
diff --git a/net/zebra-server/pkg-plist b/net/zebra-server/pkg-plist
index fdac89e6e1cb..6f0dc16f726b 100644
--- a/net/zebra-server/pkg-plist
+++ b/net/zebra-server/pkg-plist
@@ -3,6 +3,11 @@ bin/zebrasrv
 share/doc/zebra-server/zebra.html
 share/doc/zebra-server/zebra.pdf
 share/doc/zebra-server/administration.html
+share/doc/zebra-server/apps.html
+share/doc/zebra-server/example1.html
+share/doc/zebra-server/example2.html
+share/doc/zebra-server/examples.html
+share/doc/zebra-server/support.html
 share/doc/zebra-server/configuration-file.html
 share/doc/zebra-server/data-model.html
 share/doc/zebra-server/features.html
@@ -37,6 +42,40 @@ share/zebra-server/tab/soif.flt
 share/zebra-server/tab/string.chr
 share/zebra-server/tab/urx.chr
 share/zebra-server/tab/usmarc.flt
+share/zebra-server/tab/bib1.att
+share/zebra-server/tab/dan1.att
+share/zebra-server/tab/danmarc.abs
+share/zebra-server/tab/danmarc.mar
+share/zebra-server/tab/explain.abs
+share/zebra-server/tab/explain.att
+share/zebra-server/tab/explain.tag
+share/zebra-server/tab/generic.tag
+share/zebra-server/tab/gils-a.est
+share/zebra-server/tab/gils-b.est
+share/zebra-server/tab/gils-f.est
+share/zebra-server/tab/gils-g.est
+share/zebra-server/tab/gils-summary.map
+share/zebra-server/tab/gils-usmarc.map
+share/zebra-server/tab/gils-variant.est
+share/zebra-server/tab/gils.abs
+share/zebra-server/tab/gils.att
+share/zebra-server/tab/gils.tag
+share/zebra-server/tab/meta-b.est
+share/zebra-server/tab/meta-usmarc.map
+share/zebra-server/tab/meta.abs
+share/zebra-server/tab/meta.tag
+share/zebra-server/tab/summary.abs
+share/zebra-server/tab/summary.tag
+share/zebra-server/tab/tagsetg.tag
+share/zebra-server/tab/tagsetm.tag
+share/zebra-server/tab/usmarc-b.est
+share/zebra-server/tab/usmarc.abs
+share/zebra-server/tab/usmarc.mar
+share/zebra-server/tab/usmarc.tag
+share/zebra-server/tab/var1.var
+share/zebra-server/tab/wais-b.est
+share/zebra-server/tab/wais-variant.est
+share/zebra-server/tab/wais.abs
 @dirrm share/doc/zebra-server
 @dirrm share/zebra-server/tab
 @dirrm share/zebra-server