Upgrade this port to version 1.1.

7 files changed, 58 insertions, 75 deletions

diff --git a/net/zebra-server/Makefile b/net/zebra-server/Makefile
index 6f6a3677d04e..b5cc4e2dcd04 100644
--- a/net/zebra-server/Makefile
+++ b/net/zebra-server/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:	zebra-server
-# Date created:		14 Nov 2000
-# Whom:			Dmitry Sivachenko <demon@FreeBSD.org>
+# Date created:				14 Nov 2000
+# Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	zebra-server
-PORTVERSION=	1.0.1
+PORTVERSION=	1.1
 CATEGORIES=	net
-MASTER_SITES=	http://ftp.indexdata.dk/pub/yaz/
+MASTER_SITES=	http://ftp.indexdata.dk/pub/zebra/
 DISTNAME=	zebra-${PORTVERSION:S/0./0pl/}
 
 MAINTAINER=	demon@FreeBSD.org
@@ -19,4 +19,9 @@ RUN_DEPENDS=	${LOCALBASE}/bin/yaz-config:${PORTSDIR}/net/yaz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-yazconfig=${LOCALBASE}/bin
 
+post-install:
+.if !defined(NOPORTDOCS)
+		@(cd ${WRKSRC}/doc; ${MAKE} install)
+.endif
+
 .include <bsd.port.mk>
diff --git a/net/zebra-server/distinfo b/net/zebra-server/distinfo
index e16c9609e86d..d728a555f5ce 100644
--- a/net/zebra-server/distinfo
+++ b/net/zebra-server/distinfo
@@ -1 +1 @@
-MD5 (zebra-1.0pl1.tar.gz) = b09e0e90179df4e44ac02e8303568664
+MD5 (zebra-1.1.tar.gz) = 15bb6efecc81fb92fb387a682b35ed82
diff --git a/net/zebra-server/files/patch-ab b/net/zebra-server/files/patch-ab
deleted file mode 100644
index 0a667611988e..000000000000
--- a/net/zebra-server/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	Wed Sep 20 13:24:26 2000
-+++ Makefile.in	Wed Sep 20 13:25:10 2000
-@@ -37,8 +37,8 @@
- INCDIR=$(prefix)/include
- #  Misc tables, etc.
- ZEBRADIR=$(prefix)/lib/@PROGPREFIX@
--ZEBRATAB=$(prefix)/lib/@PROGPREFIX@/tab
--ZEBRADOC=$(prefix)/lib/@PROGPREFIX@/doc
-+ZEBRATAB=$(prefix)/share/zebra-server/tab
-+ZEBRADOC=$(prefix)/share/doc/zebra-server
- 
- SUBDIR=@SUBDIR@
- 
diff --git a/net/zebra-server/files/patch-configure b/net/zebra-server/files/patch-configure
new file mode 100644
index 000000000000..8ca2c62236ee
--- /dev/null
+++ b/net/zebra-server/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Sun Dec 23 14:38:47 2001
++++ configure	Sun Dec 23 14:39:02 2001
+@@ -794,7 +794,7 @@
+ EOF
+ 
+ 	
+-PACKAGE=zebra
++PACKAGE=zebra-server
+ 
+ VERSION=1.1
+ 
diff --git a/net/zebra-server/files/patch-doc-Makefile.in b/net/zebra-server/files/patch-doc-Makefile.in
new file mode 100644
index 000000000000..5b44d9c801f6
--- /dev/null
+++ b/net/zebra-server/files/patch-doc-Makefile.in
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig	Sun Dec 23 14:33:05 2001
++++ doc/Makefile.in	Sun Dec 23 14:34:23 2001
+@@ -73,7 +73,7 @@
+ YAZVERSION = @YAZVERSION@
+ yazconfig = @yazconfig@
+ 
+-docdir = $(pkgdatadir)/doc
++docdir = $(datadir)/doc/@PACKAGE@
+ 
+ doc_DATA = zebra.sgml gils.sgml zebra.txt zebra.ps zebra.html  zebra-1.html zebra-2.html zebra-3.html zebra-4.html zebra-5.html  zebra-6.html zebra-7.html zebra-8.html zebra-9.html
+ 
diff --git a/net/zebra-server/files/patch-tab-Makefile.in b/net/zebra-server/files/patch-tab-Makefile.in
new file mode 100644
index 000000000000..146eb1495f32
--- /dev/null
+++ b/net/zebra-server/files/patch-tab-Makefile.in
@@ -0,0 +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@
+ yazconfig = @yazconfig@
+ 
+-tabdatadir = $(pkgdatadir)/tab
++tabdatadir = $(datadir)/@PACKAGE@/tab
+ 
+ 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 9de24941c627..b11c0d08aadc 100644
--- a/net/zebra-server/pkg-plist
+++ b/net/zebra-server/pkg-plist
@@ -1,62 +1,6 @@
 bin/zebraidx
 bin/zebrasrv
-share/zebra-server/tab/bib1.att
-share/zebra-server/tab/dan1.att
-share/zebra-server/tab/danmarc.abs
-share/zebra-server/tab/default.idx
-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/hci.flt
-share/zebra-server/tab/mail.flt
-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/news.flt
-share/zebra-server/tab/numeric.chr
-share/zebra-server/tab/nwi.flt
-share/zebra-server/tab/refer.flt
-share/zebra-server/tab/scan.chr
-share/zebra-server/tab/sgml.flt
-share/zebra-server/tab/soif.flt
-share/zebra-server/tab/string.chr
-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/urx.chr
-share/zebra-server/tab/usmarc-b.est
-share/zebra-server/tab/usmarc.abs
-share/zebra-server/tab/usmarc.flt
-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
-share/doc/zebra-server/Makefile
-share/doc/zebra-server/README
-share/doc/zebra-server/gils-1.html
-share/doc/zebra-server/gils-2.html
-share/doc/zebra-server/gils-3.html
-share/doc/zebra-server/gils-4.html
-share/doc/zebra-server/gils-5.html
-share/doc/zebra-server/gils-6.html
-share/doc/zebra-server/gils.html
 share/doc/zebra-server/gils.sgml
-share/doc/zebra-server/gils.txt
 share/doc/zebra-server/zebra-1.html
 share/doc/zebra-server/zebra-2.html
 share/doc/zebra-server/zebra-3.html
@@ -67,8 +11,22 @@ share/doc/zebra-server/zebra-7.html
 share/doc/zebra-server/zebra-8.html
 share/doc/zebra-server/zebra-9.html
 share/doc/zebra-server/zebra.html
+share/doc/zebra-server/zebra.ps
 share/doc/zebra-server/zebra.sgml
 share/doc/zebra-server/zebra.txt
+share/zebra-server/tab/default.idx
+share/zebra-server/tab/hci.flt
+share/zebra-server/tab/mail.flt
+share/zebra-server/tab/news.flt
+share/zebra-server/tab/numeric.chr
+share/zebra-server/tab/nwi.flt
+share/zebra-server/tab/refer.flt
+share/zebra-server/tab/scan.chr
+share/zebra-server/tab/sgml.flt
+share/zebra-server/tab/soif.flt
+share/zebra-server/tab/string.chr
+share/zebra-server/tab/urx.chr
+share/zebra-server/tab/usmarc.flt
+@dirrm share/doc/zebra-server
 @dirrm share/zebra-server/tab
 @dirrm share/zebra-server
-@dirrm share/doc/zebra-server