summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDima Dorfman <dd@FreeBSD.org>2002-11-23 10:11:33 +0000
committerDima Dorfman <dd@FreeBSD.org>2002-11-23 10:11:33 +0000
commitf875313d40731bb8af4732b7090fbb4e37c6db6d (patch)
tree50029d5ba4eaf27869c96be10fea1168f876f8b0
parentUpdate to 0.8.3 (diff)
Upgrade to 1.8.0. patch-servparse.y has been submitted to the
maintainers.
-rw-r--r--net/dictd/Makefile8
-rw-r--r--net/dictd/distinfo2
-rw-r--r--net/dictd/files/patch-Makefile_in2
-rw-r--r--net/dictd/files/patch-configure10
-rw-r--r--net/dictd/files/patch-libmaa::log.c11
-rw-r--r--net/dictd/files/patch-servparse.y10
6 files changed, 16 insertions, 27 deletions
diff --git a/net/dictd/Makefile b/net/dictd/Makefile
index c96901bd5253..bba218941d5e 100644
--- a/net/dictd/Makefile
+++ b/net/dictd/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= dictd
-PORTVERSION= 1.7.1
-PORTREVISION= 1
+PORTVERSION= 1.8.0
CATEGORIES+= net textproc
MASTER_SITES= ftp://ftp.dict.org/pub/dict/ \
${MASTER_SITE_SOURCEFORGE}
@@ -21,7 +20,8 @@ MAN8= dictd.8
USE_REINPLACE= yes
USE_BISON= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+CFLAGS+= -I${PREFIX}/include
CONFIGURE_ARGS= --with-etcdir=${PREFIX}/etc --with-cflags="${CFLAGS}" \
--without-local-zlib
CONFIGURE_ENV= CFLAGS="${CFLAGS}"
@@ -31,7 +31,7 @@ ALL_TARGET= dictd dictzip
INSTALL_TARGET= install.dictd install.dictzip
post-patch:
-.for i in dict.1 dictd.8
+.for i in Makefile.in dict.1 dictd.8
@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/$i
.endfor
.for i in example.conf
diff --git a/net/dictd/distinfo b/net/dictd/distinfo
index b4e98b71e63c..deb66b75ff33 100644
--- a/net/dictd/distinfo
+++ b/net/dictd/distinfo
@@ -1 +1 @@
-MD5 (dictd-1.7.1.tar.gz) = 81317b86ea0a5df0163900ad2e6bb12c
+MD5 (dictd-1.8.0.tar.gz) = ce54a5ea05429954e2f743ee0fa661b5
diff --git a/net/dictd/files/patch-Makefile_in b/net/dictd/files/patch-Makefile_in
index 5392f867ece0..370b70fd1b01 100644
--- a/net/dictd/files/patch-Makefile_in
+++ b/net/dictd/files/patch-Makefile_in
@@ -17,7 +17,7 @@
+XTRACFLAGS= @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. # -Iregex
XTRALDFLAGS= @WLDFLAGS@ @XTRALDFLAGS@
-LDLIBS= @LIBS@ -Lregex -lregex
-+LDLIBS= @LIBS@ # -Lregex -lregex
++LDLIBS= @LIBS@ -L%%PREFIX%%/lib -lltdl # -Lregex -lregex
EXES= dict dictd dictzip
diff --git a/net/dictd/files/patch-configure b/net/dictd/files/patch-configure
deleted file mode 100644
index b4ad2c195511..000000000000
--- a/net/dictd/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Thu Aug 23 01:25:28 2001
-+++ configure Thu Aug 23 01:25:46 2001
-@@ -1416,7 +1416,6 @@
- fi
- fi
-
--local_zlib=1
- if test "$local_zlib" = 0; then
- echo $ac_n "checking for zlibVersion in -lz""... $ac_c" 1>&6
- echo "configure:1423: checking for zlibVersion in -lz" >&5
diff --git a/net/dictd/files/patch-libmaa::log.c b/net/dictd/files/patch-libmaa::log.c
deleted file mode 100644
index 183882fb8abb..000000000000
--- a/net/dictd/files/patch-libmaa::log.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmaa/log.c.orig Sat Jun 22 14:12:51 2002
-+++ libmaa/log.c Sat Jun 22 14:12:56 2002
-@@ -245,7 +245,7 @@
- {
- if (logFd >= 0) close( logFd );
- if (logUserStream != stdout && logUserStream != stderr)
-- fclose( logUserStream );
-+ if (logUserStream) fclose( logUserStream );
- if (logSyslog) closelog();
- if (logFilename) xfree(logFilename);
- if (logFilenameTmp) xfree(logFilenameTmp);
diff --git a/net/dictd/files/patch-servparse.y b/net/dictd/files/patch-servparse.y
new file mode 100644
index 000000000000..0ec9bb86142e
--- /dev/null
+++ b/net/dictd/files/patch-servparse.y
@@ -0,0 +1,10 @@
+--- servparse.y~ Wed Nov 20 20:04:50 2002
++++ servparse.y Wed Nov 20 20:04:59 2002
+@@ -125,6 +125,7 @@
+ ;
+
+ Site : T_SITE T_STRING { $$ = $2; }
++ ;
+
+ UserList : T_USERNAME T_STRING T_STRING
+ { $$ = hsh_create(NULL,NULL);