try again: remove ttf, X11, Xpm and pthreads dependencies.

use libtool, from bernd@.
sturm@ ok.
This commit is contained in:
fgsch 2005-10-24 05:02:40 +00:00
parent b9fefdd3e1
commit b4aa799d4b
2 changed files with 46 additions and 11 deletions

View File

@ -1,21 +1,20 @@
# $OpenBSD: Makefile,v 1.41 2005/10/16 16:48:14 fgsch Exp $
# $OpenBSD: Makefile,v 1.42 2005/10/24 05:02:40 fgsch Exp $
COMMENT= "library for dynamic creation of images"
DISTNAME= gd-2.0.33
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
CATEGORIES= graphics
MASTER_SITES= http://www.boutell.com/gd/http/
HOMEPAGE= http://www.boutell.com/gd/
LIB_DEPENDS= jpeg.62::graphics/jpeg \
png.2::graphics/png \
ttf.1.3::print/freetype
png.2::graphics/png
MODULES= converters/libiconv
WANTLIB= X11 Xpm c fontconfig freetype m ttf z
WANTLIB= c fontconfig freetype m z
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@ -23,12 +22,10 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-DHAVE_LIBTTF" \
LDFLAGS="-L/usr/local/lib" \
LIBS="-lttf"
CONFIGURE_ARGS+= --without-xpm
USE_X11= Yes
NO_REGRESS= Yes
USE_LIBTOOL= Yes
post-install:
@cd ${WRKSRC} && ./gddemo

View File

@ -1,6 +1,17 @@
$OpenBSD: patch-configure,v 1.1 2005/10/12 05:37:43 fgsch Exp $
$OpenBSD: patch-configure,v 1.2 2005/10/24 05:02:41 fgsch Exp $
--- configure.orig Wed Nov 3 20:14:47 2004
+++ configure Wed Sep 21 04:11:05 2005
+++ configure Sat Oct 22 20:58:33 2005
@@ -10497,8 +10497,8 @@ _ACEOF
fi
-if test -n "$LIBICONV" ; then
- LIBS="$LIBS $LIBICONV"
+if test -n "$LTLIBICONV" ; then
+ LIBS="$LIBS $LTLIBICONV"
fi
@@ -11338,7 +11338,7 @@ if test `eval echo '${'$as_ac_Header'}'`
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
@ -10,3 +21,30 @@ $OpenBSD: patch-configure,v 1.1 2005/10/12 05:37:43 fgsch Exp $
else
CPPFLAGS="$_cppflags"
fi
@@ -12307,7 +12307,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- acx_pthread_ok=yes
+ acx_pthread_ok=no
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12444,7 +12444,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- acx_pthread_ok=yes
+ acx_pthread_ok=no
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13396,7 +13396,7 @@ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
s,@CPP@,$CPP,;t t
s,@EGREP@,$EGREP,;t t
s,@LIBTOOL@,$LIBTOOL,;t t
-s,@LIBICONV@,$LIBICONV,;t t
+s,@LIBICONV@,$LTLIBICONV,;t t
s,@LTLIBICONV@,$LTLIBICONV,;t t
s,@LIBPNG12_CONFIG@,$LIBPNG12_CONFIG,;t t
s,@LIBPNG_CONFIG@,$LIBPNG_CONFIG,;t t