diff options
| author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2000-02-27 04:46:33 +0000 |
|---|---|---|
| committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2000-02-27 04:46:33 +0000 |
| commit | 5b6edbc6f83ee23c730e9e2a0dd9d4b5c09f6252 (patch) | |
| tree | f0ee28bc754880ce1d483e79c505bfd6e798f7b8 /graphics/imlib | |
| parent | Use ${CFLAGS}. (diff) | |
Remove redundant LIB_DEPENDS,
Use GLIB_CONFIG instead of hardcoded glib12-config
PR: ports/16379
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Notes
Notes:
svn path=/head/; revision=26321
Diffstat (limited to 'graphics/imlib')
| -rw-r--r-- | graphics/imlib/Makefile | 8 | ||||
| -rw-r--r-- | graphics/imlib/files/patch-aa | 50 |
2 files changed, 12 insertions, 46 deletions
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 210b8bb56892..c1c07d8c0d03 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -12,20 +12,22 @@ MASTER_SITES= ftp://ftp.enlightenment.org/enlightenment/enlightenment/libs/ MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ ungif.5:${PORTSDIR}/graphics/libungif \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_GMAKE= yes USE_X_PREFIX= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + GLIB_CONFIG="${GLIB_CONFIG}" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib \ + --disable-gtktest .include <bsd.port.mk> diff --git a/graphics/imlib/files/patch-aa b/graphics/imlib/files/patch-aa index ed8f6a0c02e2..283c0c830d57 100644 --- a/graphics/imlib/files/patch-aa +++ b/graphics/imlib/files/patch-aa @@ -1,22 +1,13 @@ ---- configure.orig Wed Sep 1 04:00:37 1999 -+++ configure Mon Sep 6 15:17:37 1999 -@@ -1826,7 +1826,7 @@ - LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) /usr/local/bin/libtool' - - # Redirect the config.log output again, so that the ltconfig log is not - # clobbered by the next message. +--- configure.orig Sun Feb 27 11:57:26 2000 ++++ configure Sun Feb 27 11:59:58 2000 @@ -2367,8 +2367,8 @@ echo "configure:2368: checking whether to build gmodulized imlib" >&5 oLIBS="$LIBS" oCFLAGS="$CFLAGS" - LIBS="$LIBS `glib-config --libs gmodule`" - CFLAGS="$CFLAGS `glib-config --cflags gmodule`" -+ LIBS="$LIBS `glib12-config --libs gmodule`" -+ CFLAGS="$CFLAGS `glib12-config --cflags gmodule`" ++ LIBS="$LIBS `${GLIB_CONFIG} --libs gmodule`" ++ CFLAGS="$CFLAGS `${GLIB_CONFIG} --cflags gmodule`" if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else @@ -26,44 +17,17 @@ - GMODULE_LIBS="`glib-config --libs gmodule`" - GMODULE_FLAGS="`glib-config --cflags gmodule`" -+ GMODULE_LIBS="`glib12-config --libs gmodule`" -+ GMODULE_FLAGS="`glib12-config --cflags gmodule`" ++ GMODULE_LIBS="`${GLIB_CONFIG} --libs gmodule`" ++ GMODULE_FLAGS="`${GLIB_CONFIG} --cflags gmodule`" echo "$ac_t""yes" 1>&6 -@@ -4217,7 +4217,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lXext $X_LIBS $LIBS" -+LIBS="-lXext -lX11 $X_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF - #line 4223 "configure" - #include "confdefs.h" @@ -4536,7 +4536,7 @@ echo "$ac_t""$jpeg_ok" 1>&6 if test "$jpeg_ok" = yes; then JPEGLIBS="-ljpeg" - SUPPORT_LIBS="$SUPPORT_LIBS -ljpeg"; cat >> confdefs.h <<\EOF -+ SUPPORT_LIBS="$SUPPORT_LIBS -L/usr/local/lib"; cat >> confdefs.h <<\EOF ++ SUPPORT_LIBS="$SUPPORT_LIBS"; cat >> confdefs.h <<\EOF #define HAVE_LIBJPEG 1 EOF -@@ -4552,7 +4552,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-ltiff $GX_LIBS $LIBS" -+LIBS="-ltiff -ljpeg -lz $GX_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF - #line 4558 "configure" - #include "confdefs.h" -@@ -4609,7 +4609,7 @@ - if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - TIFFLIBS="-ltiff" -- SUPPORT_LIBS="$SUPPORT_LIBS -ltiff"; cat >> confdefs.h <<\EOF -+ SUPPORT_LIBS="$SUPPORT_LIBS -ltiff -ljpeg"; cat >> confdefs.h <<\EOF - #define HAVE_LIBTIFF 1 - EOF - |