Make this work under ELF.

4 files changed, 79 insertions, 104 deletions

diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 008bb7c8744..f2edef484d5 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,25 +1,33 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/02/27 18:33:38 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2000/02/29 06:43:00 jlam Exp $
 #
 
-DISTNAME=	libwmf-0.1.17
-CATEGORIES=	graphics devel
-MASTER_SITES=	http://www.csn.ul.ie/~caolan/publink/libwmf/
+DISTNAME=		libwmf-0.1.17
+CATEGORIES=		graphics devel
+MASTER_SITES=		http://www.csn.ul.ie/~caolan/publink/libwmf/
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.csn.ul.ie/~caolan/docs/libwmf.html
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.csn.ul.ie/~caolan/docs/libwmf.html
 
-DEPENDS+=	xpm-3.4k:../../graphics/xpm
-DEPENDS+=	png>=1.0.3:../../graphics/png
-DEPENDS+=	freetype-*:../../graphics/freetype
+BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:../../devel/autoconf
+DEPENDS+=		freetype-*:../../graphics/freetype
+DEPENDS+=		png>=1.0.3:../../graphics/png
+DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
 # uses own gd, which has some extra functionality
-CONFLICTS+=	gd-1.7.3:../../graphics/gd
+CONFLICTS+=		gd-1.7.3:../../graphics/gd
 
+WRKSRC=			${WRKDIR}/libwmf
+USE_X11=		YES
+
+GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-png="${LOCALBASE}"
 CONFIGURE_ARGS+=	--with-ttf="${LOCALBASE}"
+CONFIGURE_ARGS+=	--with-xpm="${X11BASE}"
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS+=		-I${LOCALBASE}/include -I${X11BASE}/include
 
-WRKSRC=		${WRKDIR}/libwmf
-GNU_CONFIGURE=	YES
+pre-configure:
+	cd ${WRKSRC}; ${LOCALBASE}/bin/autoconf
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libwmf
diff --git a/graphics/libwmf/files/patch-sum b/graphics/libwmf/files/patch-sum
index 0069cb2a519..9851bfcc4fe 100644
--- a/graphics/libwmf/files/patch-sum
+++ b/graphics/libwmf/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/02/27 18:33:39 wiz Exp $
+$NetBSD: patch-sum,v 1.2 2000/02/29 06:43:01 jlam Exp $
 
-MD5 (patch-aa) = 9a1be67c8ae76fd3ce3dd582be69bd87
+MD5 (patch-aa) = 8ae294a22ea8a20736b95a9dd9a474ec
+MD5 (patch-ab) = 301aecd5179e6a76e13c8383f83f0c64
diff --git a/graphics/libwmf/patches/patch-aa b/graphics/libwmf/patches/patch-aa
index 33d6ad48aec..44a46ae7426 100644
--- a/graphics/libwmf/patches/patch-aa
+++ b/graphics/libwmf/patches/patch-aa
@@ -1,92 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/02/27 18:33:39 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2000/02/29 06:43:01 jlam Exp $
 
---- ./configure.orig	Thu Dec 16 16:22:34 1999
-+++ ./configure	Sun Feb 27 15:44:21 2000
-@@ -3606,76 +3606,28 @@
- echo "configure:3607: checking for PNG support ..." >&5
-         failed=0;
-         passed=0;
--        ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for png.h""... $ac_c" 1>&6
--echo "configure:3612: checking for png.h" >&5
--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 3617 "configure"
--#include "confdefs.h"
--#include <png.h>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=yes"
--else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
--fi
--rm -f conftest*
--fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  passed=`expr $passed + 1`
--else
--  echo "$ac_t""no" 1>&6
--failed=`expr $failed + 1`
--fi
+--- Makefile.in.orig	Thu Dec 16 10:31:01 1999
++++ Makefile.in	Tue Feb 29 01:30:08 2000
+@@ -1,6 +1,6 @@
+ LIBS = -L./libdib -ldib @XPM_LIBS@ @LIBS@ -lm
+ 
+-GDLIBS = -L./libdib -ldib -Lxgd-1.7.3 -lxgd @XPM_LIBS@ @LIBS@ @TTF_LIBS@ -lpng -lm 
++GDLIBS = -L./libdib -ldib -Lxgd-1.7.3 -lxgd @XPM_LIBS@ @LIBS@ @TTF_LIBS@ -lpng @ZLIB_LIBS@ -lm 
+ 
+ XFLIBS = -L./libxfig -lxfig -L./libdib -ldib @XPM_LIBS@ @LIBS@ @TTF_LIBS@ -lm
  
--        ac_safe=`echo "pngconf.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for pngconf.h""... $ac_c" 1>&6
--echo "configure:3646: checking for pngconf.h" >&5
--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 3651 "configure"
-+        cat > conftest.$ac_ext <<EOF
-+#line 3612 "configure"
- #include "confdefs.h"
-+#include <png.h>
- #include <pngconf.h>
-+int main() {
-+
-+; return 0; }
- EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
-+if { (eval echo configure:3620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=yes"
-+  passed=`expr $passed + 1`
- else
--  echo "$ac_err" >&5
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  failed=`expr $failed + 1`
- fi
--rm -f conftest*
--fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  passed=`expr $passed + 1`
--else
--  echo "$ac_t""no" 1>&6
--failed=`expr $failed + 1`
--fi
--
-+rm -f conftest*;
-         echo $ac_n "checking for png_info_init in -lpng""... $ac_c" 1>&6
--echo "configure:3679: checking for png_info_init in -lpng" >&5
-+echo "configure:3631: checking for png_info_init in -lpng" >&5
- ac_lib_var=`echo png'_'png_info_init | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
diff --git a/graphics/libwmf/patches/patch-ab b/graphics/libwmf/patches/patch-ab
new file mode 100644
index 00000000000..5940a340f78
--- /dev/null
+++ b/graphics/libwmf/patches/patch-ab
@@ -0,0 +1,46 @@
+$NetBSD: patch-ab,v 1.1 2000/02/29 06:43:01 jlam Exp $
+
+--- configure.in.orig	Thu Dec 16 10:22:33 1999
++++ configure.in	Tue Feb 29 01:24:31 2000
+@@ -100,9 +100,8 @@
+     AC_MSG_RESULT("$result")
+ fi
+ if [ test "$SYSTEM_TTF" = 1 ]; then
+-	AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf"],
+-	AC_CHECK_LIB(ttf, TT_Done_FreeType, [TTF_LIBS="-lttf -lnsl"],
+-	no_ttf=yes, -lnsl))
++	AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf -lintl"],
++	no_ttf=yes, -lintl)
+ else
+     no_ttf=yes
+ fi
+@@ -128,9 +127,8 @@
+         AC_MSG_RESULT("$result")
+     fi
+     if [ test "$SYSTEM_TTF" = 1 ]; then
+-		AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf"],
+-		AC_CHECK_LIB(ttf, TT_Done_FreeType, [TTF_LIBS="-lttf -lnsl"],
+-		no_ttf=yes, -lnsl))
++		AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf -lintl"],
++		no_ttf=yes, -lintl)
+     else
+         no_ttf=yes
+     fi
+@@ -404,7 +402,7 @@
+     AC_MSG_RESULT("$result")
+ fi
+ if [ test "$SYSTEM_TTF" = 1 ]; then
+-    AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf"],no_ttf=yes,-lm)
++    AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf -lintl"],no_ttf=yes,-lintl)
+ else
+     no_ttf=yes
+ fi
+@@ -430,7 +428,7 @@
+         AC_MSG_RESULT("$result")
+     fi
+     if [ test "$SYSTEM_TTF" = 1 ]; then
+-        AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf"],no_ttf=yes,-lm)
++        AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf -lintl"],no_ttf=yes,-lintl)
+     else
+         no_ttf=yes
+     fi