5 files changed, 15 insertions, 54 deletions

diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 12acf345261a..6f385048c3af 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	guile
 PORTVERSION=	1.8.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang scheme
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	guile
@@ -18,13 +18,13 @@ LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
 
 CONFLICTS_INSTALL=	guile2-[0-9]*
 
-USE_AUTOTOOLS=	autoconf libltdl
-USES=		gmake makeinfo ncurses
-GNU_CONFIGURE=	yes
+USES=		gmake libtool makeinfo ncurses pathfix
+USE_AUTOTOOLS=	autoheader libltdl
 USE_LDCONFIG=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib
-CPPFLAGS+=	-I${LOCALBASE}/include
+GNU_CONFIGURE=	yes
 CFLAGS+=	-fwrapv
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 PLIST_SUB=	GUILE_VER=${PORTVERSION:R}
@@ -48,6 +48,7 @@ post-extract:
 post-patch:
 	@cd ${WRKSRC} ; \
 	  ${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' ${REINPLACE_FILES}
-	@${REINPLACE_CMD} -e 's|2.63|%%AUTOCONF_VERSION%%|g' ${WRKSRC}/aclocal.m4
+	@${REINPLACE_CMD} -e 's|2.68|${AUTOCONF_VERSION}|g' ${WRKSRC}/aclocal.m4
+	@${TOUCH} ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/lang/guile/files/patch-Makefile.am b/lang/guile/files/patch-Makefile.am
deleted file mode 100644
index d51d1d8a82c9..000000000000
--- a/lang/guile/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig   2008-12-08 10:42:52.000000000 -0700
-+++ Makefile.am        2009-02-22 15:46:17.000000000 -0700
-@@ -40,7 +40,7 @@
- 
- DISTCLEANFILES = check-guile.log
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = guile-1.8.pc
- 
- # Makefile.am ends here
diff --git a/lang/guile/files/patch-Makefile.in b/lang/guile/files/patch-Makefile.in
deleted file mode 100644
index c0732bae6f64..000000000000
--- a/lang/guile/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2008-07-09 15:28:14.000000000 +0800
-+++ Makefile.in	2008-07-09 15:29:13.000000000 +0800
-@@ -318,7 +318,7 @@
- TESTS = check-guile
- ACLOCAL_AMFLAGS = -I guile-config
- DISTCLEANFILES = check-guile.log
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = guile-1.8.pc
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/lang/guile/files/patch-config.h.in b/lang/guile/files/patch-config.h.in
deleted file mode 100644
index 13db93fae797..000000000000
--- a/lang/guile/files/patch-config.h.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- config.h.in	2008-02-16 16:12:15.000000000 -0600
-+++ config.h.in	2008-02-27 10:33:27.327021569 -0600
-@@ -432,9 +432,15 @@
- /* Define to 1 if you have the `pthread_get_stackaddr_np' function. */
- #undef HAVE_PTHREAD_GET_STACKADDR_NP
- 
-+/* Define to 1 if you have the `pthread_attr_get_np' function. */
-+#undef HAVE_PTHREAD_ATTR_GET_NP
-+
- /* Define to 1 if you have the <pthread.h> header file. */
- #undef HAVE_PTHREAD_H
- 
-+/* Define to 1 if you have the <pthread_np.h> header file. */
-+#undef HAVE_PTHREAD_NP_H
-+
- /* Define to 1 if you have the `pthread_sigmask' function. */
- #undef HAVE_PTHREAD_SIGMASK
- 
diff --git a/lang/guile/pkg-plist b/lang/guile/pkg-plist
index 35491a8848ca..9115e06efbc4 100644
--- a/lang/guile/pkg-plist
+++ b/lang/guile/pkg-plist
@@ -111,29 +111,29 @@ include/libguile/version.h
 include/libguile/vports.h
 include/libguile/weaks.h
 lib/libguile-srfi-srfi-1-v-3.a
-lib/libguile-srfi-srfi-1-v-3.la
 lib/libguile-srfi-srfi-1-v-3.so
 lib/libguile-srfi-srfi-1-v-3.so.3
+lib/libguile-srfi-srfi-1-v-3.so.3.0.2
 lib/libguile-srfi-srfi-13-14-v-3.a
-lib/libguile-srfi-srfi-13-14-v-3.la
 lib/libguile-srfi-srfi-13-14-v-3.so
 lib/libguile-srfi-srfi-13-14-v-3.so.3
+lib/libguile-srfi-srfi-13-14-v-3.so.3.0.1
 lib/libguile-srfi-srfi-4-v-3.a
-lib/libguile-srfi-srfi-4-v-3.la
 lib/libguile-srfi-srfi-4-v-3.so
 lib/libguile-srfi-srfi-4-v-3.so.3
+lib/libguile-srfi-srfi-4-v-3.so.3.0.1
 lib/libguile-srfi-srfi-60-v-2.a
-lib/libguile-srfi-srfi-60-v-2.la
 lib/libguile-srfi-srfi-60-v-2.so
 lib/libguile-srfi-srfi-60-v-2.so.2
+lib/libguile-srfi-srfi-60-v-2.so.2.0.2
 lib/libguile.a
-lib/libguile.la
 lib/libguile.so
-lib/libguile.so.21
+lib/libguile.so.17
+lib/libguile.so.17.4.0
 lib/libguilereadline-v-17.a
-lib/libguilereadline-v-17.la
 lib/libguilereadline-v-17.so
 lib/libguilereadline-v-17.so.17
+lib/libguilereadline-v-17.so.17.0.3
 libdata/pkgconfig/guile-1.8.pc
 man/man1/guile.1.gz
 share/aclocal/guile.m4