- Unbroke on alpha;

- don't try to link with nonexistent libdl;
- respect CFLAGS.

Submitted by:	gallatin (alpha bits), sobomax
Some help from:	jdp (thanks Jonh!)

5 files changed, 60 insertions, 0 deletions

diff --git a/x11/xalf/Makefile b/x11/xalf/Makefile
index fc36a9c30463..7af8336d0d89 100644
--- a/x11/xalf/Makefile
+++ b/x11/xalf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xalf
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.lysator.liu.se/~astrand/projects/xalf/ \
 		http://www.lysator.liu.se/~astrand/projects/xalf/old/
diff --git a/x11/xalf/files/patch-capplet::Makefile.in b/x11/xalf/files/patch-capplet::Makefile.in
new file mode 100644
index 000000000000..9c4e9c7c75c9
--- /dev/null
+++ b/x11/xalf/files/patch-capplet::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- capplet/Makefile.in	2001/08/15 12:49:11	1.1
++++ capplet/Makefile.in	2001/08/15 12:49:37
+@@ -80,7 +80,7 @@
+ 
+ xalf_capplet_SOURCES = xalf-capplet.c getopt.c getopt1.c
+ 
+-CFLAGS = $(GNOME_CC_CFLAGS)
++CFLAGS = @CFLAGS@ $(GNOME_CC_CFLAGS)
+ 
+ xalf_capplet_LDADD = $(GNOME_CC_LIBS) @GTK_LIBS@
+ 
diff --git a/x11/xalf/files/patch-lib::Makefile.in b/x11/xalf/files/patch-lib::Makefile.in
new file mode 100644
index 000000000000..9306c876409f
--- /dev/null
+++ b/x11/xalf/files/patch-lib::Makefile.in
@@ -0,0 +1,17 @@
+
+$FreeBSD$
+
+--- lib/Makefile.in.orig	Wed Aug 15 15:46:39 2001
++++ lib/Makefile.in	Wed Aug 15 15:48:21 2001
+@@ -82,9 +82,9 @@
+ 
+ libxalflaunch_la_LDFLAGS = -version-info 0:1:0
+ 
+-CFLAGS = $(X_CFLAGS) -DLIBDIR=\""$(libdir)"\"
++CFLAGS = @CFLAGS@ $(X_CFLAGS) -DLIBDIR=\""$(libdir)"\"
+ 
+-LDFLAGS = -ldl
++LDFLAGS =
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/x11/xalf/files/patch-lib::xalflaunch.c b/x11/xalf/files/patch-lib::xalflaunch.c
new file mode 100644
index 000000000000..25e1193dbbeb
--- /dev/null
+++ b/x11/xalf/files/patch-lib::xalflaunch.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- lib/xalflaunch.c	2001/08/15 12:43:46	1.1
++++ lib/xalflaunch.c	2001/08/15 12:45:49
+@@ -45,7 +45,7 @@
+ static void _init(void) __attribute__ ((section (".init")));
+ #endif /* __FreeBSD__ */
+ 
+-#if defined __GNUC__ && ( ( __GNUC__ == 2 ) && ( __GNUC_MINOR__ >= 96) || ( __GNUC__ >= 3) )
++#if ( defined __GNUC__ && ( ( __GNUC__ == 2 ) && ( __GNUC_MINOR__ >= 96) || ( __GNUC__ >= 3) ) ) || defined __FreeBSD__
+ void initialize (void) __attribute__ ((constructor));
+ void initialize (void)
+ #else
diff --git a/x11/xalf/files/patch-src::Makefile.in b/x11/xalf/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..0886be4b914d
--- /dev/null
+++ b/x11/xalf/files/patch-src::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/Makefile.in	2001/08/15 12:48:36	1.1
++++ src/Makefile.in	2001/08/15 12:49:04
+@@ -86,7 +86,7 @@
+ 
+ INCLUDES = @GTK_CFLAGS@ 
+ 
+-CFLAGS = -DLIBDIR=\""$(libdir)"\"
++CFLAGS = @CFLAGS@ -DLIBDIR=\""$(libdir)"\"
+ 
+ EXTRA_DIST = hourglass.xpm splash.xpm hgcursor.h hgcursor_mask.h getopt.h 	sp1.xpm sp2.xpm sp3.xpm sp4.xpm sp5.xpm sp6.xpm sp7.xpm sp8.xpm sp9.xpm 
+