upgrade to 1.4.1

5 files changed, 20 insertions, 28 deletions

diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 13d82783976f..e367fa7555a0 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	guile
-PORTVERSION=	1.4
+PORTVERSION=	1.4.1
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_GNU} \
-		ftp://ftp.guile.org/pub/
+MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	guile
 
 MAINTAINER=	ports@FreeBSD.org
@@ -21,4 +20,9 @@ CONFIGURE_ARGS=	--with-threads
 
 PLIST_SUB=	GUILE_VER=${PORTVERSION}
 
+post-patch:
+	@(cd ${WRKSRC} ; \
+	  ${FIND} * -name "*.c" | ${XARGS} ${REINPLACE_CMD} -e \
+		"s|<malloc.h>|<stdlib.h>|g")
+
 .include <bsd.port.mk>
diff --git a/lang/guile/distinfo b/lang/guile/distinfo
index c4df578f339c..065c94c9e5be 100644
--- a/lang/guile/distinfo
+++ b/lang/guile/distinfo
@@ -1 +1 @@
-MD5 (guile-1.4.tar.gz) = 60430592385b96319ea3eb4cba88062c
+MD5 (guile-1.4.1.tar.gz) = 605c1c721dea908131c77a708b471e23
diff --git a/lang/guile/files/patch-af b/lang/guile/files/patch-af
deleted file mode 100644
index 695ea7033527..000000000000
--- a/lang/guile/files/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.orig	Tue Nov 30 23:44:24 1999
-+++ configure	Tue Nov 30 23:56:23 1999
-@@ -5264,10 +5264,10 @@
-       *) # Relative path.
-         ac_sub_cache_file="$ac_dots$cache_file" ;;
-       esac
--  case "$ac_given_INSTALL" in
--        [/$]*) INSTALL="$ac_given_INSTALL" ;;
--        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--        esac
-+#  case "$ac_given_INSTALL" in
-+#        [/$]*) INSTALL="$ac_given_INSTALL" ;;
-+#        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-+#        esac
- 
-       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-       # The eval makes quoting arguments work.
diff --git a/lang/guile/pkg-descr b/lang/guile/pkg-descr
index 4925fe4c1904..5c2cc6974146 100644
--- a/lang/guile/pkg-descr
+++ b/lang/guile/pkg-descr
@@ -4,3 +4,5 @@ convenient facilities. It's designed so that you can link it
 into an application or utility to make it extensible.  Our
 plan is to link this library into all GNU programs that call for 
 extensibility.
+
+WWW: http://www.gnu.org/software/guile/
diff --git a/lang/guile/pkg-plist b/lang/guile/pkg-plist
index c83a1cf88f5d..f9a1cadacc8f 100644
--- a/lang/guile/pkg-plist
+++ b/lang/guile/pkg-plist
@@ -1,9 +1,6 @@
 bin/guile
 bin/guile-config
-bin/guile-doc-snarf
-bin/guile-func-name-check
 bin/guile-snarf
-bin/guile-snarf.awk
 include/guile-readline/readline.h
 include/guile/gh.h
 include/libguile.h
@@ -91,20 +88,26 @@ include/libguile/vectors.h
 include/libguile/version.h
 include/libguile/vports.h
 include/libguile/weaks.h
-@unexec install-info --delete %D/info/data-rep.info %D/info/dir
-info/data-rep.info
-@exec install-info %D/info/data-rep.info %D/info/dir
+@unexec install-info --delete %D/info/guile.info %D/info/dir
+info/guile.info
+info/guile.info-1
+info/guile.info-2
+@exec install-info %D/info/guile.info %D/info/dir
 lib/libguile.a
+lib/libguile.la
 lib/libguile.so
-lib/libguile.so.9
+lib/libguile.so.10
 lib/libguilereadline.a
+lib/libguilereadline.la
 lib/libguilereadline.so
 lib/libguilereadline.so.0
 lib/libqthreads.a
+lib/libqthreads.la
 lib/libqthreads.so
 lib/libqthreads.so.0
 share/aclocal/guile.m4
 share/guile/%%GUILE_VER%%/ice-9/and-let*.scm
+share/guile/%%GUILE_VER%%/ice-9/and-let-star.scm
 share/guile/%%GUILE_VER%%/ice-9/arrays.scm
 share/guile/%%GUILE_VER%%/ice-9/boot-9.scm
 share/guile/%%GUILE_VER%%/ice-9/calling.scm