Update to 0.11.1

Add appropriate LIB_DEPENDS for gdbm and gettext
Incorporate building fixes from ports/17387
Make PLIST more version-friendly

Approved by:	maintainer

4 files changed, 100 insertions, 84 deletions

diff --git a/lang/librep2/Makefile b/lang/librep2/Makefile
index 08a1aea3389..cfc331e5084 100644
--- a/lang/librep2/Makefile
+++ b/lang/librep2/Makefile
@@ -1,22 +1,27 @@
 # New ports collection makefile for:   librep
-# Version required:    0.11
+# Version required:    0.11.1
 # Date created:        13 September 1999
 # Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	librep-0.11
+DISTNAME=	librep-0.11.1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://librep.sourceforge.net/pub/librep/
 
 MAINTAINER=	nakai@FreeBSD.org
 
-PLIST_SUB=	GNUHOST=${ARCH}--freebsd${OSREL}
+LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm \
+		intl.1:${PORTSDIR}/devel/gettext
+
+VERSION=	0.11.1
+PLIST_SUB=	GNUHOST=${ARCH}--freebsd${OSREL} VERSION=${VERSION}
 
 USE_NEWGCC=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	LIBS="-lxpg4"
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lxpg4 -lintl"
 
 .include <bsd.port.mk>
diff --git a/lang/librep2/distinfo b/lang/librep2/distinfo
index 248f607c602..7b1f61f6755 100644
--- a/lang/librep2/distinfo
+++ b/lang/librep2/distinfo
@@ -1 +1 @@
-MD5 (librep-0.11.tar.gz) = 9b7b4746e25b17837f827155900b58ba
+MD5 (librep-0.11.1.tar.gz) = b281006f257f1e30331d4f12d0e271fc
diff --git a/lang/librep2/files/patch-aa b/lang/librep2/files/patch-aa
new file mode 100644
index 00000000000..accc79b70ea
--- /dev/null
+++ b/lang/librep2/files/patch-aa
@@ -0,0 +1,11 @@
+--- configure.orig	Sun Mar 12 09:41:29 2000
++++ configure	Thu Mar 23 18:17:51 2000
+@@ -2228,7 +2228,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  GDBM_LIBS="-lgdbm"
++  GDBM_LIBS="-lgdbm $LIBS"
+ 	      
+ else
+   echo "$ac_t""no" 1>&6
diff --git a/lang/librep2/pkg-plist b/lang/librep2/pkg-plist
index fff6a114b1a..b99b26aecea 100644
--- a/lang/librep2/pkg-plist
+++ b/lang/librep2/pkg-plist
@@ -9,7 +9,6 @@ include/rep_regexp.h
 include/rep_subrs.h
 @unexec install-info --delete %D/info/librep.info %D/info/dir
 info/librep.info
-@exec install-info %D/info/librep.info %D/info/dir
 info/librep.info-1
 info/librep.info-2
 info/librep.info-3
@@ -17,92 +16,93 @@ info/librep.info-4
 info/librep.info-5
 info/librep.info-6
 info/librep.info-7
+@exec install-info %D/info/librep.info %D/info/dir
 lib/librep.la
 lib/librep.so
 lib/librep.so.8
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-libexec/rep/0.11/%%GNUHOST%%/gdbm.la
-libexec/rep/0.11/%%GNUHOST%%/gdbm.so
-libexec/rep/0.11/%%GNUHOST%%/gettext.la
-libexec/rep/0.11/%%GNUHOST%%/gettext.so
-libexec/rep/0.11/%%GNUHOST%%/readline.la
-libexec/rep/0.11/%%GNUHOST%%/readline.so
-libexec/rep/0.11/%%GNUHOST%%/sdbm.la
-libexec/rep/0.11/%%GNUHOST%%/sdbm.so
-libexec/rep/0.11/%%GNUHOST%%/tables.la
-libexec/rep/0.11/%%GNUHOST%%/tables.so
-libexec/rep/0.11/%%GNUHOST%%/timers.la
-libexec/rep/0.11/%%GNUHOST%%/timers.so
+libexec/rep/%%VERSION%%/%%GNUHOST%%/gdbm.la
+libexec/rep/%%VERSION%%/%%GNUHOST%%/gdbm.so
+libexec/rep/%%VERSION%%/%%GNUHOST%%/gettext.la
+libexec/rep/%%VERSION%%/%%GNUHOST%%/gettext.so
+libexec/rep/%%VERSION%%/%%GNUHOST%%/readline.la
+libexec/rep/%%VERSION%%/%%GNUHOST%%/readline.so
+libexec/rep/%%VERSION%%/%%GNUHOST%%/sdbm.la
+libexec/rep/%%VERSION%%/%%GNUHOST%%/sdbm.so
+libexec/rep/%%VERSION%%/%%GNUHOST%%/tables.la
+libexec/rep/%%VERSION%%/%%GNUHOST%%/tables.so
+libexec/rep/%%VERSION%%/%%GNUHOST%%/timers.la
+libexec/rep/%%VERSION%%/%%GNUHOST%%/timers.so
 libexec/rep/%%GNUHOST%%/libtool
 libexec/rep/%%GNUHOST%%/rules.mk
 share/aclocal/rep.m4
-share/rep/0.11/DOC
-share/rep/0.11/lisp/autoload.jl
-share/rep/0.11/lisp/backquote.jl
-share/rep/0.11/lisp/backquote.jlc
-share/rep/0.11/lisp/bytecodes.jl
-share/rep/0.11/lisp/bytecodes.jlc
-share/rep/0.11/lisp/cgi-get.jl
-share/rep/0.11/lisp/cgi-get.jlc
-share/rep/0.11/lisp/compiler-opt.jl
-share/rep/0.11/lisp/compiler-opt.jlc
-share/rep/0.11/lisp/compiler.jl
-share/rep/0.11/lisp/compiler.jlc
-share/rep/0.11/lisp/date.jl
-share/rep/0.11/lisp/date.jlc
-share/rep/0.11/lisp/debug.jl
-share/rep/0.11/lisp/debug.jlc
-share/rep/0.11/lisp/define.jl
-share/rep/0.11/lisp/define.jlc
-share/rep/0.11/lisp/disassembler.jl
-share/rep/0.11/lisp/disassembler.jlc
-share/rep/0.11/lisp/dump.jl
-share/rep/0.11/lisp/dump.jlc
-share/rep/0.11/lisp/environ.jl
-share/rep/0.11/lisp/environ.jlc
-share/rep/0.11/lisp/gaol.jl
-share/rep/0.11/lisp/gaol.jlc
-share/rep/0.11/lisp/init.jl
-share/rep/0.11/lisp/init.jlc
-share/rep/0.11/lisp/lisp-doc.jl
-share/rep/0.11/lisp/lisp-doc.jlc
-share/rep/0.11/lisp/lisp.jl
-share/rep/0.11/lisp/lisp.jlc
-share/rep/0.11/lisp/mailaddr.jl
-share/rep/0.11/lisp/mailaddr.jlc
-share/rep/0.11/lisp/memoize.jl
-share/rep/0.11/lisp/memoize.jlc
-share/rep/0.11/lisp/mutex.jl
-share/rep/0.11/lisp/mutex.jlc
-share/rep/0.11/lisp/pwd-prompt.jl
-share/rep/0.11/lisp/pwd-prompt.jlc
-share/rep/0.11/lisp/remote-ftp.jl
-share/rep/0.11/lisp/remote-ftp.jlc
-share/rep/0.11/lisp/remote-rcp.jl
-share/rep/0.11/lisp/remote-rcp.jlc
-share/rep/0.11/lisp/remote-rep.jl
-share/rep/0.11/lisp/remote-rep.jlc
-share/rep/0.11/lisp/remote.jl
-share/rep/0.11/lisp/remote.jlc
-share/rep/0.11/lisp/rep.jl
-share/rep/0.11/lisp/rep.jlc
-share/rep/0.11/lisp/ring.jl
-share/rep/0.11/lisp/ring.jlc
-share/rep/0.11/lisp/sort.jl
-share/rep/0.11/lisp/sort.jlc
-share/rep/0.11/lisp/string-util.jl
-share/rep/0.11/lisp/string-util.jlc
-share/rep/0.11/lisp/tar-file-handler.jl
-share/rep/0.11/lisp/tar-file-handler.jlc
-share/rep/0.11/lisp/threads.jl
-share/rep/0.11/lisp/threads.jlc
-share/rep/0.11/lisp/tilde.jl
-share/rep/0.11/lisp/tilde.jlc
-@dirrm libexec/rep/0.11/%%GNUHOST%%
-@dirrm libexec/rep/0.11
+share/rep/%%VERSION%%/DOC
+share/rep/%%VERSION%%/lisp/autoload.jl
+share/rep/%%VERSION%%/lisp/backquote.jl
+share/rep/%%VERSION%%/lisp/backquote.jlc
+share/rep/%%VERSION%%/lisp/bytecodes.jl
+share/rep/%%VERSION%%/lisp/bytecodes.jlc
+share/rep/%%VERSION%%/lisp/cgi-get.jl
+share/rep/%%VERSION%%/lisp/cgi-get.jlc
+share/rep/%%VERSION%%/lisp/compiler-opt.jl
+share/rep/%%VERSION%%/lisp/compiler-opt.jlc
+share/rep/%%VERSION%%/lisp/compiler.jl
+share/rep/%%VERSION%%/lisp/compiler.jlc
+share/rep/%%VERSION%%/lisp/date.jl
+share/rep/%%VERSION%%/lisp/date.jlc
+share/rep/%%VERSION%%/lisp/debug.jl
+share/rep/%%VERSION%%/lisp/debug.jlc
+share/rep/%%VERSION%%/lisp/define.jl
+share/rep/%%VERSION%%/lisp/define.jlc
+share/rep/%%VERSION%%/lisp/disassembler.jl
+share/rep/%%VERSION%%/lisp/disassembler.jlc
+share/rep/%%VERSION%%/lisp/dump.jl
+share/rep/%%VERSION%%/lisp/dump.jlc
+share/rep/%%VERSION%%/lisp/environ.jl
+share/rep/%%VERSION%%/lisp/environ.jlc
+share/rep/%%VERSION%%/lisp/gaol.jl
+share/rep/%%VERSION%%/lisp/gaol.jlc
+share/rep/%%VERSION%%/lisp/init.jl
+share/rep/%%VERSION%%/lisp/init.jlc
+share/rep/%%VERSION%%/lisp/lisp-doc.jl
+share/rep/%%VERSION%%/lisp/lisp-doc.jlc
+share/rep/%%VERSION%%/lisp/lisp.jl
+share/rep/%%VERSION%%/lisp/lisp.jlc
+share/rep/%%VERSION%%/lisp/mailaddr.jl
+share/rep/%%VERSION%%/lisp/mailaddr.jlc
+share/rep/%%VERSION%%/lisp/memoize.jl
+share/rep/%%VERSION%%/lisp/memoize.jlc
+share/rep/%%VERSION%%/lisp/mutex.jl
+share/rep/%%VERSION%%/lisp/mutex.jlc
+share/rep/%%VERSION%%/lisp/pwd-prompt.jl
+share/rep/%%VERSION%%/lisp/pwd-prompt.jlc
+share/rep/%%VERSION%%/lisp/remote-ftp.jl
+share/rep/%%VERSION%%/lisp/remote-ftp.jlc
+share/rep/%%VERSION%%/lisp/remote-rcp.jl
+share/rep/%%VERSION%%/lisp/remote-rcp.jlc
+share/rep/%%VERSION%%/lisp/remote-rep.jl
+share/rep/%%VERSION%%/lisp/remote-rep.jlc
+share/rep/%%VERSION%%/lisp/remote.jl
+share/rep/%%VERSION%%/lisp/remote.jlc
+share/rep/%%VERSION%%/lisp/rep.jl
+share/rep/%%VERSION%%/lisp/rep.jlc
+share/rep/%%VERSION%%/lisp/ring.jl
+share/rep/%%VERSION%%/lisp/ring.jlc
+share/rep/%%VERSION%%/lisp/sort.jl
+share/rep/%%VERSION%%/lisp/sort.jlc
+share/rep/%%VERSION%%/lisp/string-util.jl
+share/rep/%%VERSION%%/lisp/string-util.jlc
+share/rep/%%VERSION%%/lisp/tar-file-handler.jl
+share/rep/%%VERSION%%/lisp/tar-file-handler.jlc
+share/rep/%%VERSION%%/lisp/threads.jl
+share/rep/%%VERSION%%/lisp/threads.jlc
+share/rep/%%VERSION%%/lisp/tilde.jl
+share/rep/%%VERSION%%/lisp/tilde.jlc
+@dirrm libexec/rep/%%VERSION%%/%%GNUHOST%%
+@dirrm libexec/rep/%%VERSION%%
 @dirrm libexec/rep/%%GNUHOST%%
 @dirrm libexec/rep
-@dirrm share/rep/0.11/lisp
-@dirrm share/rep/0.11
+@dirrm share/rep/%%VERSION%%/lisp
+@dirrm share/rep/%%VERSION%%
 @dirrm share/rep