1 files changed, 35 insertions, 30 deletions

diff --git a/lang/gnustep-guile/Makefile b/lang/gnustep-guile/Makefile
index c1b8fa61d1fc..b1643a2e4420 100644
--- a/lang/gnustep-guile/Makefile
+++ b/lang/gnustep-guile/Makefile
@@ -1,21 +1,20 @@
-# New ports collection makefile for:    gnustep
-# Date created:         03 October 1998
+# New ports collection makefile for:    gnustep-guile
+# Date created:         24 April 2001
 # Whom:                 Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gnustep
-PORTVERSION=	0.6.6
-CATEGORIES=	devel
-MASTER_SITES=	http://ftp.codefactory.se/pub/gnu/gstep/ \
-		http://planetmirror.com/pub/gnustep/core/
-DISTNAME=	gstep-core-${PORTVERSION}
+PORTNAME=	gnustep-guile
+PORTVERSION=	1.0.1
+CATEGORIES=	lang
+MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/libs/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		tiff.4:${PORTSDIR}/graphics/tiff
+BUILD_DEPENDS=	${SYSLIBDIR}/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/libgnustep-base.so:${PORTSDIR}/devel/gnustep-base
+RUN_DEPENDS=	${SYSLIBDIR}/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/libgnustep-base.so:${PORTSDIR}/devel/gnustep-base
+LIB_DEPENDS=	guile.9:${PORTSDIR}/lang/guile
 
 .include <bsd.port.pre.mk>
 
@@ -23,41 +22,47 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 BROKEN=		"Sorry, this port does not work on FreeBSD-2.2.x"
 .endif
 
-USE_NEWGCC=	yes
 PREFIX=		${LOCALBASE}/GNUstep
-WRKSRC=		${WRKDIR}/${DISTNAME}
+USE_NEWGCC=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	INSTALL_PROGRAM="${INSTALL} -c" INSTALL_DATA="${INSTALL} -c"
-CONFIGURE_ARGS=	--with-library-combo=gnu-gnu-gnu-xgps \
-		--with-jpeg-library=${LOCALBASE}/lib \
-		--with-jpeg-include=${LOCALBASE}/include \
-		--with-tiff-library=${LOCALBASE}/lib \
-		--with-tiff-include=${LOCALBASE}/include # --enable-threads=posix
 CONFIGURE_TARGET=
-USE_BISON=	yes
 USE_GMAKE=	yes
-USE_XLIB=	yes
 MAKEFILE=
 MAKE_FLAGS=	OPTFLAG="${CFLAGS}"
 NO_MTREE=	yes
 
+MAN1=	greg.1
+
 .if ${MACHINE_ARCH} == "i386"
 GNU_ARCH=	ix86
 .else
 GNU_ARCH=	${MACHINE_ARCH}
 .endif
-PLIST_SUB+=	GNU_ARCH=${GNU_ARCH} VERSION=${PORTVERSION}
+PLIST_SUB+=	GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} VERSION=${PORTVERSION}
+
+SYSLIBDIR=	${PREFIX}/System/Libraries
 
-ETCDIR=		${PREFIX}/../etc
+do-configure:
+	@(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \
+	    if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
+		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+		INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \
+		INSTALL_DATA="${INSTALL} -c" \
+		INSTALL_PROGRAM="${INSTALL} -c" \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+		${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \
+		    ${ECHO} "===>  Script \"${CONFIGURE_SCRIPT}\" failed: here are the contents of \"${CONFIGURE_LOG}\""; \
+		    ${CAT} ${CONFIGURE_LOG}; \
+		    ${ECHO} "(end of \"${CONFIGURE_LOG}\")"; \
+		    ${FALSE}; \
+	    fi)
 
-post-patch:
-.for f in bundle gswapp gswbundle woapp wobundle
-	${PERL} -pi -e 's/\$$\(TAR\) ch --exclude=CVS --to-stdout/\$$\(TAR\) -ch --exclude=CVS -f -/g' ${WRKSRC}/make/${f}.make
-.endfor
+do-build:
+	@(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \
+		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
 
-post-install:
-	@${MKDIR} ${ETCDIR}
-	${INSTALL_SCRIPT} ${FILESDIR}/GNUstep.sh ${ETCDIR}/rc.d
-	${INSTALL_DATA} ${FILESDIR}/gdomap_if ${ETCDIR}
+do-install:
+	@(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \
+		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 
 .include <bsd.port.post.mk>