diff options
author | Vanilla I. Shu <vanilla@FreeBSD.org> | 1999-01-04 08:43:09 +0000 |
---|---|---|
committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 1999-01-04 08:43:09 +0000 |
commit | 694c63ae54b987bc19fd3406b972c1f545ea6c70 (patch) | |
tree | 7601ece9c314c9645d5243ba3bc9c9ae3c19cbee /graphics | |
parent | * Obey our CFLAGS (diff) |
Bump libglib11d's version to 2.0,
and fix some configure problem(include pkg/PLIST).
Notes
Notes:
svn path=/head/; revision=15819
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/imlib/Makefile | 4 | ||||
-rw-r--r-- | graphics/imlib/files/patch-aa | 22 | ||||
-rw-r--r-- | graphics/imlib2-tmp/Makefile | 4 | ||||
-rw-r--r-- | graphics/imlib2-tmp/files/patch-aa | 22 | ||||
-rw-r--r-- | graphics/imlib2/Makefile | 4 | ||||
-rw-r--r-- | graphics/imlib2/files/patch-aa | 22 |
6 files changed, 66 insertions, 12 deletions
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index be5243b1a588..640bcddbffc9 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -3,7 +3,7 @@ # Date created: 10 June 1997 # Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp> # -# $Id: Makefile,v 1.37 1998/12/26 19:33:34 vanilla Exp $ +# $Id: Makefile,v 1.38 1998/12/26 19:54:26 vanilla Exp $ # DISTNAME= imlib-1.8.2 @@ -28,7 +28,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \ GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ - LIBS=-L${LOCALBASE}/lib \ + LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ INSTALL="$${INSTALL} -c" post-install: diff --git a/graphics/imlib/files/patch-aa b/graphics/imlib/files/patch-aa index 523e93a72960..a538dcc94af0 100644 --- a/graphics/imlib/files/patch-aa +++ b/graphics/imlib/files/patch-aa @@ -1,5 +1,5 @@ ---- configure.orig Thu Dec 24 05:59:01 1998 -+++ configure Thu Dec 24 06:01:01 1998 +--- configure.orig Wed Dec 16 11:14:28 1998 ++++ configure Sun Jan 3 15:06:35 1999 @@ -1711,143 +1711,6 @@ rm -f conf.gtktest @@ -144,6 +144,24 @@ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 echo "configure:1853: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. +@@ -3452,7 +3315,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 3458 "configure" + #include "confdefs.h" +@@ -3786,7 +3649,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 3792 "configure" + #include "confdefs.h" @@ -4010,16 +3873,16 @@ diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile index be5243b1a588..640bcddbffc9 100644 --- a/graphics/imlib2-tmp/Makefile +++ b/graphics/imlib2-tmp/Makefile @@ -3,7 +3,7 @@ # Date created: 10 June 1997 # Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp> # -# $Id: Makefile,v 1.37 1998/12/26 19:33:34 vanilla Exp $ +# $Id: Makefile,v 1.38 1998/12/26 19:54:26 vanilla Exp $ # DISTNAME= imlib-1.8.2 @@ -28,7 +28,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \ GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ - LIBS=-L${LOCALBASE}/lib \ + LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ INSTALL="$${INSTALL} -c" post-install: diff --git a/graphics/imlib2-tmp/files/patch-aa b/graphics/imlib2-tmp/files/patch-aa index 523e93a72960..a538dcc94af0 100644 --- a/graphics/imlib2-tmp/files/patch-aa +++ b/graphics/imlib2-tmp/files/patch-aa @@ -1,5 +1,5 @@ ---- configure.orig Thu Dec 24 05:59:01 1998 -+++ configure Thu Dec 24 06:01:01 1998 +--- configure.orig Wed Dec 16 11:14:28 1998 ++++ configure Sun Jan 3 15:06:35 1999 @@ -1711,143 +1711,6 @@ rm -f conf.gtktest @@ -144,6 +144,24 @@ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 echo "configure:1853: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. +@@ -3452,7 +3315,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 3458 "configure" + #include "confdefs.h" +@@ -3786,7 +3649,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 3792 "configure" + #include "confdefs.h" @@ -4010,16 +3873,16 @@ diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index be5243b1a588..640bcddbffc9 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -3,7 +3,7 @@ # Date created: 10 June 1997 # Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp> # -# $Id: Makefile,v 1.37 1998/12/26 19:33:34 vanilla Exp $ +# $Id: Makefile,v 1.38 1998/12/26 19:54:26 vanilla Exp $ # DISTNAME= imlib-1.8.2 @@ -28,7 +28,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \ GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ - LIBS=-L${LOCALBASE}/lib \ + LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ INSTALL="$${INSTALL} -c" post-install: diff --git a/graphics/imlib2/files/patch-aa b/graphics/imlib2/files/patch-aa index 523e93a72960..a538dcc94af0 100644 --- a/graphics/imlib2/files/patch-aa +++ b/graphics/imlib2/files/patch-aa @@ -1,5 +1,5 @@ ---- configure.orig Thu Dec 24 05:59:01 1998 -+++ configure Thu Dec 24 06:01:01 1998 +--- configure.orig Wed Dec 16 11:14:28 1998 ++++ configure Sun Jan 3 15:06:35 1999 @@ -1711,143 +1711,6 @@ rm -f conf.gtktest @@ -144,6 +144,24 @@ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 echo "configure:1853: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. +@@ -3452,7 +3315,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 3458 "configure" + #include "confdefs.h" +@@ -3786,7 +3649,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 3792 "configure" + #include "confdefs.h" @@ -4010,16 +3873,16 @@ |