6 files changed, 12 insertions, 23 deletions
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 812f388df7bf..f2db99314844 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -11,11 +11,10 @@ MASTER_SITE_SUBDIR=	guile
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU Ubiquitous Intelligent Language for Extension
 
-LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
 
 USE_AUTOTOOLS=	autoconf libltdl
-USE_GMAKE=	yes
-USES=		gettext ncurses
+USES=		gettext gmake ncurses
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -24,15 +23,12 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 GUILE_VER=	1.8
 PLIST_SUB=	GUILE_VER=${GUILE_VER}
 
-MAN1=		guile.1
-
 REINPLACE_FILES=	libguile/smob.c libguile/filesys.c libguile/gc.c \
 			libguile/mallocs.c libguile/eval.c libguile/gc-malloc.c \
 			libguile/ports.c libguile/gc-mark.c libguile/gc_os_dep.c
 
 INFO=		goops guile-tut guile r5rs
 
-NO_STAGE=	yes
 post-extract:
 	cd ${WRKSRC}; ${CHMOD} u+w ${REINPLACE_FILES}
 	@${FIND} ${WRKSRC}/doc -name "*.info*" -delete
diff --git a/lang/guile/files/patch-Makefile.am b/lang/guile/files/patch-Makefile.am
index 4208355c06f3..d51d1d8a82c9 100644
--- a/lang/guile/files/patch-Makefile.am
+++ b/lang/guile/files/patch-Makefile.am
@@ -5,7 +5,7 @@
  DISTCLEANFILES = check-guile.log
  
 -pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(DESTDIR)$(prefix)/libdata/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
index 0baedd074ff9..c0732bae6f64 100644
--- a/lang/guile/files/patch-Makefile.in
+++ b/lang/guile/files/patch-Makefile.in
@@ -5,7 +5,7 @@
  ACLOCAL_AMFLAGS = -I guile-config
  DISTCLEANFILES = check-guile.log
 -pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(DESTDIR)$(prefix)/libdata/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = guile-1.8.pc
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/lang/guile/pkg-plist b/lang/guile/pkg-plist
index 958c0c52d9a9..35491a8848ca 100644
--- a/lang/guile/pkg-plist
+++ b/lang/guile/pkg-plist
@@ -135,6 +135,7 @@ lib/libguilereadline-v-17.la
 lib/libguilereadline-v-17.so
 lib/libguilereadline-v-17.so.17
 libdata/pkgconfig/guile-1.8.pc
+man/man1/guile.1.gz
 share/aclocal/guile.m4
 %%DATADIR%%/%%GUILE_VER%%/guile-procedures.txt
 %%DATADIR%%/%%GUILE_VER%%/ice-9/and-let-star.scm
diff --git a/lang/slib-guile/Makefile b/lang/slib-guile/Makefile
index f2f123862f86..d38371b3dce5 100644
--- a/lang/slib-guile/Makefile
+++ b/lang/slib-guile/Makefile
@@ -18,11 +18,6 @@ BUILD_DEPENDS=	${LOCALBASE}/share/slib/require.scm:${PORTSDIR}/lang/slib \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_BUILD=	yes
-
-NO_STAGE=	yes
-do-install:
-	${LN} -shf ${PREFIX}/share/slib ${LOCALBASE}/share/guile/1.8/slib
-	${LOCALBASE}/bin/guile -q -c \
-	"(use-modules (ice-9 slib))(require 'new-catalog)"
+NO_INSTALL=	yes
 
 .include <bsd.port.mk>
diff --git a/lang/slib/Makefile b/lang/slib/Makefile
index 2170b837fa76..6ce3b34e08f0 100644
--- a/lang/slib/Makefile
+++ b/lang/slib/Makefile
@@ -11,24 +11,21 @@ DISTFILES=	slib-${PORTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A portable scheme library
 
-USE_GMAKE=	yes
+USES=		gmake
 ALL_TARGET=	slib.info
 INFO=		slib
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/lib/slib|${PREFIX}/share/slib|' ${WRKSRC}/guile.init
 
 do-install:
-	@${MKDIR} ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.scm ${WRKSRC}/*.init ${WRKSRC}/*.txt \
-		${WRKSRC}/*.xyz ${WRKSRC}/*.ps ${DATADIR}
-	${INSTALL_MAN} ${WRKSRC}/slib.info ${MANPREFIX}/info
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+		${WRKSRC}/*.xyz ${WRKSRC}/*.ps ${STAGEDIR}${DATADIR}
+	${INSTALL_MAN} ${WRKSRC}/slib.info ${STAGEDIR}${MANPREFIX}/info
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ANNOUNCE ChangeLog FAQ README
-	${INSTALL_MAN} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>