diff options
33 files changed, 246 insertions, 79 deletions
diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile index c83c76faf362..4af937c79b2c 100644 --- a/devel/ORBit/Makefile +++ b/devel/ORBit/Makefile @@ -3,7 +3,7 @@ # Date Created: 16 Aug 1998 # Whom: Chia-liang Kao <clkao@CirX.ORG> # -# $Id: Makefile,v 1.8 1998/12/26 19:23:25 vanilla Exp $ +# $Id: Makefile,v 1.9 1998/12/31 16:07:48 vanilla Exp $ # DISTNAME= ORBit-0.3.91 @@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \ MAINTAINER= clkao@CirX.ORG -LIB_DEPENDS= glib11d.1:${PORTSDIR}/devel/glib11-devel +LIB_DEPENDS= glib11d.2:${PORTSDIR}/devel/glib11-devel GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index c83c76faf362..4af937c79b2c 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -3,7 +3,7 @@ # Date Created: 16 Aug 1998 # Whom: Chia-liang Kao <clkao@CirX.ORG> # -# $Id: Makefile,v 1.8 1998/12/26 19:23:25 vanilla Exp $ +# $Id: Makefile,v 1.9 1998/12/31 16:07:48 vanilla Exp $ # DISTNAME= ORBit-0.3.91 @@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \ MAINTAINER= clkao@CirX.ORG -LIB_DEPENDS= glib11d.1:${PORTSDIR}/devel/glib11-devel +LIB_DEPENDS= glib11d.2:${PORTSDIR}/devel/glib11-devel GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/devel/glib12/files/patch-ab b/devel/glib12/files/patch-ab index 0acb09a6ec8a..22870a5b0d08 100644 --- a/devel/glib12/files/patch-ab +++ b/devel/glib12/files/patch-ab @@ -45,7 +45,7 @@ -libglib_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) +libglib11d_la_LDFLAGS = \ -+ -version-info 1:1:0 ++ -version-info 2:0:0 noinst_PROGRAMS = testglib testgdate testgdateparser -testglib_LDADD = libglib.la @@ -229,7 +229,7 @@ @G_MODULE_LDFLAGS@ \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) -+ -version-info 1:1:0 ++ -version-info 2:0:0 -libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) +libgmodule11d_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) @@ -348,7 +348,7 @@ - -release $(LT_RELEASE) +libgthread11d_la_SOURCES = gthread.c +libgthread11d_la_LDFLAGS = \ -+ -version-info 1:1:0 ++ -version-info 2:0:0 -libgthread_la_LIBADD = @G_THREAD_LIBS@ +libgthread11d_la_LIBADD = @G_THREAD_LIBS@ diff --git a/devel/glib12/pkg-plist b/devel/glib12/pkg-plist index 42afcc810a2e..bb9fe30546cb 100644 --- a/devel/glib12/pkg-plist +++ b/devel/glib12/pkg-plist @@ -5,15 +5,15 @@ include/glib11d/gmodule.h lib/libglib11d.a lib/libglib11d.la lib/libglib11d.so -lib/libglib11d.so.1.1 +lib/libglib11d.so.2 lib/libgmodule11d.a lib/libgmodule11d.la lib/libgmodule11d.so -lib/libgmodule11d.so.1.1 +lib/libgmodule11d.so.2 lib/libgthread11d.a lib/libgthread11d.la lib/libgthread11d.so -lib/libgthread11d.so.1.1 +lib/libgthread11d.so.2 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @dirrm include/glib11d diff --git a/devel/glib13/files/patch-ab b/devel/glib13/files/patch-ab index 0acb09a6ec8a..22870a5b0d08 100644 --- a/devel/glib13/files/patch-ab +++ b/devel/glib13/files/patch-ab @@ -45,7 +45,7 @@ -libglib_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) +libglib11d_la_LDFLAGS = \ -+ -version-info 1:1:0 ++ -version-info 2:0:0 noinst_PROGRAMS = testglib testgdate testgdateparser -testglib_LDADD = libglib.la @@ -229,7 +229,7 @@ @G_MODULE_LDFLAGS@ \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) -+ -version-info 1:1:0 ++ -version-info 2:0:0 -libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) +libgmodule11d_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) @@ -348,7 +348,7 @@ - -release $(LT_RELEASE) +libgthread11d_la_SOURCES = gthread.c +libgthread11d_la_LDFLAGS = \ -+ -version-info 1:1:0 ++ -version-info 2:0:0 -libgthread_la_LIBADD = @G_THREAD_LIBS@ +libgthread11d_la_LIBADD = @G_THREAD_LIBS@ diff --git a/devel/glib13/pkg-plist b/devel/glib13/pkg-plist index 42afcc810a2e..bb9fe30546cb 100644 --- a/devel/glib13/pkg-plist +++ b/devel/glib13/pkg-plist @@ -5,15 +5,15 @@ include/glib11d/gmodule.h lib/libglib11d.a lib/libglib11d.la lib/libglib11d.so -lib/libglib11d.so.1.1 +lib/libglib11d.so.2 lib/libgmodule11d.a lib/libgmodule11d.la lib/libgmodule11d.so -lib/libgmodule11d.so.1.1 +lib/libgmodule11d.so.2 lib/libgthread11d.a lib/libgthread11d.la lib/libgthread11d.so -lib/libgthread11d.so.1.1 +lib/libgthread11d.so.2 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @dirrm include/glib11d diff --git a/devel/glib20/files/patch-ab b/devel/glib20/files/patch-ab index 0acb09a6ec8a..22870a5b0d08 100644 --- a/devel/glib20/files/patch-ab +++ b/devel/glib20/files/patch-ab @@ -45,7 +45,7 @@ -libglib_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) +libglib11d_la_LDFLAGS = \ -+ -version-info 1:1:0 ++ -version-info 2:0:0 noinst_PROGRAMS = testglib testgdate testgdateparser -testglib_LDADD = libglib.la @@ -229,7 +229,7 @@ @G_MODULE_LDFLAGS@ \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) -+ -version-info 1:1:0 ++ -version-info 2:0:0 -libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) +libgmodule11d_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) @@ -348,7 +348,7 @@ - -release $(LT_RELEASE) +libgthread11d_la_SOURCES = gthread.c +libgthread11d_la_LDFLAGS = \ -+ -version-info 1:1:0 ++ -version-info 2:0:0 -libgthread_la_LIBADD = @G_THREAD_LIBS@ +libgthread11d_la_LIBADD = @G_THREAD_LIBS@ diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index 42afcc810a2e..bb9fe30546cb 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -5,15 +5,15 @@ include/glib11d/gmodule.h lib/libglib11d.a lib/libglib11d.la lib/libglib11d.so -lib/libglib11d.so.1.1 +lib/libglib11d.so.2 lib/libgmodule11d.a lib/libgmodule11d.la lib/libgmodule11d.so -lib/libgmodule11d.so.1.1 +lib/libgmodule11d.so.2 lib/libgthread11d.a lib/libgthread11d.la lib/libgthread11d.so -lib/libgthread11d.so.1.1 +lib/libgthread11d.so.2 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @dirrm include/glib11d diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index 351989e86eba..74e463281f82 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -3,7 +3,7 @@ # Date Created: 26 Sep 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.8 1998/11/17 15:28:08 vanilla Exp $ +# $Id: Makefile,v 1.9 1999/01/01 04:43:03 vanilla Exp $ # DISTNAME= libgtop-0.99.0 @@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \ MAINTAINER= Nakai@technologist.com -LIB_DEPENDS= glib11d.1:${PORTSDIR}/devel/glib11-devel \ +LIB_DEPENDS= glib11d.2:${PORTSDIR}/devel/glib11-devel \ gnome.0:${PORTSDIR}/x11/gnomelibs \ guile.4:${PORTSDIR}/lang/guile diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index 351989e86eba..74e463281f82 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -3,7 +3,7 @@ # Date Created: 26 Sep 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.8 1998/11/17 15:28:08 vanilla Exp $ +# $Id: Makefile,v 1.9 1999/01/01 04:43:03 vanilla Exp $ # DISTNAME= libgtop-0.99.0 @@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \ MAINTAINER= Nakai@technologist.com -LIB_DEPENDS= glib11d.1:${PORTSDIR}/devel/glib11-devel \ +LIB_DEPENDS= glib11d.2:${PORTSDIR}/devel/glib11-devel \ gnome.0:${PORTSDIR}/x11/gnomelibs \ guile.4:${PORTSDIR}/lang/guile diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist index d5c0d2697b02..674778af84c9 100644 --- a/games/gnome-games/pkg-plist +++ b/games/gnome-games/pkg-plist @@ -9,6 +9,7 @@ bin/gyahtzee bin/mahjongg bin/same-gnome bin/sol +etc/sound/events/gnothello.soundlist include/gdkcardimage/gdk-card-image.h lib/libgdkcardimage.a lib/libgdkcardimage.la @@ -103,7 +104,6 @@ share/gnome/pixmaps/gnobots/mice.png share/gnome/pixmaps/gnobots/robots.png share/gnome/pixmaps/gnobots/windows.png share/gnome/pixmaps/gnobots/yahoo.png -share/gnome/pixmaps/gnome-mahjongg.png share/gnome/pixmaps/gnome-stones/amoeba.png share/gnome/pixmaps/gnome-stones/boulder.png share/gnome/pixmaps/gnome-stones/butterfly.png @@ -118,7 +118,6 @@ share/gnome/pixmaps/gnome-stones/frame.png share/gnome/pixmaps/gnome-stones/gnome.png share/gnome/pixmaps/gnome-stones/title.png share/gnome/pixmaps/gnome-stones/wall.png -share/gnome/pixmaps/gnothello.png share/gnome/pixmaps/gnothello/blend.png share/gnome/pixmaps/gnothello/classic.png share/gnome/pixmaps/gnothello/flipblend.png @@ -136,7 +135,9 @@ share/gnome/pixmaps/same-gnome/stones.png share/gnome/pixmaps/gnome-aisleriot.png share/gnome/pixmaps/gnome-gnobots.png share/gnome/pixmaps/gnome-gyahtzee.png +share/gnome/pixmaps/gnome-mahjongg.png share/gnome/pixmaps/gnome-stones.png +share/gnome/pixmaps/gnothello.png share/gnome/sol-games/camelot.scm share/gnome/sol-games/canfield.scm share/gnome/sol-games/clock.scm @@ -165,6 +166,8 @@ share/locale/no/LC_MESSAGES/gnome-games.mo share/locale/pl/LC_MESSAGES/gnome-games.mo share/locale/pt/LC_MESSAGES/gnome-games.mo @dirrm include/gdkcardimage +@dirrm share/gnome/help/aisleriot/C +@dirrm share/gnome/help/aisleriot @dirrm share/gnome/help/gnobots/C @dirrm share/gnome/help/gnobots @dirrm share/gnome/pixmaps/cards/backs diff --git a/games/gnomegames/pkg-plist b/games/gnomegames/pkg-plist index d5c0d2697b02..674778af84c9 100644 --- a/games/gnomegames/pkg-plist +++ b/games/gnomegames/pkg-plist @@ -9,6 +9,7 @@ bin/gyahtzee bin/mahjongg bin/same-gnome bin/sol +etc/sound/events/gnothello.soundlist include/gdkcardimage/gdk-card-image.h lib/libgdkcardimage.a lib/libgdkcardimage.la @@ -103,7 +104,6 @@ share/gnome/pixmaps/gnobots/mice.png share/gnome/pixmaps/gnobots/robots.png share/gnome/pixmaps/gnobots/windows.png share/gnome/pixmaps/gnobots/yahoo.png -share/gnome/pixmaps/gnome-mahjongg.png share/gnome/pixmaps/gnome-stones/amoeba.png share/gnome/pixmaps/gnome-stones/boulder.png share/gnome/pixmaps/gnome-stones/butterfly.png @@ -118,7 +118,6 @@ share/gnome/pixmaps/gnome-stones/frame.png share/gnome/pixmaps/gnome-stones/gnome.png share/gnome/pixmaps/gnome-stones/title.png share/gnome/pixmaps/gnome-stones/wall.png -share/gnome/pixmaps/gnothello.png share/gnome/pixmaps/gnothello/blend.png share/gnome/pixmaps/gnothello/classic.png share/gnome/pixmaps/gnothello/flipblend.png @@ -136,7 +135,9 @@ share/gnome/pixmaps/same-gnome/stones.png share/gnome/pixmaps/gnome-aisleriot.png share/gnome/pixmaps/gnome-gnobots.png share/gnome/pixmaps/gnome-gyahtzee.png +share/gnome/pixmaps/gnome-mahjongg.png share/gnome/pixmaps/gnome-stones.png +share/gnome/pixmaps/gnothello.png share/gnome/sol-games/camelot.scm share/gnome/sol-games/canfield.scm share/gnome/sol-games/clock.scm @@ -165,6 +166,8 @@ share/locale/no/LC_MESSAGES/gnome-games.mo share/locale/pl/LC_MESSAGES/gnome-games.mo share/locale/pt/LC_MESSAGES/gnome-games.mo @dirrm include/gdkcardimage +@dirrm share/gnome/help/aisleriot/C +@dirrm share/gnome/help/aisleriot @dirrm share/gnome/help/gnobots/C @dirrm share/gnome/help/gnobots @dirrm share/gnome/pixmaps/cards/backs diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist index d5c0d2697b02..674778af84c9 100644 --- a/games/gnomegames2/pkg-plist +++ b/games/gnomegames2/pkg-plist @@ -9,6 +9,7 @@ bin/gyahtzee bin/mahjongg bin/same-gnome bin/sol +etc/sound/events/gnothello.soundlist include/gdkcardimage/gdk-card-image.h lib/libgdkcardimage.a lib/libgdkcardimage.la @@ -103,7 +104,6 @@ share/gnome/pixmaps/gnobots/mice.png share/gnome/pixmaps/gnobots/robots.png share/gnome/pixmaps/gnobots/windows.png share/gnome/pixmaps/gnobots/yahoo.png -share/gnome/pixmaps/gnome-mahjongg.png share/gnome/pixmaps/gnome-stones/amoeba.png share/gnome/pixmaps/gnome-stones/boulder.png share/gnome/pixmaps/gnome-stones/butterfly.png @@ -118,7 +118,6 @@ share/gnome/pixmaps/gnome-stones/frame.png share/gnome/pixmaps/gnome-stones/gnome.png share/gnome/pixmaps/gnome-stones/title.png share/gnome/pixmaps/gnome-stones/wall.png -share/gnome/pixmaps/gnothello.png share/gnome/pixmaps/gnothello/blend.png share/gnome/pixmaps/gnothello/classic.png share/gnome/pixmaps/gnothello/flipblend.png @@ -136,7 +135,9 @@ share/gnome/pixmaps/same-gnome/stones.png share/gnome/pixmaps/gnome-aisleriot.png share/gnome/pixmaps/gnome-gnobots.png share/gnome/pixmaps/gnome-gyahtzee.png +share/gnome/pixmaps/gnome-mahjongg.png share/gnome/pixmaps/gnome-stones.png +share/gnome/pixmaps/gnothello.png share/gnome/sol-games/camelot.scm share/gnome/sol-games/canfield.scm share/gnome/sol-games/clock.scm @@ -165,6 +166,8 @@ share/locale/no/LC_MESSAGES/gnome-games.mo share/locale/pl/LC_MESSAGES/gnome-games.mo share/locale/pt/LC_MESSAGES/gnome-games.mo @dirrm include/gdkcardimage +@dirrm share/gnome/help/aisleriot/C +@dirrm share/gnome/help/aisleriot @dirrm share/gnome/help/gnobots/C @dirrm share/gnome/help/gnobots @dirrm share/gnome/pixmaps/cards/backs 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 @@ diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile index 4a96f8ffc7e8..12d36108ce3a 100644 --- a/x11-toolkits/gtk12/Makefile +++ b/x11-toolkits/gtk12/Makefile @@ -3,7 +3,7 @@ # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # -# $Id: Makefile,v 1.38 1998/12/30 23:11:36 vanilla Exp $ +# $Id: Makefile,v 1.39 1999/01/01 02:32:05 vanilla Exp $ # DISTNAME= gtk+-1.1.11 @@ -17,7 +17,7 @@ MAINTAINER= vanilla@FreeBSD.ORG BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext -LIB_DEPENDS= glib11d.1:${PORTSDIR}/devel/glib11-devel +LIB_DEPENDS= glib11d.2:${PORTSDIR}/devel/glib11-devel USE_X_PREFIX= yes .include <bsd.port.pre.mk> diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa index 0eb62ad42b92..2d24e5ae0c4f 100644 --- a/x11-toolkits/gtk12/files/patch-aa +++ b/x11-toolkits/gtk12/files/patch-aa @@ -252,3 +252,14 @@ mostlyclean-noinstPROGRAMS: +--- po/Makefile.in.in.orig Sun Jan 3 13:09:51 1999 ++++ po/Makefile.in.in Sun Jan 3 13:10:02 1999 +@@ -18,7 +18,7 @@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ +-datadir = $(prefix)/@DATADIRNAME@ ++datadir = $(prefix)/share + localedir = $(datadir)/locale + gnulocaledir = $(prefix)/share/locale + gettextsrcdir = $(prefix)/share/gettext/po diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile index 4a96f8ffc7e8..12d36108ce3a 100644 --- a/x11-toolkits/gtk13/Makefile +++ b/x11-toolkits/gtk13/Makefile @@ -3,7 +3,7 @@ # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # -# $Id: Makefile,v 1.38 1998/12/30 23:11:36 vanilla Exp $ +# $Id: Makefile,v 1.39 1999/01/01 02:32:05 vanilla Exp $ # DISTNAME= gtk+-1.1.11 @@ -17,7 +17,7 @@ MAINTAINER= vanilla@FreeBSD.ORG BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext -LIB_DEPENDS= glib11d.1:${PORTSDIR}/devel/glib11-devel +LIB_DEPENDS= glib11d.2:${PORTSDIR}/devel/glib11-devel USE_X_PREFIX= yes .include <bsd.port.pre.mk> diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 4a96f8ffc7e8..12d36108ce3a 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -3,7 +3,7 @@ # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # -# $Id: Makefile,v 1.38 1998/12/30 23:11:36 vanilla Exp $ +# $Id: Makefile,v 1.39 1999/01/01 02:32:05 vanilla Exp $ # DISTNAME= gtk+-1.1.11 @@ -17,7 +17,7 @@ MAINTAINER= vanilla@FreeBSD.ORG BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext -LIB_DEPENDS= glib11d.1:${PORTSDIR}/devel/glib11-devel +LIB_DEPENDS= glib11d.2:${PORTSDIR}/devel/glib11-devel USE_X_PREFIX= yes .include <bsd.port.pre.mk> diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 4a96f8ffc7e8..12d36108ce3a 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -3,7 +3,7 @@ # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # -# $Id: Makefile,v 1.38 1998/12/30 23:11:36 vanilla Exp $ +# $Id: Makefile,v 1.39 1999/01/01 02:32:05 vanilla Exp $ # DISTNAME= gtk+-1.1.11 @@ -17,7 +17,7 @@ MAINTAINER= vanilla@FreeBSD.ORG BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext -LIB_DEPENDS= glib11d.1:${PORTSDIR}/devel/glib11-devel +LIB_DEPENDS= glib11d.2:${PORTSDIR}/devel/glib11-devel USE_X_PREFIX= yes .include <bsd.port.pre.mk> diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 729f6990e366..a5080415d9e7 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -3,7 +3,7 @@ # Date created: 17 June 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.19 1998/12/22 07:50:32 asami Exp $ +# $Id: Makefile,v 1.20 1999/01/01 02:47:11 vanilla Exp $ # DISTNAME= gnome-libs-0.99.1 @@ -15,8 +15,7 @@ MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \ MAINTAINER= Nakai@technologist.com BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext -RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext \ - ${PREFIX}/share/gnome/sounds/startup1.wav:${PORTSDIR}/audio/gnomeaudio +RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext LIB_DEPENDS= gdk_imlib.1:${PORTSDIR}/graphics/imlib \ gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel \ tiff.4:${PORTSDIR}/graphics/tiff34 \ diff --git a/x11/gnome-libs/files/patch-aa b/x11/gnome-libs/files/patch-aa index 23d457e24e87..76f17beb6e33 100644 --- a/x11/gnome-libs/files/patch-aa +++ b/x11/gnome-libs/files/patch-aa @@ -1,12 +1,34 @@ --- configure.orig Thu Dec 31 01:51:28 1998 -+++ configure Fri Jan 1 03:48:08 1999 ++++ configure Mon Jan 4 10:02:57 1999 @@ -1,4 +1,4 @@ -#! /bin/sh -+/#! /bin/sh ++#!/bin/sh # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.12 -@@ -5352,8 +5352,8 @@ +@@ -4119,7 +4119,9 @@ + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +- cat > conftest.$ac_ext <<EOF ++ ac_save_LIBS="$LIBS" ++LIBS="-lintl $LIBS" ++cat > conftest.$ac_ext <<EOF + #line 4124 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, +@@ -5297,7 +5299,9 @@ + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +- cat > conftest.$ac_ext <<EOF ++ ac_save_LIBS="$LIBS" ++LIBS="-lutil $LIBS" ++cat > conftest.$ac_ext <<EOF + #line 5302 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, +@@ -5352,8 +5356,8 @@ #include "confdefs.h" #include <stdio.h> @@ -16,7 +38,16 @@ int main() { -@@ -6053,16 +6053,16 @@ +@@ -5799,7 +5803,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-ltiff -lm $LIBS" ++LIBS="-ltiff -ljpeg -lz -lm $LIBS" + cat > conftest.$ac_ext <<EOF + #line 5805 "configure" + #include "confdefs.h" +@@ -6053,16 +6057,16 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -37,7 +68,7 @@ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" { (eval echo configure:6069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -6129,16 +6129,16 @@ +@@ -6129,16 +6133,16 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -58,7 +89,7 @@ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" { (eval echo configure:6145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -8845,7 +8845,7 @@ +@@ -8845,7 +8849,7 @@ ZVT_LIBS="-lzvt $GTK_LIBS" GNOME_LIBDIR='-L${libdir}' diff --git a/x11/gnome-libs/pkg-plist b/x11/gnome-libs/pkg-plist index c3bf35eb0dcb..9134921a6308 100644 --- a/x11/gnome-libs/pkg-plist +++ b/x11/gnome-libs/pkg-plist @@ -222,3 +222,4 @@ share/locale/sv/LC_MESSAGES/gnome-libs.mo @dirrm share/gnome/idl @dirrm share/gnome/mime-info @dirrm share/gnome/pixmaps +@dirrm share/gnome diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile index 729f6990e366..a5080415d9e7 100644 --- a/x11/gnomelibs/Makefile +++ b/x11/gnomelibs/Makefile @@ -3,7 +3,7 @@ # Date created: 17 June 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.19 1998/12/22 07:50:32 asami Exp $ +# $Id: Makefile,v 1.20 1999/01/01 02:47:11 vanilla Exp $ # DISTNAME= gnome-libs-0.99.1 @@ -15,8 +15,7 @@ MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \ MAINTAINER= Nakai@technologist.com BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext -RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext \ - ${PREFIX}/share/gnome/sounds/startup1.wav:${PORTSDIR}/audio/gnomeaudio +RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext LIB_DEPENDS= gdk_imlib.1:${PORTSDIR}/graphics/imlib \ gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel \ tiff.4:${PORTSDIR}/graphics/tiff34 \ diff --git a/x11/gnomelibs/files/patch-aa b/x11/gnomelibs/files/patch-aa index 23d457e24e87..76f17beb6e33 100644 --- a/x11/gnomelibs/files/patch-aa +++ b/x11/gnomelibs/files/patch-aa @@ -1,12 +1,34 @@ --- configure.orig Thu Dec 31 01:51:28 1998 -+++ configure Fri Jan 1 03:48:08 1999 ++++ configure Mon Jan 4 10:02:57 1999 @@ -1,4 +1,4 @@ -#! /bin/sh -+/#! /bin/sh ++#!/bin/sh # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.12 -@@ -5352,8 +5352,8 @@ +@@ -4119,7 +4119,9 @@ + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +- cat > conftest.$ac_ext <<EOF ++ ac_save_LIBS="$LIBS" ++LIBS="-lintl $LIBS" ++cat > conftest.$ac_ext <<EOF + #line 4124 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, +@@ -5297,7 +5299,9 @@ + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +- cat > conftest.$ac_ext <<EOF ++ ac_save_LIBS="$LIBS" ++LIBS="-lutil $LIBS" ++cat > conftest.$ac_ext <<EOF + #line 5302 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, +@@ -5352,8 +5356,8 @@ #include "confdefs.h" #include <stdio.h> @@ -16,7 +38,16 @@ int main() { -@@ -6053,16 +6053,16 @@ +@@ -5799,7 +5803,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-ltiff -lm $LIBS" ++LIBS="-ltiff -ljpeg -lz -lm $LIBS" + cat > conftest.$ac_ext <<EOF + #line 5805 "configure" + #include "confdefs.h" +@@ -6053,16 +6057,16 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -37,7 +68,7 @@ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" { (eval echo configure:6069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -6129,16 +6129,16 @@ +@@ -6129,16 +6133,16 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -58,7 +89,7 @@ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" { (eval echo configure:6145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -8845,7 +8845,7 @@ +@@ -8845,7 +8849,7 @@ ZVT_LIBS="-lzvt $GTK_LIBS" GNOME_LIBDIR='-L${libdir}' diff --git a/x11/gnomelibs/pkg-plist b/x11/gnomelibs/pkg-plist index c3bf35eb0dcb..9134921a6308 100644 --- a/x11/gnomelibs/pkg-plist +++ b/x11/gnomelibs/pkg-plist @@ -222,3 +222,4 @@ share/locale/sv/LC_MESSAGES/gnome-libs.mo @dirrm share/gnome/idl @dirrm share/gnome/mime-info @dirrm share/gnome/pixmaps +@dirrm share/gnome diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 729f6990e366..a5080415d9e7 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -3,7 +3,7 @@ # Date created: 17 June 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.19 1998/12/22 07:50:32 asami Exp $ +# $Id: Makefile,v 1.20 1999/01/01 02:47:11 vanilla Exp $ # DISTNAME= gnome-libs-0.99.1 @@ -15,8 +15,7 @@ MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \ MAINTAINER= Nakai@technologist.com BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext -RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext \ - ${PREFIX}/share/gnome/sounds/startup1.wav:${PORTSDIR}/audio/gnomeaudio +RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext LIB_DEPENDS= gdk_imlib.1:${PORTSDIR}/graphics/imlib \ gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel \ tiff.4:${PORTSDIR}/graphics/tiff34 \ diff --git a/x11/libgnome/files/patch-aa b/x11/libgnome/files/patch-aa index 23d457e24e87..76f17beb6e33 100644 --- a/x11/libgnome/files/patch-aa +++ b/x11/libgnome/files/patch-aa @@ -1,12 +1,34 @@ --- configure.orig Thu Dec 31 01:51:28 1998 -+++ configure Fri Jan 1 03:48:08 1999 ++++ configure Mon Jan 4 10:02:57 1999 @@ -1,4 +1,4 @@ -#! /bin/sh -+/#! /bin/sh ++#!/bin/sh # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.12 -@@ -5352,8 +5352,8 @@ +@@ -4119,7 +4119,9 @@ + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +- cat > conftest.$ac_ext <<EOF ++ ac_save_LIBS="$LIBS" ++LIBS="-lintl $LIBS" ++cat > conftest.$ac_ext <<EOF + #line 4124 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, +@@ -5297,7 +5299,9 @@ + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +- cat > conftest.$ac_ext <<EOF ++ ac_save_LIBS="$LIBS" ++LIBS="-lutil $LIBS" ++cat > conftest.$ac_ext <<EOF + #line 5302 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, +@@ -5352,8 +5356,8 @@ #include "confdefs.h" #include <stdio.h> @@ -16,7 +38,16 @@ int main() { -@@ -6053,16 +6053,16 @@ +@@ -5799,7 +5803,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-ltiff -lm $LIBS" ++LIBS="-ltiff -ljpeg -lz -lm $LIBS" + cat > conftest.$ac_ext <<EOF + #line 5805 "configure" + #include "confdefs.h" +@@ -6053,16 +6057,16 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -37,7 +68,7 @@ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" { (eval echo configure:6069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -6129,16 +6129,16 @@ +@@ -6129,16 +6133,16 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -58,7 +89,7 @@ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" { (eval echo configure:6145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -8845,7 +8845,7 @@ +@@ -8845,7 +8849,7 @@ ZVT_LIBS="-lzvt $GTK_LIBS" GNOME_LIBDIR='-L${libdir}' diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index c3bf35eb0dcb..9134921a6308 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -222,3 +222,4 @@ share/locale/sv/LC_MESSAGES/gnome-libs.mo @dirrm share/gnome/idl @dirrm share/gnome/mime-info @dirrm share/gnome/pixmaps +@dirrm share/gnome |