- Update to 0.17.4

8 files changed, 44 insertions, 61 deletions

diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index 0b3a771cde87..efbf0468289e 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -6,10 +6,9 @@
 #    $MCom: ports/lang/librep/Makefile,v 1.2 2006/09/10 00:51:12 mezz Exp $
 
 PORTNAME=	librep
-PORTVERSION=	0.17
-PORTREVISION=	2
+PORTVERSION=	0.17.4
 CATEGORIES=	lang elisp gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	librep
 
 MAINTAINER=	anray@FreeBSD.org
@@ -17,12 +16,14 @@ COMMENT=	An Emacs Lisp like runtime library
 
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm \
     		gmp.8:${PORTSDIR}/math/libgmp4
+RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
 
 PLIST_SUB=	GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//} VERSION=${PORTVERSION}
 
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS}"
@@ -37,11 +38,4 @@ INFO=		librep
 BROKEN=		Does not build on ia64
 .endif
 
-post-extract:
-	@${RM} ${WRKSRC}/test
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
-	    	${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
diff --git a/lang/librep/distinfo b/lang/librep/distinfo
index 4579845beeef..5e292822e63b 100644
--- a/lang/librep/distinfo
+++ b/lang/librep/distinfo
@@ -1,3 +1,3 @@
-MD5 (librep-0.17.tar.gz) = ad4ad851ff9f82a5d61024cd96bc2998
-SHA256 (librep-0.17.tar.gz) = 3cc4d923e4eaee00adb696dbeb0144847e7cc03475962bfeb4add4cbbe271a3e
-SIZE (librep-0.17.tar.gz) = 1195890
+MD5 (librep-0.17.4.tar.bz2) = 67bbe3f9c2970ac46c6e7cecc4d68fc6
+SHA256 (librep-0.17.4.tar.bz2) = 69f1039450ac76efcf1626a4715eef69edf54b2f5872d7ea8e15fe79d6659b77
+SIZE (librep-0.17.4.tar.bz2) = 827374
diff --git a/lang/librep/files/patch-Makedefs.in b/lang/librep/files/patch-Makedefs.in
deleted file mode 100644
index 0ec2e41be0c5..000000000000
--- a/lang/librep/files/patch-Makedefs.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makedefs.in.orig	Sun Nov 18 06:38:13 2001
-+++ Makedefs.in	Thu Jul 10 17:32:25 2003
-@@ -66,7 +66,7 @@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
- INSTALL_SCRIPT=@INSTALL_SCRIPT@
- 
--MAKEINFO = makeinfo
-+MAKEINFO = makeinfo --no-split
- MAKEINFOFLAGS =
- TEXI2DVI = texi2dvi
- TEXI2PDF = texi2pdf
diff --git a/lang/librep/files/patch-Makefile.in b/lang/librep/files/patch-Makefile.in
new file mode 100644
index 000000000000..44dd786ac14f
--- /dev/null
+++ b/lang/librep/files/patch-Makefile.in
@@ -0,0 +1,12 @@
+--- Makefile.in.orig	2009-03-28 23:00:23.000000000 +0200
++++ Makefile.in	2009-03-28 23:00:39.000000000 +0200
+@@ -54,8 +54,7 @@
+ 	$(INSTALL_DATA) rules.mk $(DESTDIR)$(repcommonexecdir)
+ 	$(INSTALL_SCRIPT) install-aliases $(DESTDIR)$(repcommonexecdir)
+ 	$(INSTALL_DATA) rep-debugger.el $(DESTDIR)$(emacssitelispdir)
+-	mkdir -p $(DESTDIR)$(libdir)/pkgconfig
+-	$(INSTALL_DATA) $(top_srcdir)/librep.pc $(DESTDIR)$(libdir)/pkgconfig/
++	$(INSTALL_DATA) $(top_srcdir)/librep.pc $(DESTDIR)$(PREFIX)/libdata/pkgconfig/
+ 
+ installdirs : mkinstalldirs
+ 	$(SHELL) $< $(DESTDIR)$(repdir)/$(version) \
diff --git a/lang/librep/files/patch-aa b/lang/librep/files/patch-aa
deleted file mode 100644
index ab8a7a74c937..000000000000
--- a/lang/librep/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	Mon Nov 24 22:46:51 2003
-+++ configure	Sat Jun 30 01:24:06 2007
-@@ -6567,6 +6567,7 @@ if test -z "$aix_libpath"; then aix_libp
-       hardcode_libdir_flag_spec='-R$libdir'
-       hardcode_direct=yes
-       hardcode_shlibpath_var=no
-+      archive_cmds_need_lc=no
-       ;;
- 
-     hpux9*)
-@@ -19768,7 +19769,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_gdbm_gdbm_open" >&5
- echo "${ECHO_T}$ac_cv_lib_gdbm_gdbm_open" >&6
- if test $ac_cv_lib_gdbm_gdbm_open = yes; then
--  GDBM_LIBS="-lgdbm"
-+  GDBM_LIBS="$LIBS -lgdbm"
- else
-   { { echo "$as_me:$LINENO: error: Cannot find GDBM library" >&5
- echo "$as_me: error: Cannot find GDBM library" >&2;}
diff --git a/lang/librep/files/patch-ab b/lang/librep/files/patch-ab
deleted file mode 100644
index ba6ac1b1a990..000000000000
--- a/lang/librep/files/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/numbers.c	2000/07/25 10:40:48	1.1
-+++ src/numbers.c	2000/07/25 10:42:00
-@@ -80,6 +80,11 @@
- # endif
- #endif
- 
-+#ifdef __FreeBSD__
-+#  define LONG_LONG_MIN LONG_MIN
-+#  define LONG_LONG_MAX LONG_MAX
-+#endif
-+
- typedef struct {
-     repv car;
- #ifdef HAVE_GMP
diff --git a/lang/librep/files/patch-configure b/lang/librep/files/patch-configure
new file mode 100644
index 000000000000..ffb1442ebf6e
--- /dev/null
+++ b/lang/librep/files/patch-configure
@@ -0,0 +1,19 @@
+--- configure.orig	2009-03-05 08:56:57.000000000 +0200
++++ configure	2009-03-28 22:35:34.000000000 +0200
+@@ -8030,6 +8030,7 @@
+       hardcode_libdir_flag_spec='-R$libdir'
+       hardcode_direct=yes
+       hardcode_shlibpath_var=no
++      archive_cmds_need_lc=no
+       ;;
+ 
+     hpux9*)
+@@ -13558,7 +13559,7 @@
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gdbm_gdbm_open" >&5
+ $as_echo "$ac_cv_lib_gdbm_gdbm_open" >&6; }
+ if test "x$ac_cv_lib_gdbm_gdbm_open" = x""yes; then
+-  GDBM_LIBS="-lgdbm"
++  GDBM_LIBS="$LIBS -lgdbm"
+ else
+   { { $as_echo "$as_me:$LINENO: error: Cannot find GDBM library" >&5
+ $as_echo "$as_me: error: Cannot find GDBM library" >&2;}
diff --git a/lang/librep/pkg-plist b/lang/librep/pkg-plist
index 2314d9946016..c136f4c2d5f8 100644
--- a/lang/librep/pkg-plist
+++ b/lang/librep/pkg-plist
@@ -8,6 +8,7 @@ include/rep_gh.h
 include/rep_lisp.h
 include/rep_regexp.h
 include/rep_subrs.h
+lib/librep.a
 lib/librep.la
 lib/librep.so
 lib/librep.so.13
@@ -51,6 +52,7 @@ libexec/rep/%%GNUHOST%%/install-aliases
 libexec/rep/%%GNUHOST%%/libtool
 libexec/rep/%%GNUHOST%%/rep_config.h
 libexec/rep/%%GNUHOST%%/rules.mk
+libdata/pkgconfig/librep.pc
 share/aclocal/rep.m4
 share/emacs/site-lisp/rep-debugger.el
 share/rep/%%VERSION%%/lisp/cgi-get.jl
@@ -282,9 +284,9 @@ share/rep/%%VERSION%%/lisp/unscheme/syntax.jlc
 @dirrm share/rep/%%VERSION%%/lisp
 @dirrm share/rep/%%VERSION%%
 @dirrm share/rep
-@dirrm share/emacs/site-lisp
-@dirrm share/emacs
-@dirrm libexec/rep/%%GNUHOST%%
+@dirrmtry share/emacs/site-lisp
+@dirrmtry share/emacs
+@dirrmtry libexec/rep/%%GNUHOST%%
 @dirrm libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/vm
 @dirrm libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/util
 @dirrm libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/lang
@@ -295,4 +297,4 @@ share/rep/%%VERSION%%/lisp/unscheme/syntax.jlc
 @dirrm libexec/rep/%%VERSION%%/%%GNUHOST%%/rep
 @dirrm libexec/rep/%%VERSION%%/%%GNUHOST%%
 @dirrm libexec/rep/%%VERSION%%
-@dirrm libexec/rep
+@dirrmtry libexec/rep