- Build libffi as static and install ffi.h in include/g-wrap/ffi so we

  dont conflict with gcc4* and libffi from ports


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7291 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 41 insertions, 12 deletions

diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index 447edc39b..5e17d10ee 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -4,11 +4,11 @@
 # Whom:			Matthew Condell (mcondell@alum.mit.edu)
 #
 # $FreeBSD$
-#    $MCom: ports/devel/g-wrap/Makefile,v 1.2 2006/09/10 21:24:28 ahze Exp $
+#    $MCom: ports/devel/g-wrap/Makefile,v 1.3 2006/09/12 15:30:30 ahze Exp $
 
 PORTNAME=	g-wrap
 PORTVERSION=	1.9.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel scheme
 MASTER_SITES=	SAVANNAH
 
@@ -21,15 +21,22 @@ RUN_DEPENDS=	slib-guile>0:${PORTSDIR}/lang/slib-guile
 
 INFO=		g-wrap
 
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20 gnomehack
-USE_LDCONFIG=	${PREFIX}/lib/elf
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|Libs: |Libs: -L${PREFIX}/lib/elf |' \
-		${WRKSRC}/guile/g-wrap-2.0-guile.pc.in
 	@${REINPLACE_CMD} -e 's|"glib"|"glib-2.0"|' \
 		${WRKSRC}/configure
 
+pre-install:
+	@${REINPLACE_CMD} -e 's|libffi||' ${WRKSRC}/${MAKEFILE}
+
+post-install:
+	${MKDIR} ${PREFIX}/include/g-wrap/ffi
+.for f in ffi.h ffitarget.h
+	${INSTALL_DATA} ${WRKSRC}/libffi/include/${f} ${PREFIX}/include/g-wrap/ffi
+.endfor
+
 .include <bsd.port.mk>
diff --git a/devel/g-wrap/files/patch-guile_g-wrap-2.0-guile.pc.in b/devel/g-wrap/files/patch-guile_g-wrap-2.0-guile.pc.in
new file mode 100644
index 000000000..ddff5ed66
--- /dev/null
+++ b/devel/g-wrap/files/patch-guile_g-wrap-2.0-guile.pc.in
@@ -0,0 +1,15 @@
+--- guile/g-wrap-2.0-guile.pc.in.orig	Mon Oct 11 06:32:16 2004
++++ guile/g-wrap-2.0-guile.pc.in	Tue Sep 12 17:10:41 2006
+@@ -5,9 +5,10 @@
+ libdir=@libdir@
+ includedir=@includedir@
+ module_directory=@GUILEMODDIR@
++ffiincludedir= @includedir@/g-wrap/ffi
+ 
+ Name: G-Wrap
+ Description: A Guile wrapper generator
+ Version: @VERSION@
+-Libs: -L${libdir} -lgwrap-guile-runtime -lgwrap-core-runtime @GUILE_LDFLAGS@ @LIBFFI_LIBS_INSTALLED@
+-Cflags: @STD_CFLAGS@ -I${includedir} @GUILE_CFLAGS@ @LIBFFI_CFLAGS_INSTALLED@
++Libs: -L/usr/local/lib/elf -L${libdir} -lgwrap-guile-runtime -lgwrap-core-runtime @GUILE_LDFLAGS@
++Cflags: @STD_CFLAGS@ -I${includedir} -I${ffincludedir} @GUILE_CFLAGS@ @LIBFFI_CFLAGS_INSTALLED@
diff --git a/devel/g-wrap/files/patch-libffi_configure b/devel/g-wrap/files/patch-libffi_configure
new file mode 100644
index 000000000..2121d0c04
--- /dev/null
+++ b/devel/g-wrap/files/patch-libffi_configure
@@ -0,0 +1,11 @@
+--- libffi/configure.orig	Tue Sep 12 17:01:51 2006
++++ libffi/configure	Tue Sep 12 17:02:19 2006
+@@ -3285,7 +3285,7 @@
+       ;;
+     esac
+ else
+-  enable_shared=yes
++  enable_shared=no # don't build shared lib (or conflict with gcc3*)
+ fi;
+ 
+ # Check whether --enable-static or --disable-static was given.
diff --git a/devel/g-wrap/pkg-plist b/devel/g-wrap/pkg-plist
index 9b7bf8dc0..51e877875 100644
--- a/devel/g-wrap/pkg-plist
+++ b/devel/g-wrap/pkg-plist
@@ -1,16 +1,12 @@
 bin/g-wrap-config
-include/ffi.h
-include/ffitarget.h
 include/g-wrap-wct.h
 include/g-wrap/core-runtime.h
 include/g-wrap/ffi-support.h
+include/g-wrap/ffi/ffi.h
+include/g-wrap/ffi/ffitarget.h
 include/g-wrap/guile-compatibility.h
 include/g-wrap/guile-runtime.h
 include/g-wrap/guile-wct.h
-lib/elf/libffi.a
-lib/elf/libffi.la
-lib/elf/libffi.so
-lib/elf/libffi.so.4
 lib/libgw-guile-gw-glib.a
 lib/libgw-guile-gw-glib.la
 lib/libgw-guile-gw-glib.so
@@ -54,5 +50,5 @@ share/guile/site/srfi/srfi-35.scm
 @dirrmtry share/guile/site/g-wrap
 @dirrmtry share/guile/site
 @dirrmtry share/guile
-@dirrmtry lib/elf
+@dirrm include/g-wrap/ffi
 @dirrm include/g-wrap