Provide patch for configure, so that we don't depend on autoconf

(which has some problems, see pkg/10849).

3 files changed, 270 insertions, 6 deletions

diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 3429c6471f4..df789074371 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/08/23 23:14:29 tron Exp $
+# $NetBSD: Makefile,v 1.15 2000/09/10 20:31:33 wiz Exp $
 #
 
 DISTNAME=		libwmf-0.1.17
@@ -9,7 +9,6 @@ MASTER_SITES=		http://www.csn.ul.ie/~caolan/publink/libwmf/
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.csn.ul.ie/~caolan/docs/libwmf.html
 
-BUILD_DEPENDS+=		autoconf:../../devel/autoconf
 DEPENDS+=		freetype-lib>=1.3.1:../../graphics/freetype-lib
 DEPENDS+=		png>=1.0.6:../../graphics/png
 
@@ -28,9 +27,6 @@ INCLUDEDIR=		${PREFIX}/include/libwmf
 HTMLDIR=		${PREFIX}/share/doc/html/libwmf
 WRKSRC=			${WRKDIR}/libwmf
 
-pre-configure:
-	cd ${WRKSRC} && autoconf
-
 pre-install:
 	${INSTALL_DATA_DIR} ${INCLUDEDIR}
 
diff --git a/graphics/libwmf/files/patch-sum b/graphics/libwmf/files/patch-sum
index fe3cd8ca4cb..7fe7a09a4eb 100644
--- a/graphics/libwmf/files/patch-sum
+++ b/graphics/libwmf/files/patch-sum
@@ -1,5 +1,6 @@
-$NetBSD: patch-sum,v 1.4 2000/08/06 14:18:50 wiz Exp $
+$NetBSD: patch-sum,v 1.5 2000/09/10 20:31:34 wiz Exp $
 
 MD5 (patch-aa) = c6fb8ed89209a6fdaa3ebeccd052543e
 MD5 (patch-ab) = 7c5b53a1edc460740c401f797ebaa2b7
 MD5 (patch-ac) = 95326ec337fc75a8dd8725c729fd22ff
+MD5 (patch-ad) = 5e70d73daecc149ff43fb1f9fab47a06
diff --git a/graphics/libwmf/patches/patch-ad b/graphics/libwmf/patches/patch-ad
new file mode 100644
index 00000000000..ed5fc3df411
--- /dev/null
+++ b/graphics/libwmf/patches/patch-ad
@@ -0,0 +1,267 @@
+$NetBSD: patch-ad,v 1.1 2000/09/10 20:31:34 wiz Exp $
+
+--- configure.orig	Thu Dec 16 16:22:34 1999
++++ configure
+@@ -1216,7 +1216,7 @@
+ 
+   # It would also be nice to do this for all -L options, not just this one.
+   if test -n "$x_libraries"; then
+-    X_LIBS="$X_LIBS -L$x_libraries"
++    X_LIBS="$X_LIBS -L$x_libraries -Wl,-R$x_libraries"
+     # For Solaris; some versions of Sun CC require a space after -R and
+     # others require no space.  Words are not sufficient . . . .
+     case "`(uname -sr) 2>/dev/null`" in
+@@ -1822,7 +1822,7 @@
+  _SAVE_LDFLAGS=$LDFLAGS
+ 
+ if test "$TTF_DIR" != "" ; then
+-CFLAGS="-I${TTF_DIR}/include $CFLAGS"
++CFLAGS="-I${TTF_DIR}/include/freetype $CFLAGS"
+ LDFLAGS="-L${TTF_DIR}/lib $LDFLAGS"
+ fi
+ 
+@@ -1857,7 +1857,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lttf  $LIBS"
++LIBS="-lttf -lintl $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 1863 "configure"
+ #include "confdefs.h"
+@@ -1885,65 +1885,25 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  TTF_LIBS="-lttf"
+-else
+-  echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for TT_Done_FreeType in -lttf""... $ac_c" 1>&6
+-echo "configure:1893: checking for TT_Done_FreeType in -lttf" >&5
+-ac_lib_var=`echo ttf'_'TT_Done_FreeType | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  ac_save_LIBS="$LIBS"
+-LIBS="-lttf -lnsl $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 1901 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char TT_Done_FreeType();
+-
+-int main() {
+-TT_Done_FreeType()
+-; return 0; }
+-EOF
+-if { (eval echo configure:1912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  TTF_LIBS="-lttf -lnsl"
++  TTF_LIBS="-lttf -lintl"
+ else
+   echo "$ac_t""no" 1>&6
+ no_ttf=yes
+ fi
+ 
+-fi
+-
+ else
+     no_ttf=yes
+ fi
+ 
+ if  test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ; then
+-    TTF_CFLAGS="-I${TTF_DIR}/include"
++    TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
+     TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
+ fi
+ 
+ if test "x$no_ttf" = xyes; then
+     if test "$TTF_DIR" != "" ; then
+-    CFLAGS="-I${TTF_DIR} $CFLAGS"
+-    LDFLAGS="-L${TTF_DIR} $LDFLAGS"
++    CFLAGS="-I${TTF_DIR}/include/freetype $CFLAGS"
++    LDFLAGS="-L${TTF_DIR}/lib $LDFLAGS"
+     fi
+ 
+     if test "$TTF_DIR" = no; then
+@@ -1973,7 +1933,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lttf  $LIBS"
++LIBS="-lttf -lintl $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 1985 "configure"
+ #include "confdefs.h"
+@@ -2007,59 +1967,19 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  TTF_LIBS="-lttf"
+-else
+-  echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for TT_Done_FreeType in -lttf""... $ac_c" 1>&6
+-echo "configure:2015: checking for TT_Done_FreeType in -lttf" >&5
+-ac_lib_var=`echo ttf'_'TT_Done_FreeType | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  ac_save_LIBS="$LIBS"
+-LIBS="-lttf -lnsl $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 2023 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char TT_Done_FreeType();
+-
+-int main() {
+-TT_Done_FreeType()
+-; return 0; }
+-EOF
+-if { (eval echo configure:2034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  TTF_LIBS="-lttf -lnsl"
++  TTF_LIBS="-lttf -lintl"
+ else
+   echo "$ac_t""no" 1>&6
+ no_ttf=yes
+ fi
+ 
+-fi
+-
+     else
+         no_ttf=yes
+     fi
+ 
+ if  test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ; then
+-    TTF_CFLAGS="-I${TTF_DIR}"
+-    TTF_LIBS="-L${TTF_DIR} ${TTF_LIBS}"
++    TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
++    TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
+ fi
+ 
+ fi
+@@ -2361,7 +2281,7 @@
+ 
+   # It would also be nice to do this for all -L options, not just this one.
+   if test -n "$x_libraries"; then
+-    X_LIBS="$X_LIBS -L$x_libraries"
++    X_LIBS="$X_LIBS -L$x_libraries -Wl,-R$x_libraries"
+     # For Solaris; some versions of Sun CC require a space after -R and
+     # others require no space.  Words are not sufficient . . . .
+     case "`(uname -sr) 2>/dev/null`" in
+@@ -3777,15 +3697,15 @@
+ fi
+ if  test "$SYSTEM_TTF" = 1 ; then
+     echo $ac_n "checking for TT_Init_FreeType in -lttf""... $ac_c" 1>&6
+-echo "configure:3781: checking for TT_Init_FreeType in -lttf" >&5
++echo "configure:3701: checking for TT_Init_FreeType in -lttf" >&5
+ ac_lib_var=`echo ttf'_'TT_Init_FreeType | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lttf -lm $LIBS"
++LIBS="-lttf -lintl $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3789 "configure"
++#line 3709 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3811,7 +3731,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  TTF_LIBS="-lttf"
++  TTF_LIBS="-lttf -lintl"
+ else
+   echo "$ac_t""no" 1>&6
+ no_ttf=yes
+@@ -3822,14 +3742,14 @@
+ fi
+ 
+ if  test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ; then
+-    TTF_CFLAGS="-I${TTF_DIR}/include"
++    TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
+     TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
+ fi
+ 
+ if test "x$no_ttf" = xyes; then
+     if test "$TTF_DIR" != "" ; then
+-    CFLAGS="-I${TTF_DIR} $CFLAGS"
+-    LDFLAGS="-L${TTF_DIR} $LDFLAGS"
++    CFLAGS="-I${TTF_DIR}/include/freetype $CFLAGS"
++    LDFLAGS="-L${TTF_DIR}/lib $LDFLAGS"
+     fi
+ 
+     if test "$TTF_DIR" = no; then
+@@ -3859,15 +3779,15 @@
+     fi
+     if  test "$SYSTEM_TTF" = 1 ; then
+         echo $ac_n "checking for TT_Init_FreeType in -lttf""... $ac_c" 1>&6
+-echo "configure:3863: checking for TT_Init_FreeType in -lttf" >&5
++echo "configure:3783: checking for TT_Init_FreeType in -lttf" >&5
+ ac_lib_var=`echo ttf'_'TT_Init_FreeType | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lttf -lm $LIBS"
++LIBS="-lttf -lintl $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3871 "configure"
++#line 3791 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3893,7 +3813,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  TTF_LIBS="-lttf"
++  TTF_LIBS="-lttf -lintl"
+ else
+   echo "$ac_t""no" 1>&6
+ no_ttf=yes
+@@ -3905,8 +3825,8 @@
+ 
+ 
+ if  test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ; then
+-    TTF_CFLAGS="-I${TTF_DIR}"
+-    TTF_LIBS="-L${TTF_DIR} ${TTF_LIBS}"
++    TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
++    TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
+ fi
+ 
+ fi