upgrade to 1.7.1

drop maintainership

5 files changed, 26 insertions, 39 deletions

diff --git a/net/dictd/Makefile b/net/dictd/Makefile
index d75ffd806a50..0a6fe56430d3 100644
--- a/net/dictd/Makefile
+++ b/net/dictd/Makefile
@@ -7,16 +7,20 @@
 #
 
 PORTNAME=	dictd
-PORTVERSION=	1.5.5
-PORTREVISION=	3
+PORTVERSION=	1.7.1
+PORTREVISION=	0
 CATEGORIES=	net textproc
-MASTER_SITES=	ftp://ftp.dict.org/pub/dict/
+MASTER_SITES=	ftp://ftp.dict.org/pub/dict/ \
+		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=		dict
 
-MAINTAINER=	ijliao@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 MAN1=		dictzip.1
 MAN8=		dictd.8
 
+USE_PERL5=	yes
+USE_BISON=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc --with-cflags="${CFLAGS}" \
 		--without-local-zlib
diff --git a/net/dictd/distinfo b/net/dictd/distinfo
index c7a1b68a4638..b4e98b71e63c 100644
--- a/net/dictd/distinfo
+++ b/net/dictd/distinfo
@@ -1 +1 @@
-MD5 (dictd-1.5.5.tar.gz) = 67307b6e5d0337f354b275c377506c63
+MD5 (dictd-1.7.1.tar.gz) = 81317b86ea0a5df0163900ad2e6bb12c
diff --git a/net/dictd/files/patch-Makefile_in b/net/dictd/files/patch-Makefile_in
index c61bd3e61748..5392f867ece0 100644
--- a/net/dictd/files/patch-Makefile_in
+++ b/net/dictd/files/patch-Makefile_in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Jan 12 17:24:29 2001
-+++ Makefile.in	Thu Jan 25 23:41:14 2001
+--- Makefile.in.orig	Mon Jun 10 02:33:02 2002
++++ Makefile.in	Mon Jun 10 02:37:31 2002
 @@ -33,7 +33,7 @@
  srcdir=		@srcdir@
  VPATH=		@srcdir@
@@ -17,7 +17,7 @@
 +XTRACFLAGS=     @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. # -Iregex
  XTRALDFLAGS=    @WLDFLAGS@ @XTRALDFLAGS@
 -LDLIBS=		@LIBS@ -Lregex -lregex
-+LDLIBS=		@LIBS@ -lgnuregex # -Lregex -lregex
++LDLIBS=		@LIBS@ # -Lregex -lregex
  
  EXES=	 	dict dictd dictzip
  
@@ -59,20 +59,3 @@
  
  servparse.o: servparse.c $(HEADERS)
  	$(CC) -c $(XTRACFLAGS) $(CFLAGS) $(SCFLAGS) $<
-@@ -145,13 +137,13 @@
- 	install -m 644 dict.1 $(man1_prefix)/dict.1
- 
- install.dictzip: dictzip
--	install dictzip $(bindir)
--	install -m 644 dictzip.1 $(man1_prefix)/dictzip.1
-+	${INSTALL_PROGRAM} dictzip $(bindir)
-+	${INSTALL_DATA} dictzip.1 $(man1_prefix)/dictzip.1
- 
- install.dictd: dictd
--	install dictd $(sbindir)
-+	${INSTALL_PROGRAM} dictd $(sbindir)
- 	if test ! -d $(man8_prefix); then install -d 755 $(man8_prefix); fi
--	install -m 644 dictd.8 $(man8_prefix)/dictd.8
-+	${INSTALL_DATA} dictd.8 $(man8_prefix)/dictd.8
- 
- install: $(EXES) install.dict install.dictzip install.dictd
diff --git a/net/dictd/files/patch-dictd.c b/net/dictd/files/patch-dictd.c
index ab1b44d33fc8..f18cabb964b8 100644
--- a/net/dictd/files/patch-dictd.c
+++ b/net/dictd/files/patch-dictd.c
@@ -1,11 +1,11 @@
---- dictd.c~	Mon Jan 29 01:51:25 2001
-+++ dictd.c	Mon Jan 29 01:59:29 2001
-@@ -97,7 +97,7 @@
+--- dictd.c.orig	Mon Jun 10 02:39:20 2002
++++ dictd.c	Mon Jun 10 02:40:01 2002
+@@ -113,7 +113,7 @@
  
  static void reaper( int dummy )
  {
--#if defined(__osf__) || (defined(__sparc__) && defined(__svr4__))
-+#if defined(__FreeBSD__) || defined(__osf__) || (defined(__sparc__) && defined(__svr4__) )
+-#if defined(__osf__) || (defined(__sparc) && defined(__SVR4))
++#if defined(__FreeBSD__) || defined(__osf__) || (defined(__sparc) && defined(__SVR4))
     int        status;
  #else
     union wait status;
diff --git a/net/dictd/files/patch-dictd_8 b/net/dictd/files/patch-dictd_8
index d38157e16f4c..762442e1eaba 100644
--- a/net/dictd/files/patch-dictd_8
+++ b/net/dictd/files/patch-dictd_8
@@ -1,6 +1,6 @@
---- dictd.8.orig	Wed Jan 24 02:20:58 2001
-+++ dictd.8	Wed Jan 24 02:21:44 2001
-@@ -96,7 +96,7 @@
+--- dictd.8.orig	Mon Jun 10 02:41:34 2002
++++ dictd.8	Mon Jun 10 02:42:35 2002
+@@ -105,7 +105,7 @@
  .TP
  .BI \-c " file\fR or "  \-\-config " file"
  Specify configuration file.  The default is
@@ -9,24 +9,24 @@
  but may be changed in the
  .I dictd.h
  file at compile time (DICT_CONFIG_FILE).
-@@ -282,7 +282,7 @@
- .RE
- .SH "CONFIGURATION FILE"
+@@ -358,7 +358,7 @@
+ .TP
+ .B Introduction
  The configuration file defaults to
 -.IR /etc/dictd.conf ,
 +.IR %%PREFIX%%/etc/dictd.conf ,
  but can be specified on the command line with the
  .B \-c
  option (see above).  The configuration file has four distinct sections.
-@@ -620,9 +620,9 @@
+@@ -755,9 +755,9 @@
  There is no way to get a running server to re-read the configuration file,
  so databases cannot be added or deleted on the fly.
  .SH "FILES"
 -.I /etc/dictd.conf
 +.I %%PREFIX%%/etc/dictd.conf
  .br
--.I /usr/lib/dictd
-+.I %%PREFIX%%/lib/dictd
+-.I /usr/sbin/dictd
++.I %%PREFIX%%/sbin/dictd
  .SH "SEE ALSO"
  .BR dict (1),
  .BR dictzip (1),