[Midnightbsd-cvs] mports: lang/gnustep-guile: I believe this is still broken, but at least

[laffer1 at midnightbsd.org]

Log Message:
-----------
I believe this is still broken, but at least update it with the right lib version for guile and some other local changes I was working on.

Modified Files:
--------------
    mports/lang/gnustep-guile:
        Makefile (r1.3 -> r1.4)
        pkg-plist (r1.1 -> r1.2)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/lang/gnustep-guile/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L lang/gnustep-guile/pkg-plist -L lang/gnustep-guile/pkg-plist -u -r1.1 -r1.2
--- lang/gnustep-guile/pkg-plist
+++ lang/gnustep-guile/pkg-plist
@@ -1,9 +1,7 @@
-%%USEX11%%System/Applications/guile-gui.app/library_paths.openapp
 %%USEX11%%System/Applications/guile-gui.app/Resources/Info-gnustep.plist
 %%USEX11%%System/Applications/guile-gui.app/Resources/guile-gui.desktop
 %%USEX11%%System/Applications/guile-gui.app/guile-gui
 %%USEX11%%System/Applications/guile-gui.app/stamp.make
-%%USEX11%%System/Applications/gui.app/library_paths.openapp
 %%USEX11%%System/Applications/gui.app/Resources/Info-gnustep.plist
 %%USEX11%%System/Applications/gui.app/Resources/gui.desktop
 %%USEX11%%System/Applications/gui.app/gui
@@ -36,7 +34,9 @@
 System/Library/Libraries/libgstep_guile.so.1
 System/Library/Makefiles/Additional/guile.make
 System/Tools/go
+%%USEX11%%System/Tools/gui
 System/Tools/guile-base
+%%USEX11%%System/Tools/guile-gui
 bin/greg
 info/dir
 @comment @unexec install-info --delete %D/info/greg.info %D/info/dir
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/lang/gnustep-guile/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L lang/gnustep-guile/Makefile -L lang/gnustep-guile/Makefile -u -r1.3 -r1.4
--- lang/gnustep-guile/Makefile
+++ lang/gnustep-guile/Makefile
@@ -8,8 +8,8 @@
 
 PORTNAME=	gnustep-guile
 PORTVERSION=	1.1.4
-PORTREVISION=	2
-CATEGORIES=	lang
+PORTREVISION=	3
+CATEGORIES=	lang gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	libs
 PKGNAMESUFFIX?=	${NOX11_SUFFIX}${PKGNAMESUFFIX2}
@@ -18,7 +18,9 @@
 COMMENT=	GNUstep interface to the GUILE scheme interpreter
 LICENSE=	gpl2
 
-LIB_DEPENDS+=	guile.15:${PORTSDIR}/lang/guile
+LIB_DEPENDS+=	guile.18:${PORTSDIR}/lang/guile
+
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=
@@ -34,6 +36,7 @@
 PLIST_SUB+=	GUILE_VER="${GUILE_VER}"
 
 MAN1=	greg.1
+FIXME=	Library/gg_class.m ScriptKit/Library/GuileInterpreter.m
 
 .if defined(WITHOUT_X11)
 NOX11_SUFFIX?=	-nox11
@@ -50,6 +53,17 @@
 
 GUILE_VER!=	(cd ${PORTSDIR}/lang/guile && make -V GUILE_VER)
 
+post-patch:
+	${REINPLACE_CMD} -e 's|echo aout|echo elf|' \
+               ${WRKSRC}/Greg/configure
+.for i in ${FIXME}
+	${REINPLACE_CMD} -e 's|scm_catch_body_t|scm_t_catch_body|' \
+               -e 's|scm_catch_handler_t|scm_t_catch_handler|' \
+               -e 's|scm_intern|scm_c_define|' \
+               ${WRKSRC}/${i}
+.endfor
+
+
 pre-configure:
 	${TOUCH} ${WRKSRC}/Greg/ac_nonexistent.h