diff options
| author | Steve Price <steve@FreeBSD.org> | 1999-05-30 04:02:08 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 1999-05-30 04:02:08 +0000 |
| commit | 257a9288996b65ed8b8459f085731c95b3a7b935 (patch) | |
| tree | 47661025fb6cea34d1ef929c498520973a2ce081 | |
| parent | c66dec465e11ca22f53cbb797dcd27c40d34b817 (diff) | |
| download | ports-257a9288996b65ed8b8459f085731c95b3a7b935.tar.gz ports-257a9288996b65ed8b8459f085731c95b3a7b935.zip | |
Notes
54 files changed, 423 insertions, 499 deletions
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index a49329c950a7..834fdf287a93 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -3,7 +3,7 @@ # Date created: 03 July 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.15 1999/04/08 18:08:32 steve Exp $ +# $Id: Makefile,v 1.16 1999/05/09 17:06:20 steve Exp $ # DISTNAME= gnome-games-1.0.2 @@ -17,17 +17,16 @@ MAINTAINER= nacai@iname.com BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_X_PREFIX= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ - --with-gnome=${X11BASE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" - -post-install: - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib + --with-gnome=${PREFIX} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + GTK_CONFIG="${GTK_CONFIG}" \ + LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/games/gnome-games/files/patch-ab b/games/gnome-games/files/patch-ab index de972c331051..a0f6935380e5 100644 --- a/games/gnome-games/files/patch-ab +++ b/games/gnome-games/files/patch-ab @@ -142,7 +142,7 @@ CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = --- gnome-stones/Makefile.in.orig Mon Mar 1 02:50:55 1999 -+++ gnome-stones/Makefile.in Wed Mar 3 00:33:00 1999 ++++ gnome-stones/Makefile.in Wed Mar 3 00:33:00 1999 @@ -125,12 +125,12 @@ SUBDIRS = objects graphics @@ -181,16 +181,16 @@ object_LTLIBRARIES = libgnome-stones.la libgnomekoban.la -@@ -142,10 +142,10 @@ +@@ -143,10 +143,10 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../.. LIBS = @LIBS@ -libgnome_stones_la_LDFLAGS = -+libgnome_stones_la_LDFLAGS = --export-dynamic ++libgnome_stones_la_LDFLAGS = -avoid-version libgnome_stones_la_LIBADD = libgnome_stones_la_OBJECTS = gnome-stones.lo -libgnomekoban_la_LDFLAGS = -+libgnomekoban_la_LDFLAGS = --export-dynamic ++libgnomekoban_la_LDFLAGS = -avoid-version libgnomekoban_la_LIBADD = libgnomekoban_la_OBJECTS = gnomekoban.lo COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist index 2febe8cfa4e4..419803d9cd85 100644 --- a/games/gnome-games/pkg-plist +++ b/games/gnome-games/pkg-plist @@ -19,7 +19,6 @@ etc/sound/events/gnobots2.soundlist etc/sound/events/iagno.soundlist include/gdkcardimage/gdk-card-image.h lib/libgdkcardimage.a -lib/libgdkcardimage.la lib/libgdkcardimage.so lib/libgdkcardimage.so.1 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib @@ -114,14 +113,8 @@ share/gnome/gnome-stones/default.caves share/gnome/gnome-stones/gnome-stonesrc share/gnome/gnome-stones/gnome-stonesrc.ko share/gnome/gnome-stones/gnomekoban.caves -share/gnome/gnome-stones/objects/libgnome-stones.a -share/gnome/gnome-stones/objects/libgnome-stones.la share/gnome/gnome-stones/objects/libgnome-stones.so -share/gnome/gnome-stones/objects/libgnome-stones.so.0 -share/gnome/gnome-stones/objects/libgnomekoban.a -share/gnome/gnome-stones/objects/libgnomekoban.la share/gnome/gnome-stones/objects/libgnomekoban.so -share/gnome/gnome-stones/objects/libgnomekoban.so.0 share/gnome/gnome-stones/tutorial.caves share/gnome/gturing/examples/3ones2zeroes.tur share/gnome/gturing/examples/add.tur @@ -258,8 +251,8 @@ share/gnome/pixmaps/cards/suits_medium/xpat-21x21.png share/gnome/pixmaps/cards/suits_small/knuth-09x10.png share/gnome/pixmaps/cards/suits_small/xpat-11x11.png share/gnome/pixmaps/cards/suits_small/xpat-15x15.png -share/gnome/pixmaps/gnibbles/gnibbles.png share/gnome/pixmaps/gnibbles/gnibbles-logo.png +share/gnome/pixmaps/gnibbles/gnibbles.png share/gnome/pixmaps/gnobots/aieee.png share/gnome/pixmaps/gnobots/cows.png share/gnome/pixmaps/gnobots/eggs.png @@ -284,8 +277,8 @@ share/gnome/pixmaps/gnome-gtali.png share/gnome/pixmaps/gnome-gtetris.png share/gnome/pixmaps/gnome-mahjongg.png share/gnome/pixmaps/gnome-metatris.png -share/gnome/pixmaps/gnome-stones.png share/gnome/pixmaps/gnome-stones-file.png +share/gnome/pixmaps/gnome-stones.png share/gnome/pixmaps/gnome-stones/amoeba.png share/gnome/pixmaps/gnome-stones/boulder.png share/gnome/pixmaps/gnome-stones/butterfly.png diff --git a/games/gnomegames/Makefile b/games/gnomegames/Makefile index a49329c950a7..834fdf287a93 100644 --- a/games/gnomegames/Makefile +++ b/games/gnomegames/Makefile @@ -3,7 +3,7 @@ # Date created: 03 July 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.15 1999/04/08 18:08:32 steve Exp $ +# $Id: Makefile,v 1.16 1999/05/09 17:06:20 steve Exp $ # DISTNAME= gnome-games-1.0.2 @@ -17,17 +17,16 @@ MAINTAINER= nacai@iname.com BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_X_PREFIX= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ - --with-gnome=${X11BASE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" - -post-install: - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib + --with-gnome=${PREFIX} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + GTK_CONFIG="${GTK_CONFIG}" \ + LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/games/gnomegames/files/patch-ab b/games/gnomegames/files/patch-ab index de972c331051..a0f6935380e5 100644 --- a/games/gnomegames/files/patch-ab +++ b/games/gnomegames/files/patch-ab @@ -142,7 +142,7 @@ CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = --- gnome-stones/Makefile.in.orig Mon Mar 1 02:50:55 1999 -+++ gnome-stones/Makefile.in Wed Mar 3 00:33:00 1999 ++++ gnome-stones/Makefile.in Wed Mar 3 00:33:00 1999 @@ -125,12 +125,12 @@ SUBDIRS = objects graphics @@ -181,16 +181,16 @@ object_LTLIBRARIES = libgnome-stones.la libgnomekoban.la -@@ -142,10 +142,10 @@ +@@ -143,10 +143,10 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../.. LIBS = @LIBS@ -libgnome_stones_la_LDFLAGS = -+libgnome_stones_la_LDFLAGS = --export-dynamic ++libgnome_stones_la_LDFLAGS = -avoid-version libgnome_stones_la_LIBADD = libgnome_stones_la_OBJECTS = gnome-stones.lo -libgnomekoban_la_LDFLAGS = -+libgnomekoban_la_LDFLAGS = --export-dynamic ++libgnomekoban_la_LDFLAGS = -avoid-version libgnomekoban_la_LIBADD = libgnomekoban_la_OBJECTS = gnomekoban.lo COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/games/gnomegames/pkg-plist b/games/gnomegames/pkg-plist index 2febe8cfa4e4..419803d9cd85 100644 --- a/games/gnomegames/pkg-plist +++ b/games/gnomegames/pkg-plist @@ -19,7 +19,6 @@ etc/sound/events/gnobots2.soundlist etc/sound/events/iagno.soundlist include/gdkcardimage/gdk-card-image.h lib/libgdkcardimage.a -lib/libgdkcardimage.la lib/libgdkcardimage.so lib/libgdkcardimage.so.1 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib @@ -114,14 +113,8 @@ share/gnome/gnome-stones/default.caves share/gnome/gnome-stones/gnome-stonesrc share/gnome/gnome-stones/gnome-stonesrc.ko share/gnome/gnome-stones/gnomekoban.caves -share/gnome/gnome-stones/objects/libgnome-stones.a -share/gnome/gnome-stones/objects/libgnome-stones.la share/gnome/gnome-stones/objects/libgnome-stones.so -share/gnome/gnome-stones/objects/libgnome-stones.so.0 -share/gnome/gnome-stones/objects/libgnomekoban.a -share/gnome/gnome-stones/objects/libgnomekoban.la share/gnome/gnome-stones/objects/libgnomekoban.so -share/gnome/gnome-stones/objects/libgnomekoban.so.0 share/gnome/gnome-stones/tutorial.caves share/gnome/gturing/examples/3ones2zeroes.tur share/gnome/gturing/examples/add.tur @@ -258,8 +251,8 @@ share/gnome/pixmaps/cards/suits_medium/xpat-21x21.png share/gnome/pixmaps/cards/suits_small/knuth-09x10.png share/gnome/pixmaps/cards/suits_small/xpat-11x11.png share/gnome/pixmaps/cards/suits_small/xpat-15x15.png -share/gnome/pixmaps/gnibbles/gnibbles.png share/gnome/pixmaps/gnibbles/gnibbles-logo.png +share/gnome/pixmaps/gnibbles/gnibbles.png share/gnome/pixmaps/gnobots/aieee.png share/gnome/pixmaps/gnobots/cows.png share/gnome/pixmaps/gnobots/eggs.png @@ -284,8 +277,8 @@ share/gnome/pixmaps/gnome-gtali.png share/gnome/pixmaps/gnome-gtetris.png share/gnome/pixmaps/gnome-mahjongg.png share/gnome/pixmaps/gnome-metatris.png -share/gnome/pixmaps/gnome-stones.png share/gnome/pixmaps/gnome-stones-file.png +share/gnome/pixmaps/gnome-stones.png share/gnome/pixmaps/gnome-stones/amoeba.png share/gnome/pixmaps/gnome-stones/boulder.png share/gnome/pixmaps/gnome-stones/butterfly.png diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile index a49329c950a7..834fdf287a93 100644 --- a/games/gnomegames2/Makefile +++ b/games/gnomegames2/Makefile @@ -3,7 +3,7 @@ # Date created: 03 July 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.15 1999/04/08 18:08:32 steve Exp $ +# $Id: Makefile,v 1.16 1999/05/09 17:06:20 steve Exp $ # DISTNAME= gnome-games-1.0.2 @@ -17,17 +17,16 @@ MAINTAINER= nacai@iname.com BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_X_PREFIX= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ - --with-gnome=${X11BASE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" - -post-install: - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib + --with-gnome=${PREFIX} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + GTK_CONFIG="${GTK_CONFIG}" \ + LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/games/gnomegames2/files/patch-ab b/games/gnomegames2/files/patch-ab index de972c331051..a0f6935380e5 100644 --- a/games/gnomegames2/files/patch-ab +++ b/games/gnomegames2/files/patch-ab @@ -142,7 +142,7 @@ CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = --- gnome-stones/Makefile.in.orig Mon Mar 1 02:50:55 1999 -+++ gnome-stones/Makefile.in Wed Mar 3 00:33:00 1999 ++++ gnome-stones/Makefile.in Wed Mar 3 00:33:00 1999 @@ -125,12 +125,12 @@ SUBDIRS = objects graphics @@ -181,16 +181,16 @@ object_LTLIBRARIES = libgnome-stones.la libgnomekoban.la -@@ -142,10 +142,10 @@ +@@ -143,10 +143,10 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../.. LIBS = @LIBS@ -libgnome_stones_la_LDFLAGS = -+libgnome_stones_la_LDFLAGS = --export-dynamic ++libgnome_stones_la_LDFLAGS = -avoid-version libgnome_stones_la_LIBADD = libgnome_stones_la_OBJECTS = gnome-stones.lo -libgnomekoban_la_LDFLAGS = -+libgnomekoban_la_LDFLAGS = --export-dynamic ++libgnomekoban_la_LDFLAGS = -avoid-version libgnomekoban_la_LIBADD = libgnomekoban_la_OBJECTS = gnomekoban.lo COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist index 2febe8cfa4e4..419803d9cd85 100644 --- a/games/gnomegames2/pkg-plist +++ b/games/gnomegames2/pkg-plist @@ -19,7 +19,6 @@ etc/sound/events/gnobots2.soundlist etc/sound/events/iagno.soundlist include/gdkcardimage/gdk-card-image.h lib/libgdkcardimage.a -lib/libgdkcardimage.la lib/libgdkcardimage.so lib/libgdkcardimage.so.1 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib @@ -114,14 +113,8 @@ share/gnome/gnome-stones/default.caves share/gnome/gnome-stones/gnome-stonesrc share/gnome/gnome-stones/gnome-stonesrc.ko share/gnome/gnome-stones/gnomekoban.caves -share/gnome/gnome-stones/objects/libgnome-stones.a -share/gnome/gnome-stones/objects/libgnome-stones.la share/gnome/gnome-stones/objects/libgnome-stones.so -share/gnome/gnome-stones/objects/libgnome-stones.so.0 -share/gnome/gnome-stones/objects/libgnomekoban.a -share/gnome/gnome-stones/objects/libgnomekoban.la share/gnome/gnome-stones/objects/libgnomekoban.so -share/gnome/gnome-stones/objects/libgnomekoban.so.0 share/gnome/gnome-stones/tutorial.caves share/gnome/gturing/examples/3ones2zeroes.tur share/gnome/gturing/examples/add.tur @@ -258,8 +251,8 @@ share/gnome/pixmaps/cards/suits_medium/xpat-21x21.png share/gnome/pixmaps/cards/suits_small/knuth-09x10.png share/gnome/pixmaps/cards/suits_small/xpat-11x11.png share/gnome/pixmaps/cards/suits_small/xpat-15x15.png -share/gnome/pixmaps/gnibbles/gnibbles.png share/gnome/pixmaps/gnibbles/gnibbles-logo.png +share/gnome/pixmaps/gnibbles/gnibbles.png share/gnome/pixmaps/gnobots/aieee.png share/gnome/pixmaps/gnobots/cows.png share/gnome/pixmaps/gnobots/eggs.png @@ -284,8 +277,8 @@ share/gnome/pixmaps/gnome-gtali.png share/gnome/pixmaps/gnome-gtetris.png share/gnome/pixmaps/gnome-mahjongg.png share/gnome/pixmaps/gnome-metatris.png -share/gnome/pixmaps/gnome-stones.png share/gnome/pixmaps/gnome-stones-file.png +share/gnome/pixmaps/gnome-stones.png share/gnome/pixmaps/gnome-stones/amoeba.png share/gnome/pixmaps/gnome-stones/boulder.png share/gnome/pixmaps/gnome-stones/butterfly.png diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index cb7f6b440649..389fb83a011d 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -3,7 +3,7 @@ # Date created: 29 Dec 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.9 1999/04/08 18:08:37 steve Exp $ +# $Id: Makefile,v 1.10 1999/05/09 17:03:26 steve Exp $ # DISTNAME= control-center-1.0.5 @@ -17,19 +17,16 @@ MAINTAINER= vanilla@FreeBSD.ORG BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -USE_LIBTOOL= yes -LIBTOOL= ${LOCALBASE}/bin/libtool +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_X_PREFIX= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ - --with-gnome=${X11BASE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" - -post-install: - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib + --with-gnome=${PREFIX} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + GTK_CONFIG="${GTK_CONFIG}" \ + LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/sysutils/gnome-control-center/files/patch-ce b/sysutils/gnome-control-center/files/patch-ce new file mode 100644 index 000000000000..b2186ac89c4c --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-ce @@ -0,0 +1,8 @@ +--- capplets/wm-properties/wm-desktops/WindowMaker.desktop.orig Wed May 12 02:56:05 1999 ++++ capplets/wm-properties/wm-desktops/WindowMaker.desktop Wed May 12 02:56:22 1999 +@@ -5,4 +5,4 @@ + + [Window Manager] + SessionManaged=false +-ConfigExec=/usr/X11R6/lib/GNUstep/Apps/WPrefs.app/WPrefs ++ConfigExec=/usr/X11R6/share/GNUstep/Apps/WPrefs.app/WPrefs diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index f774ce748543..6a93bd2f79c5 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -3,6 +3,7 @@ bin/bell-properties-capplet bin/gnome-edit-properties-capplet bin/gnomecc bin/keyboard-properties +bin/mime-type-capplet bin/mouse-properties-capplet bin/screensaver-properties-capplet bin/session-properties-capplet @@ -15,7 +16,6 @@ etc/CORBA/servers/gnomecc.gnorba etc/cappletConf.sh include/capplet-widget.h lib/libcapplet.a -lib/libcapplet.la lib/libcapplet.so lib/libcapplet.so.1.0 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @@ -25,22 +25,19 @@ share/gnome/apps/Settings/Desktop/background-properties.desktop share/gnome/apps/Settings/Desktop/screensaver-properties.desktop share/gnome/apps/Settings/Desktop/theme-selector.desktop share/gnome/apps/Settings/Desktop/wm-properties.desktop -@dirrm share/gnome/apps/Settings/Desktop share/gnome/apps/Settings/Multimedia/.directory share/gnome/apps/Settings/Multimedia/bell-properties.desktop share/gnome/apps/Settings/Multimedia/sound-properties.desktop -@dirrm share/gnome/apps/Settings/Multimedia share/gnome/apps/Settings/Peripherals/.directory share/gnome/apps/Settings/Peripherals/keyboard-properties.desktop share/gnome/apps/Settings/Peripherals/mouse-properties.desktop -@dirrm share/gnome/apps/Settings/Peripherals share/gnome/apps/Settings/UIOptions/.directory share/gnome/apps/Settings/UIOptions/application.desktop share/gnome/apps/Settings/UIOptions/dialogs.desktop share/gnome/apps/Settings/UIOptions/mdi.desktop -@dirrm share/gnome/apps/Settings/UIOptions share/gnome/apps/Settings/gnome-edit-properties.desktop share/gnome/apps/Settings/gnomecc.desktop +share/gnome/apps/Settings/mime-type.desktop share/gnome/apps/Settings/session-properties.desktop share/gnome/apps/Settings/url-properties.desktop share/gnome/control-center/.data/3d.desktop @@ -149,31 +146,26 @@ share/gnome/control-center/.data/lisa.png share/gnome/control-center/.data/maze.png share/gnome/control-center/.data/qix.png share/gnome/control-center/.data/starfish.png -@dirrm share/gnome/control-center/.data share/gnome/control-center/.directory share/gnome/control-center/Desktop/.directory share/gnome/control-center/Desktop/background-properties.desktop share/gnome/control-center/Desktop/screensaver-properties.desktop share/gnome/control-center/Desktop/theme-selector.desktop share/gnome/control-center/Desktop/wm-properties.desktop -@dirrm share/gnome/control-center/Desktop share/gnome/control-center/Multimedia/.directory share/gnome/control-center/Multimedia/bell-properties.desktop share/gnome/control-center/Multimedia/sound-properties.desktop -@dirrm share/gnome/control-center/Multimedia share/gnome/control-center/Peripherals/.directory share/gnome/control-center/Peripherals/keyboard-properties.desktop share/gnome/control-center/Peripherals/mouse-properties.desktop -@dirrm share/gnome/control-center/Peripherals share/gnome/control-center/UIOptions/.directory share/gnome/control-center/UIOptions/application.desktop share/gnome/control-center/UIOptions/dialogs.desktop share/gnome/control-center/UIOptions/mdi.desktop -@dirrm share/gnome/control-center/UIOptions share/gnome/control-center/gnome-edit-properties.desktop +share/gnome/control-center/mime-type.desktop share/gnome/control-center/session-properties.desktop share/gnome/control-center/url-properties.desktop -@dirrm share/gnome/control-center share/gnome/idl/control-center.idl share/gnome/pixmaps/control-center.png share/gnome/wm-properties/Enlightenment.desktop @@ -195,3 +187,14 @@ share/locale/pl/LC_MESSAGES/control-center.mo share/locale/pt/LC_MESSAGES/control-center.mo share/locale/ru/LC_MESSAGES/control-center.mo share/locale/sv/LC_MESSAGES/control-center.mo +@dirrm share/gnome/wm-properties +@dirrm share/gnome/control-center/UIOptions +@dirrm share/gnome/control-center/Peripherals +@dirrm share/gnome/control-center/Multimedia +@dirrm share/gnome/control-center/Desktop +@dirrm share/gnome/control-center/.data +@dirrm share/gnome/control-center +@dirrm share/gnome/apps/Settings/UIOptions +@dirrm share/gnome/apps/Settings/Peripherals +@dirrm share/gnome/apps/Settings/Multimedia +@dirrm share/gnome/apps/Settings/Desktop diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile index cb7f6b440649..389fb83a011d 100644 --- a/sysutils/gnome-control-center1/Makefile +++ b/sysutils/gnome-control-center1/Makefile @@ -3,7 +3,7 @@ # Date created: 29 Dec 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.9 1999/04/08 18:08:37 steve Exp $ +# $Id: Makefile,v 1.10 1999/05/09 17:03:26 steve Exp $ # DISTNAME= control-center-1.0.5 @@ -17,19 +17,16 @@ MAINTAINER= vanilla@FreeBSD.ORG BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -USE_LIBTOOL= yes -LIBTOOL= ${LOCALBASE}/bin/libtool +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_X_PREFIX= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ - --with-gnome=${X11BASE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" - -post-install: - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib + --with-gnome=${PREFIX} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + GTK_CONFIG="${GTK_CONFIG}" \ + LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/sysutils/gnome-control-center1/files/patch-ce b/sysutils/gnome-control-center1/files/patch-ce new file mode 100644 index 000000000000..b2186ac89c4c --- /dev/null +++ b/sysutils/gnome-control-center1/files/patch-ce @@ -0,0 +1,8 @@ +--- capplets/wm-properties/wm-desktops/WindowMaker.desktop.orig Wed May 12 02:56:05 1999 ++++ capplets/wm-properties/wm-desktops/WindowMaker.desktop Wed May 12 02:56:22 1999 +@@ -5,4 +5,4 @@ + + [Window Manager] + SessionManaged=false +-ConfigExec=/usr/X11R6/lib/GNUstep/Apps/WPrefs.app/WPrefs ++ConfigExec=/usr/X11R6/share/GNUstep/Apps/WPrefs.app/WPrefs diff --git a/sysutils/gnome-control-center1/pkg-plist b/sysutils/gnome-control-center1/pkg-plist index f774ce748543..6a93bd2f79c5 100644 --- a/sysutils/gnome-control-center1/pkg-plist +++ b/sysutils/gnome-control-center1/pkg-plist @@ -3,6 +3,7 @@ bin/bell-properties-capplet bin/gnome-edit-properties-capplet bin/gnomecc bin/keyboard-properties +bin/mime-type-capplet bin/mouse-properties-capplet bin/screensaver-properties-capplet bin/session-properties-capplet @@ -15,7 +16,6 @@ etc/CORBA/servers/gnomecc.gnorba etc/cappletConf.sh include/capplet-widget.h lib/libcapplet.a -lib/libcapplet.la lib/libcapplet.so lib/libcapplet.so.1.0 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @@ -25,22 +25,19 @@ share/gnome/apps/Settings/Desktop/background-properties.desktop share/gnome/apps/Settings/Desktop/screensaver-properties.desktop share/gnome/apps/Settings/Desktop/theme-selector.desktop share/gnome/apps/Settings/Desktop/wm-properties.desktop -@dirrm share/gnome/apps/Settings/Desktop share/gnome/apps/Settings/Multimedia/.directory share/gnome/apps/Settings/Multimedia/bell-properties.desktop share/gnome/apps/Settings/Multimedia/sound-properties.desktop -@dirrm share/gnome/apps/Settings/Multimedia share/gnome/apps/Settings/Peripherals/.directory share/gnome/apps/Settings/Peripherals/keyboard-properties.desktop share/gnome/apps/Settings/Peripherals/mouse-properties.desktop -@dirrm share/gnome/apps/Settings/Peripherals share/gnome/apps/Settings/UIOptions/.directory share/gnome/apps/Settings/UIOptions/application.desktop share/gnome/apps/Settings/UIOptions/dialogs.desktop share/gnome/apps/Settings/UIOptions/mdi.desktop -@dirrm share/gnome/apps/Settings/UIOptions share/gnome/apps/Settings/gnome-edit-properties.desktop share/gnome/apps/Settings/gnomecc.desktop +share/gnome/apps/Settings/mime-type.desktop share/gnome/apps/Settings/session-properties.desktop share/gnome/apps/Settings/url-properties.desktop share/gnome/control-center/.data/3d.desktop @@ -149,31 +146,26 @@ share/gnome/control-center/.data/lisa.png share/gnome/control-center/.data/maze.png share/gnome/control-center/.data/qix.png share/gnome/control-center/.data/starfish.png -@dirrm share/gnome/control-center/.data share/gnome/control-center/.directory share/gnome/control-center/Desktop/.directory share/gnome/control-center/Desktop/background-properties.desktop share/gnome/control-center/Desktop/screensaver-properties.desktop share/gnome/control-center/Desktop/theme-selector.desktop share/gnome/control-center/Desktop/wm-properties.desktop -@dirrm share/gnome/control-center/Desktop share/gnome/control-center/Multimedia/.directory share/gnome/control-center/Multimedia/bell-properties.desktop share/gnome/control-center/Multimedia/sound-properties.desktop -@dirrm share/gnome/control-center/Multimedia share/gnome/control-center/Peripherals/.directory share/gnome/control-center/Peripherals/keyboard-properties.desktop share/gnome/control-center/Peripherals/mouse-properties.desktop -@dirrm share/gnome/control-center/Peripherals share/gnome/control-center/UIOptions/.directory share/gnome/control-center/UIOptions/application.desktop share/gnome/control-center/UIOptions/dialogs.desktop share/gnome/control-center/UIOptions/mdi.desktop -@dirrm share/gnome/control-center/UIOptions share/gnome/control-center/gnome-edit-properties.desktop +share/gnome/control-center/mime-type.desktop share/gnome/control-center/session-properties.desktop share/gnome/control-center/url-properties.desktop -@dirrm share/gnome/control-center share/gnome/idl/control-center.idl share/gnome/pixmaps/control-center.png share/gnome/wm-properties/Enlightenment.desktop @@ -195,3 +187,14 @@ share/locale/pl/LC_MESSAGES/control-center.mo share/locale/pt/LC_MESSAGES/control-center.mo share/locale/ru/LC_MESSAGES/control-center.mo share/locale/sv/LC_MESSAGES/control-center.mo +@dirrm share/gnome/wm-properties +@dirrm share/gnome/control-center/UIOptions +@dirrm share/gnome/control-center/Peripherals +@dirrm share/gnome/control-center/Multimedia +@dirrm share/gnome/control-center/Desktop +@dirrm share/gnome/control-center/.data +@dirrm share/gnome/control-center +@dirrm share/gnome/apps/Settings/UIOptions +@dirrm share/gnome/apps/Settings/Peripherals +@dirrm share/gnome/apps/Settings/Multimedia +@dirrm share/gnome/apps/Settings/Desktop diff --git a/sysutils/gnomecontrolcenter/Makefile b/sysutils/gnomecontrolcenter/Makefile index cb7f6b440649..389fb83a011d 100644 --- a/sysutils/gnomecontrolcenter/Makefile +++ b/sysutils/gnomecontrolcenter/Makefile @@ -3,7 +3,7 @@ # Date created: 29 Dec 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.9 1999/04/08 18:08:37 steve Exp $ +# $Id: Makefile,v 1.10 1999/05/09 17:03:26 steve Exp $ # DISTNAME= control-center-1.0.5 @@ -17,19 +17,16 @@ MAINTAINER= vanilla@FreeBSD.ORG BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -USE_LIBTOOL= yes -LIBTOOL= ${LOCALBASE}/bin/libtool +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_X_PREFIX= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ - --with-gnome=${X11BASE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" - -post-install: - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib + --with-gnome=${PREFIX} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + GTK_CONFIG="${GTK_CONFIG}" \ + LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/sysutils/gnomecontrolcenter/files/patch-ce b/sysutils/gnomecontrolcenter/files/patch-ce new file mode 100644 index 000000000000..b2186ac89c4c --- /dev/null +++ b/sysutils/gnomecontrolcenter/files/patch-ce @@ -0,0 +1,8 @@ +--- capplets/wm-properties/wm-desktops/WindowMaker.desktop.orig Wed May 12 02:56:05 1999 ++++ capplets/wm-properties/wm-desktops/WindowMaker.desktop Wed May 12 02:56:22 1999 +@@ -5,4 +5,4 @@ + + [Window Manager] + SessionManaged=false +-ConfigExec=/usr/X11R6/lib/GNUstep/Apps/WPrefs.app/WPrefs ++ConfigExec=/usr/X11R6/share/GNUstep/Apps/WPrefs.app/WPrefs diff --git a/sysutils/gnomecontrolcenter/pkg-plist b/sysutils/gnomecontrolcenter/pkg-plist index f774ce748543..6a93bd2f79c5 100644 --- a/sysutils/gnomecontrolcenter/pkg-plist +++ b/sysutils/gnomecontrolcenter/pkg-plist @@ -3,6 +3,7 @@ bin/bell-properties-capplet bin/gnome-edit-properties-capplet bin/gnomecc bin/keyboard-properties +bin/mime-type-capplet bin/mouse-properties-capplet bin/screensaver-properties-capplet bin/session-properties-capplet @@ -15,7 +16,6 @@ etc/CORBA/servers/gnomecc.gnorba etc/cappletConf.sh include/capplet-widget.h lib/libcapplet.a -lib/libcapplet.la lib/libcapplet.so lib/libcapplet.so.1.0 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @@ -25,22 +25,19 @@ share/gnome/apps/Settings/Desktop/background-properties.desktop share/gnome/apps/Settings/Desktop/screensaver-properties.desktop share/gnome/apps/Settings/Desktop/theme-selector.desktop share/gnome/apps/Settings/Desktop/wm-properties.desktop -@dirrm share/gnome/apps/Settings/Desktop share/gnome/apps/Settings/Multimedia/.directory share/gnome/apps/Settings/Multimedia/bell-properties.desktop share/gnome/apps/Settings/Multimedia/sound-properties.desktop -@dirrm share/gnome/apps/Settings/Multimedia share/gnome/apps/Settings/Peripherals/.directory share/gnome/apps/Settings/Peripherals/keyboard-properties.desktop share/gnome/apps/Settings/Peripherals/mouse-properties.desktop -@dirrm share/gnome/apps/Settings/Peripherals share/gnome/apps/Settings/UIOptions/.directory share/gnome/apps/Settings/UIOptions/application.desktop share/gnome/apps/Settings/UIOptions/dialogs.desktop share/gnome/apps/Settings/UIOptions/mdi.desktop -@dirrm share/gnome/apps/Settings/UIOptions share/gnome/apps/Settings/gnome-edit-properties.desktop share/gnome/apps/Settings/gnomecc.desktop +share/gnome/apps/Settings/mime-type.desktop share/gnome/apps/Settings/session-properties.desktop share/gnome/apps/Settings/url-properties.desktop share/gnome/control-center/.data/3d.desktop @@ -149,31 +146,26 @@ share/gnome/control-center/.data/lisa.png share/gnome/control-center/.data/maze.png share/gnome/control-center/.data/qix.png share/gnome/control-center/.data/starfish.png -@dirrm share/gnome/control-center/.data share/gnome/control-center/.directory share/gnome/control-center/Desktop/.directory share/gnome/control-center/Desktop/background-properties.desktop share/gnome/control-center/Desktop/screensaver-properties.desktop share/gnome/control-center/Desktop/theme-selector.desktop share/gnome/control-center/Desktop/wm-properties.desktop -@dirrm share/gnome/control-center/Desktop share/gnome/control-center/Multimedia/.directory share/gnome/control-center/Multimedia/bell-properties.desktop share/gnome/control-center/Multimedia/sound-properties.desktop -@dirrm share/gnome/control-center/Multimedia share/gnome/control-center/Peripherals/.directory share/gnome/control-center/Peripherals/keyboard-properties.desktop share/gnome/control-center/Peripherals/mouse-properties.desktop -@dirrm share/gnome/control-center/Peripherals share/gnome/control-center/UIOptions/.directory share/gnome/control-center/UIOptions/application.desktop share/gnome/control-center/UIOptions/dialogs.desktop share/gnome/control-center/UIOptions/mdi.desktop -@dirrm share/gnome/control-center/UIOptions share/gnome/control-center/gnome-edit-properties.desktop +share/gnome/control-center/mime-type.desktop share/gnome/control-center/session-properties.desktop share/gnome/control-center/url-properties.desktop -@dirrm share/gnome/control-center share/gnome/idl/control-center.idl share/gnome/pixmaps/control-center.png share/gnome/wm-properties/Enlightenment.desktop @@ -195,3 +187,14 @@ share/locale/pl/LC_MESSAGES/control-center.mo share/locale/pt/LC_MESSAGES/control-center.mo share/locale/ru/LC_MESSAGES/control-center.mo share/locale/sv/LC_MESSAGES/control-center.mo +@dirrm share/gnome/wm-properties +@dirrm share/gnome/control-center/UIOptions +@dirrm share/gnome/control-center/Peripherals +@dirrm share/gnome/control-center/Multimedia +@dirrm share/gnome/control-center/Desktop +@dirrm share/gnome/control-center/.data +@dirrm share/gnome/control-center +@dirrm share/gnome/apps/Settings/UIOptions +@dirrm share/gnome/apps/Settings/Peripherals +@dirrm share/gnome/apps/Settings/Multimedia +@dirrm share/gnome/apps/Settings/Desktop diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile index cb7f6b440649..389fb83a011d 100644 --- a/sysutils/gnomecontrolcenter2/Makefile +++ b/sysutils/gnomecontrolcenter2/Makefile @@ -3,7 +3,7 @@ # Date created: 29 Dec 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.9 1999/04/08 18:08:37 steve Exp $ +# $Id: Makefile,v 1.10 1999/05/09 17:03:26 steve Exp $ # DISTNAME= control-center-1.0.5 @@ -17,19 +17,16 @@ MAINTAINER= vanilla@FreeBSD.ORG BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -USE_LIBTOOL= yes -LIBTOOL= ${LOCALBASE}/bin/libtool +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_X_PREFIX= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ - --with-gnome=${X11BASE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" - -post-install: - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib + --with-gnome=${PREFIX} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + GTK_CONFIG="${GTK_CONFIG}" \ + LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/sysutils/gnomecontrolcenter2/files/patch-ce b/sysutils/gnomecontrolcenter2/files/patch-ce new file mode 100644 index 000000000000..b2186ac89c4c --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-ce @@ -0,0 +1,8 @@ +--- capplets/wm-properties/wm-desktops/WindowMaker.desktop.orig Wed May 12 02:56:05 1999 ++++ capplets/wm-properties/wm-desktops/WindowMaker.desktop Wed May 12 02:56:22 1999 +@@ -5,4 +5,4 @@ + + [Window Manager] + SessionManaged=false +-ConfigExec=/usr/X11R6/lib/GNUstep/Apps/WPrefs.app/WPrefs ++ConfigExec=/usr/X11R6/share/GNUstep/Apps/WPrefs.app/WPrefs diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist index f774ce748543..6a93bd2f79c5 100644 --- a/sysutils/gnomecontrolcenter2/pkg-plist +++ b/sysutils/gnomecontrolcenter2/pkg-plist @@ -3,6 +3,7 @@ bin/bell-properties-capplet bin/gnome-edit-properties-capplet bin/gnomecc bin/keyboard-properties +bin/mime-type-capplet bin/mouse-properties-capplet bin/screensaver-properties-capplet bin/session-properties-capplet @@ -15,7 +16,6 @@ etc/CORBA/servers/gnomecc.gnorba etc/cappletConf.sh include/capplet-widget.h lib/libcapplet.a -lib/libcapplet.la lib/libcapplet.so lib/libcapplet.so.1.0 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @@ -25,22 +25,19 @@ share/gnome/apps/Settings/Desktop/background-properties.desktop share/gnome/apps/Settings/Desktop/screensaver-properties.desktop share/gnome/apps/Settings/Desktop/theme-selector.desktop share/gnome/apps/Settings/Desktop/wm-properties.desktop -@dirrm share/gnome/apps/Settings/Desktop share/gnome/apps/Settings/Multimedia/.directory share/gnome/apps/Settings/Multimedia/bell-properties.desktop share/gnome/apps/Settings/Multimedia/sound-properties.desktop -@dirrm share/gnome/apps/Settings/Multimedia share/gnome/apps/Settings/Peripherals/.directory share/gnome/apps/Settings/Peripherals/keyboard-properties.desktop share/gnome/apps/Settings/Peripherals/mouse-properties.desktop -@dirrm share/gnome/apps/Settings/Peripherals share/gnome/apps/Settings/UIOptions/.directory share/gnome/apps/Settings/UIOptions/application.desktop share/gnome/apps/Settings/UIOptions/dialogs.desktop share/gnome/apps/Settings/UIOptions/mdi.desktop -@dirrm share/gnome/apps/Settings/UIOptions share/gnome/apps/Settings/gnome-edit-properties.desktop share/gnome/apps/Settings/gnomecc.desktop +share/gnome/apps/Settings/mime-type.desktop share/gnome/apps/Settings/session-properties.desktop share/gnome/apps/Settings/url-properties.desktop share/gnome/control-center/.data/3d.desktop @@ -149,31 +146,26 @@ share/gnome/control-center/.data/lisa.png share/gnome/control-center/.data/maze.png share/gnome/control-center/.data/qix.png share/gnome/control-center/.data/starfish.png -@dirrm share/gnome/control-center/.data share/gnome/control-center/.directory share/gnome/control-center/Desktop/.directory share/gnome/control-center/Desktop/background-properties.desktop share/gnome/control-center/Desktop/screensaver-properties.desktop share/gnome/control-center/Desktop/theme-selector.desktop share/gnome/control-center/Desktop/wm-properties.desktop -@dirrm share/gnome/control-center/Desktop share/gnome/control-center/Multimedia/.directory share/gnome/control-center/Multimedia/bell-properties.desktop share/gnome/control-center/Multimedia/sound-properties.desktop -@dirrm share/gnome/control-center/Multimedia share/gnome/control-center/Peripherals/.directory share/gnome/control-center/Peripherals/keyboard-properties.desktop share/gnome/control-center/Peripherals/mouse-properties.desktop -@dirrm share/gnome/control-center/Peripherals share/gnome/control-center/UIOptions/.directory share/gnome/control-center/UIOptions/application.desktop share/gnome/control-center/UIOptions/dialogs.desktop share/gnome/control-center/UIOptions/mdi.desktop -@dirrm share/gnome/control-center/UIOptions share/gnome/control-center/gnome-edit-properties.desktop +share/gnome/control-center/mime-type.desktop share/gnome/control-center/session-properties.desktop share/gnome/control-center/url-properties.desktop -@dirrm share/gnome/control-center share/gnome/idl/control-center.idl share/gnome/pixmaps/control-center.png share/gnome/wm-properties/Enlightenment.desktop @@ -195,3 +187,14 @@ share/locale/pl/LC_MESSAGES/control-center.mo share/locale/pt/LC_MESSAGES/control-center.mo share/locale/ru/LC_MESSAGES/control-center.mo share/locale/sv/LC_MESSAGES/control-center.mo +@dirrm share/gnome/wm-properties +@dirrm share/gnome/control-center/UIOptions +@dirrm share/gnome/control-center/Peripherals +@dirrm share/gnome/control-center/Multimedia +@dirrm share/gnome/control-center/Desktop +@dirrm share/gnome/control-center/.data +@dirrm share/gnome/control-center +@dirrm share/gnome/apps/Settings/UIOptions +@dirrm share/gnome/apps/Settings/Peripherals +@dirrm share/gnome/apps/Settings/Multimedia +@dirrm share/gnome/apps/Settings/Desktop diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 81a67512674b..118947deb5a6 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.39 1999/05/01 03:20:33 steve Exp $ +# $Id: Makefile,v 1.40 1999/05/09 17:13:15 steve Exp $ # DISTNAME= gnome-libs-1.0.9 @@ -14,28 +14,27 @@ MASTER_SITE_SUBDIR= sources/gnome-libs MAINTAINER= nacai@iname.com -LIB_DEPENDS= gdk_imlib.3:${PORTSDIR}/graphics/imlib \ +LIB_DEPENDS= gdk_imlib.4:${PORTSDIR}/graphics/imlib \ Xpm.4:${PORTSDIR}/graphics/xpm \ - ORBit.1:${PORTSDIR}/devel/ORBit \ + ORBit.2:${PORTSDIR}/devel/ORBit \ esd.1:${PORTSDIR}/audio/esound -# implicit dependencies: -# gettext, gtk12, tiff34, jpeg, giflib, png +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes +LIBTOOLFILES= configure libart_lgpl/configure CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ --disable-gnome-hello \ --disable-test-gnome -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ -I${LOCALBASE}/include/giflib" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" + GTK_CONFIG="${GTK_CONFIG}" \ + LIBS="-L${LOCALBASE}/lib" -post-install: - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib +MAN1= gnome.1 .include <bsd.port.mk> diff --git a/x11/gnome-libs/files/patch-aa b/x11/gnome-libs/files/patch-aa index 02ba2b3b8c3c..d0b27f235165 100644 --- a/x11/gnome-libs/files/patch-aa +++ b/x11/gnome-libs/files/patch-aa @@ -1,6 +1,15 @@ ---- configure.orig Mon Mar 1 21:51:08 1999 -+++ configure Sat Mar 6 13:33:05 1999 -@@ -5149,7 +5149,7 @@ +--- configure.orig Tue Apr 27 21:24:19 1999 ++++ configure Sat May 22 21:16:46 1999 +@@ -2521,7 +2521,7 @@ + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- PTHREAD_LIB="-lc_r" ++ PTHREAD_LIB="" + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for pthread_create""... $ac_c" 1>&6 +@@ -5215,7 +5215,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo @@ -9,16 +18,16 @@ fi rm -f conftest* INSTOBJEXT=.mo -@@ -7233,7 +7233,7 @@ +@@ -7372,7 +7372,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 7239 "configure" + #line 7378 "configure" #include "confdefs.h" -@@ -10704,7 +10704,7 @@ +@@ -10859,7 +10859,7 @@ ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS" GNOME_LIBDIR='-L${libdir}' @@ -27,7 +36,7 @@ GNOME_IDLDIR='-I${datadir}/idl' -@@ -11548,10 +11548,6 @@ +@@ -11724,10 +11724,6 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac diff --git a/x11/gnome-libs/files/patch-ac b/x11/gnome-libs/files/patch-ac index be621cf51bcc..184d5e79b184 100644 --- a/x11/gnome-libs/files/patch-ac +++ b/x11/gnome-libs/files/patch-ac @@ -1,5 +1,5 @@ ---- gnome-config.in.orig Mon Feb 15 20:05:33 1999 -+++ gnome-config.in Tue Mar 2 09:00:51 1999 +--- gnome-config.in.orig Thu Apr 15 13:59:46 1999 ++++ gnome-config.in Sat May 8 17:32:13 1999 @@ -43,25 +43,25 @@ Known values for LIBRARY are: @@ -30,7 +30,7 @@ if test "x$conf_shs" = x || test "x$conf_shs" = 'x*Conf.sh'; then echo " <NONE>" -@@ -146,36 +146,36 @@ +@@ -146,19 +146,19 @@ usage 1 ;; glib) @@ -46,30 +46,17 @@ + the_flags="$the_flags `gtk12-config --cflags`" ;; gnome) -- the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@" -+ the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@ -lintl" + the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@" the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@" ;; gnomeui) - the_libs="$the_libs @GNOME_LIBDIR@ @GNOMEUI_LIBS@" -+ the_libs="$the_libs @GNOME_LIBDIR@ -lXpm -ljpeg -lpng -lz -ltiff -lgif @GNOMEUI_LIBS@ -lintl" ++ the_libs="$the_libs @GNOME_LIBDIR@ -lXpm -ljpeg -lpng -lz -ltiff -lgif @GNOMEUI_LIBS@" the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@" ;; gtkxmhtml) -- the_libs="$the_libs @GNOME_LIBDIR@ @GTKXMHTML_LIBS@" -+ the_libs="$the_libs @GNOME_LIBDIR@ @GTKXMHTML_LIBS@ -lintl" - ;; - gnorba) -- the_libs="$the_libs @GNOME_LIBDIR@ -lgnorba @ORBIT_LIBS@" -+ the_libs="$the_libs @GNOME_LIBDIR@ -lgnorba @ORBIT_LIBS@ -lintl" - the_flags="$the_flags @GNOME_INCLUDEDIR@ @ORBIT_CFLAGS@" - ;; - idl) - the_flags="@GNOME_IDLDIR@" - ;; - zvt) -- the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@" -+ the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@ -lintl" +@@ -175,7 +175,7 @@ + the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@" ;; *) - cnf_sh=${libdir}/${1}Conf.sh diff --git a/x11/gnome-libs/files/patch-ba b/x11/gnome-libs/files/patch-ba index 3d04ba56ebef..ab4a059b0c19 100644 --- a/x11/gnome-libs/files/patch-ba +++ b/x11/gnome-libs/files/patch-ba @@ -5,7 +5,7 @@ @FALSE_TRUE@libvfs = libvfs -SUBDIRS = po intl support macros tools images libart_lgpl libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt libgnorba idl $(test_gnome) devel-docs gnome-data $(libvfs) man gnome-faq -+SUBDIRS = po intl support macros tools images libart_lgpl libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt libgnorba idl $(test_gnome) gnome-data $(libvfs) ++SUBDIRS = po intl support macros tools images libart_lgpl libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt libgnorba idl $(test_gnome) gnome-data $(libvfs) man include_HEADERS = gnome.h diff --git a/x11/gnome-libs/files/patch-bc b/x11/gnome-libs/files/patch-bc index d643ed92a369..d77e1256acb6 100644 --- a/x11/gnome-libs/files/patch-bc +++ b/x11/gnome-libs/files/patch-bc @@ -1,15 +1,11 @@ --- libgnome/Makefile.in.orig Wed Apr 7 21:33:54 1999 +++ libgnome/Makefile.in Fri Apr 30 17:35:08 1999 -@@ -172,10 +172,10 @@ +@@ -172,7 +172,7 @@ EXTRA_DIST = parse-path.cP -libgnome_la_LDFLAGS = -version-info 35:3:3 #-rpath $(libdir) -+libgnome_la_LDFLAGS = -version-info 1:0:0 #-rpath $(libdir) ++libgnome_la_LDFLAGS = -version-info 2:0:0 #-rpath $(libdir) libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB) --bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote gconfigger gnome-gen-mimedb -+bin_PROGRAMS = gnome-dump-metadata gnome-moz-remote gconfigger gnome-gen-mimedb - - - dns_helper_SOURCES = dns-helper.c + bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote gconfigger gnome-gen-mimedb diff --git a/x11/gnome-libs/files/patch-bd b/x11/gnome-libs/files/patch-bd index 0742d83763b0..dc9615aa82cd 100644 --- a/x11/gnome-libs/files/patch-bd +++ b/x11/gnome-libs/files/patch-bd @@ -5,25 +5,16 @@ -libgnomeui_la_LDFLAGS = -version-info 41:1:9 -rpath $(libdir) -+libgnomeui_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir) ++libgnomeui_la_LDFLAGS = -version-info 2:0:0 -rpath $(libdir) libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) gnome_segv_LDADD = libgnomeui.la $(top_builddir)/libgnome/libgnome.la $(top_builddir)/libart_lgpl/libart_lgpl.la @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) $(INTLLIBS) -@@ -1478,7 +1478,7 @@ - check: check-recursive - installcheck-am: - installcheck: installcheck-recursive --install-exec-am: install-libLTLIBRARIES install-binPROGRAMS -+install-exec-am: install-libLTLIBRARIES - install-exec: install-exec-recursive +@@ -258,7 +258,7 @@ + gnome-startup.lo gnome-stock.lo gnome-winhints.lo \ + gnome-paper-selector.lo gnome-procbar.lo gnometypes.lo gtkcauldron.lo \ + gtk-clock.lo gtk-ted.lo gtkdial.lo gtkpixmapmenuitem.lo +-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) ++PROGRAMS = $(bin_PROGRAMS) - install-data-am: install-gtkrcDATA install-libgnomeuiincludeHEADERS -@@ -1490,7 +1490,7 @@ - uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \ - uninstall-gtkrcDATA uninstall-libgnomeuiincludeHEADERS - uninstall: uninstall-recursive --all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) -+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) - all-redirect: all-recursive - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + gnome_segv_OBJECTS = gnome_segv.o + gnome_segv_DEPENDENCIES = libgnomeui.la \ diff --git a/x11/gnome-libs/files/patch-be b/x11/gnome-libs/files/patch-be index f5bdd3c1180c..478ed9ab2813 100644 --- a/x11/gnome-libs/files/patch-be +++ b/x11/gnome-libs/files/patch-be @@ -5,7 +5,7 @@ -libgnorba_la_LDFLAGS = -version-info 28:5:1 -rpath $(libdir) -+libgnorba_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir) ++libgnorba_la_LDFLAGS = -version-info 2:0:0 -rpath $(libdir) libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm loadshlib_SOURCES = loadshlib.c diff --git a/x11/gnome-libs/files/patch-bf b/x11/gnome-libs/files/patch-bf index 26760886d0b3..bdb98560937e 100644 --- a/x11/gnome-libs/files/patch-bf +++ b/x11/gnome-libs/files/patch-bf @@ -14,7 +14,7 @@ libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c libgnomesupport_la_LIBADD = @LTLIBOBJS@ -libgnomesupport_la_LDFLAGS = -version-info 0:0:0 -+libgnomesupport_la_LDFLAGS = -version-info 1:0:0 ++libgnomesupport_la_LDFLAGS = -version-info 2:0:0 BUILT_SOURCES = gnomesupport.h diff --git a/x11/gnome-libs/files/patch-bg b/x11/gnome-libs/files/patch-bg index 15a50ea71d3e..5a793e0dd1c7 100644 --- a/x11/gnome-libs/files/patch-bg +++ b/x11/gnome-libs/files/patch-bg @@ -1,30 +1,29 @@ ---- zvt/Makefile.in.orig Wed Apr 7 21:34:27 1999 -+++ zvt/Makefile.in Fri Apr 30 17:53:45 1999 +--- zvt/Makefile.in.orig Wed Apr 28 02:58:32 1999 ++++ zvt/Makefile.in Sat May 8 22:50:50 1999 +@@ -20,7 +20,7 @@ + exec_prefix = @exec_prefix@ + + bindir = @bindir@ +-sbindir = @sbindir@ ++sbindir = @bindir@ + libexecdir = @libexecdir@ + datadir = @datadir@ + sysconfdir = @sysconfdir@ @@ -160,7 +160,7 @@ libzvt_la_SOURCES = gnome-login-support.h gnome-login-support.c lists.c subshell.h subshell.c subshell-includes.h update.c vt.c zvtterm.c -libzvt_la_LDFLAGS = -version-info 4:3:2 -rpath $(libdir) -+libzvt_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir) ++libzvt_la_LDFLAGS = -version-info 2:0:0 -rpath $(libdir) libzvtinclude_HEADERS = lists.h vt.h vtx.h zvtterm.h -@@ -435,8 +435,7 @@ - check: check-am - installcheck-am: - installcheck: installcheck-am --install-exec-am: install-libLTLIBRARIES install-sbinPROGRAMS \ -- install-exec-local -+install-exec-am: install-libLTLIBRARIES - install-exec: install-exec-am +@@ -200,7 +200,7 @@ + libzvt_la_LIBADD = + libzvt_la_OBJECTS = gnome-login-support.lo lists.lo subshell.lo \ + update.lo vt.lo zvtterm.lo +-PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS) ++PROGRAMS = $(sbin_PROGRAMS) - install-data-am: install-libzvtincludeHEADERS -@@ -448,7 +447,7 @@ - uninstall-am: uninstall-libLTLIBRARIES uninstall-sbinPROGRAMS \ - uninstall-libzvtincludeHEADERS - uninstall: uninstall-am --all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) -+all-am: Makefile $(LTLIBRARIES) $(HEADERS) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + zterm_OBJECTS = zterm.o + zterm_DEPENDENCIES = libzvt.la diff --git a/x11/gnome-libs/files/patch-bi b/x11/gnome-libs/files/patch-bi index 8d49b031a833..09749e8c6f58 100644 --- a/x11/gnome-libs/files/patch-bi +++ b/x11/gnome-libs/files/patch-bi @@ -1,16 +1,20 @@ ---- libart_lgpl/Makefile.in.orig Tue Feb 16 01:09:07 1999 -+++ libart_lgpl/Makefile.in Fri Feb 19 00:20:20 1999 +--- libart_lgpl/Makefile.in.orig Wed Apr 28 02:57:51 1999 ++++ libart_lgpl/Makefile.in Fri Apr 30 00:19:41 1999 @@ -94,7 +94,7 @@ libart_lgpl_la_SOURCES = art_affine.c art_alphagamma.c art_bpath.c art_gray_svp.c art_misc.c art_pixbuf.c art_rect.c art_rect_svp.c art_rect_uta.c art_rgb.c art_rgb_affine.c art_rgb_affine_private.c art_rgb_affine_private.h art_rgb_bitmap_affine.c art_rgb_pixbuf_affine.c art_rgb_rgba_affine.c art_rgb_svp.c art_svp.c art_svp_ops.c art_svp_render_aa.c art_svp_vpath.c art_svp_vpath_stroke.c art_svp_wind.c art_svp_wind.h art_uta.c art_uta_ops.c art_uta_rect.c art_uta_vpath.c art_uta_svp.c art_vpath.c art_vpath_bpath.c art_vpath_svp.c -libart_lgpl_la_LDFLAGS = -version-info @LIBART_VERSION_INFO@ -+libart_lgpl_la_LDFLAGS = -version-info 1:0:0 ++libart_lgpl_la_LDFLAGS = -version-info 2:0:0 libart_lgplincdir = $(includedir)/libart_lgpl libart_lgplinc_HEADERS = art_affine.h art_alphagamma.h art_bpath.h art_filterlevel.h art_gray_svp.h art_misc.h art_pathcode.h art_pixbuf.h art_point.h art_rect.h art_rect_svp.h art_rect_uta.h art_rgb.h art_rgb_affine.h art_rgb_bitmap_affine.h art_rgb_pixbuf_affine.h art_rgb_rgba_affine.h art_rgb_svp.h art_svp.h art_svp_ops.h art_svp_render_aa.h art_svp_vpath.h art_svp_vpath_stroke.h art_uta.h art_uta_ops.h art_uta_rect.h art_uta_vpath.h art_uta_svp.h art_vpath.h art_vpath_bpath.h art_vpath_svp.h -@@ -118,7 +118,7 @@ - m4datadir = $(datadir)/aclocal +@@ -115,10 +115,10 @@ + testuta_DEPENDENCIES = $(DEPS) + testuta_LDADD = $(LDADDS) -lm + +-m4datadir = $(datadir)/aclocal ++m4datadir = $(prefix)/share/aclocal m4data_DATA = libart.m4 -confexecdir = $(libdir) @@ -18,15 +22,6 @@ confexec_DATA = libartConf.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs -@@ -559,7 +559,7 @@ - install-confexecDATA - install-exec: install-exec-am - --install-data-am: install-m4dataDATA install-libart_lgplincHEADERS -+install-data-am: install-libart_lgplincHEADERS - install-data: install-data-am - - install-am: all-am @@ -569,7 +569,7 @@ uninstall-confexecDATA uninstall-m4dataDATA \ uninstall-libart_lgplincHEADERS diff --git a/x11/gnome-libs/pkg-plist b/x11/gnome-libs/pkg-plist index 923390ca5e80..56dd10dbbc6b 100644 --- a/x11/gnome-libs/pkg-plist +++ b/x11/gnome-libs/pkg-plist @@ -1,3 +1,4 @@ +bin/dns-helper bin/gconfigger bin/gnome-bug bin/gnome-config @@ -5,6 +6,8 @@ bin/gnome-dump-metadata bin/gnome-gen-mimedb bin/gnome-moz-remote bin/gnome-name-service +bin/gnome-pty-helper +bin/gnome_segv bin/goad-browser bin/libart-config bin/loadshlib @@ -162,39 +165,32 @@ include/zvt/vt.h include/zvt/vtx.h include/zvt/zvtterm.h lib/libart_lgpl.a -lib/libart_lgpl.la lib/libart_lgpl.so -lib/libart_lgpl.so.1 +lib/libart_lgpl.so.2 lib/libgnome.a -lib/libgnome.la lib/libgnome.so -lib/libgnome.so.1 +lib/libgnome.so.2 lib/libgnomesupport.a -lib/libgnomesupport.la lib/libgnomesupport.so -lib/libgnomesupport.so.1 +lib/libgnomesupport.so.2 lib/libgnomeui.a -lib/libgnomeui.la lib/libgnomeui.so -lib/libgnomeui.so.1 +lib/libgnomeui.so.2 lib/libgnorba.a -lib/libgnorba.la lib/libgnorba.so -lib/libgnorba.so.1 +lib/libgnorba.so.2 lib/libgnorbagtk.a -lib/libgnorbagtk.la lib/libgnorbagtk.so lib/libgnorbagtk.so.0 lib/libgtkxmhtml.a -lib/libgtkxmhtml.la lib/libgtkxmhtml.so lib/libgtkxmhtml.so.1 lib/libzvt.a -lib/libzvt.la lib/libzvt.so -lib/libzvt.so.1 +lib/libzvt.so.2 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B +share/aclocal/libart.m4 share/gnome/gtkrc share/gnome/gtkrc.ja share/gnome/gtkrc.ko diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile index 81a67512674b..118947deb5a6 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.39 1999/05/01 03:20:33 steve Exp $ +# $Id: Makefile,v 1.40 1999/05/09 17:13:15 steve Exp $ # DISTNAME= gnome-libs-1.0.9 @@ -14,28 +14,27 @@ MASTER_SITE_SUBDIR= sources/gnome-libs MAINTAINER= nacai@iname.com -LIB_DEPENDS= gdk_imlib.3:${PORTSDIR}/graphics/imlib \ +LIB_DEPENDS= gdk_imlib.4:${PORTSDIR}/graphics/imlib \ Xpm.4:${PORTSDIR}/graphics/xpm \ - ORBit.1:${PORTSDIR}/devel/ORBit \ + ORBit.2:${PORTSDIR}/devel/ORBit \ esd.1:${PORTSDIR}/audio/esound -# implicit dependencies: -# gettext, gtk12, tiff34, jpeg, giflib, png +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes +LIBTOOLFILES= configure libart_lgpl/configure CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ --disable-gnome-hello \ --disable-test-gnome -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ -I${LOCALBASE}/include/giflib" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" + GTK_CONFIG="${GTK_CONFIG}" \ + LIBS="-L${LOCALBASE}/lib" -post-install: - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib +MAN1= gnome.1 .include <bsd.port.mk> diff --git a/x11/gnomelibs/files/patch-aa b/x11/gnomelibs/files/patch-aa index 02ba2b3b8c3c..d0b27f235165 100644 --- a/x11/gnomelibs/files/patch-aa +++ b/x11/gnomelibs/files/patch-aa @@ -1,6 +1,15 @@ ---- configure.orig Mon Mar 1 21:51:08 1999 -+++ configure Sat Mar 6 13:33:05 1999 -@@ -5149,7 +5149,7 @@ +--- configure.orig Tue Apr 27 21:24:19 1999 ++++ configure Sat May 22 21:16:46 1999 +@@ -2521,7 +2521,7 @@ + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- PTHREAD_LIB="-lc_r" ++ PTHREAD_LIB="" + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for pthread_create""... $ac_c" 1>&6 +@@ -5215,7 +5215,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo @@ -9,16 +18,16 @@ fi rm -f conftest* INSTOBJEXT=.mo -@@ -7233,7 +7233,7 @@ +@@ -7372,7 +7372,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 7239 "configure" + #line 7378 "configure" #include "confdefs.h" -@@ -10704,7 +10704,7 @@ +@@ -10859,7 +10859,7 @@ ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS" GNOME_LIBDIR='-L${libdir}' @@ -27,7 +36,7 @@ GNOME_IDLDIR='-I${datadir}/idl' -@@ -11548,10 +11548,6 @@ +@@ -11724,10 +11724,6 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac diff --git a/x11/gnomelibs/files/patch-ac b/x11/gnomelibs/files/patch-ac index be621cf51bcc..184d5e79b184 100644 --- a/x11/gnomelibs/files/patch-ac +++ b/x11/gnomelibs/files/patch-ac @@ -1,5 +1,5 @@ ---- gnome-config.in.orig Mon Feb 15 20:05:33 1999 -+++ gnome-config.in Tue Mar 2 09:00:51 1999 +--- gnome-config.in.orig Thu Apr 15 13:59:46 1999 ++++ gnome-config.in Sat May 8 17:32:13 1999 @@ -43,25 +43,25 @@ Known values for LIBRARY are: @@ -30,7 +30,7 @@ if test "x$conf_shs" = x || test "x$conf_shs" = 'x*Conf.sh'; then echo " <NONE>" -@@ -146,36 +146,36 @@ +@@ -146,19 +146,19 @@ usage 1 ;; glib) @@ -46,30 +46,17 @@ + the_flags="$the_flags `gtk12-config --cflags`" ;; gnome) -- the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@" -+ the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@ -lintl" + the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@" the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@" ;; gnomeui) - the_libs="$the_libs @GNOME_LIBDIR@ @GNOMEUI_LIBS@" -+ the_libs="$the_libs @GNOME_LIBDIR@ -lXpm -ljpeg -lpng -lz -ltiff -lgif @GNOMEUI_LIBS@ -lintl" ++ the_libs="$the_libs @GNOME_LIBDIR@ -lXpm -ljpeg -lpng -lz -ltiff -lgif @GNOMEUI_LIBS@" the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@" ;; gtkxmhtml) -- the_libs="$the_libs @GNOME_LIBDIR@ @GTKXMHTML_LIBS@" -+ the_libs="$the_libs @GNOME_LIBDIR@ @GTKXMHTML_LIBS@ -lintl" - ;; - gnorba) -- the_libs="$the_libs @GNOME_LIBDIR@ -lgnorba @ORBIT_LIBS@" -+ the_libs="$the_libs @GNOME_LIBDIR@ -lgnorba @ORBIT_LIBS@ -lintl" - the_flags="$the_flags @GNOME_INCLUDEDIR@ @ORBIT_CFLAGS@" - ;; - idl) - the_flags="@GNOME_IDLDIR@" - ;; - zvt) -- the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@" -+ the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@ -lintl" +@@ -175,7 +175,7 @@ + the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@" ;; *) - cnf_sh=${libdir}/${1}Conf.sh diff --git a/x11/gnomelibs/files/patch-ba b/x11/gnomelibs/files/patch-ba index 3d04ba56ebef..ab4a059b0c19 100644 --- a/x11/gnomelibs/files/patch-ba +++ b/x11/gnomelibs/files/patch-ba @@ -5,7 +5,7 @@ @FALSE_TRUE@libvfs = libvfs -SUBDIRS = po intl support macros tools images libart_lgpl libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt libgnorba idl $(test_gnome) devel-docs gnome-data $(libvfs) man gnome-faq -+SUBDIRS = po intl support macros tools images libart_lgpl libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt libgnorba idl $(test_gnome) gnome-data $(libvfs) ++SUBDIRS = po intl support macros tools images libart_lgpl libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt libgnorba idl $(test_gnome) gnome-data $(libvfs) man include_HEADERS = gnome.h diff --git a/x11/gnomelibs/files/patch-bc b/x11/gnomelibs/files/patch-bc index d643ed92a369..d77e1256acb6 100644 --- a/x11/gnomelibs/files/patch-bc +++ b/x11/gnomelibs/files/patch-bc @@ -1,15 +1,11 @@ --- libgnome/Makefile.in.orig Wed Apr 7 21:33:54 1999 +++ libgnome/Makefile.in Fri Apr 30 17:35:08 1999 -@@ -172,10 +172,10 @@ +@@ -172,7 +172,7 @@ EXTRA_DIST = parse-path.cP -libgnome_la_LDFLAGS = -version-info 35:3:3 #-rpath $(libdir) -+libgnome_la_LDFLAGS = -version-info 1:0:0 #-rpath $(libdir) ++libgnome_la_LDFLAGS = -version-info 2:0:0 #-rpath $(libdir) libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB) --bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote gconfigger gnome-gen-mimedb -+bin_PROGRAMS = gnome-dump-metadata gnome-moz-remote gconfigger gnome-gen-mimedb - - - dns_helper_SOURCES = dns-helper.c + bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote gconfigger gnome-gen-mimedb diff --git a/x11/gnomelibs/files/patch-bd b/x11/gnomelibs/files/patch-bd index 0742d83763b0..dc9615aa82cd 100644 --- a/x11/gnomelibs/files/patch-bd +++ b/x11/gnomelibs/files/patch-bd @@ -5,25 +5,16 @@ -libgnomeui_la_LDFLAGS = -version-info 41:1:9 -rpath $(libdir) -+libgnomeui_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir) ++libgnomeui_la_LDFLAGS = -version-info 2:0:0 -rpath $(libdir) libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) gnome_segv_LDADD = libgnomeui.la $(top_builddir)/libgnome/libgnome.la $(top_builddir)/libart_lgpl/libart_lgpl.la @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) $(INTLLIBS) -@@ -1478,7 +1478,7 @@ - check: check-recursive - installcheck-am: - installcheck: installcheck-recursive --install-exec-am: install-libLTLIBRARIES install-binPROGRAMS -+install-exec-am: install-libLTLIBRARIES - install-exec: install-exec-recursive +@@ -258,7 +258,7 @@ + gnome-startup.lo gnome-stock.lo gnome-winhints.lo \ + gnome-paper-selector.lo gnome-procbar.lo gnometypes.lo gtkcauldron.lo \ + gtk-clock.lo gtk-ted.lo gtkdial.lo gtkpixmapmenuitem.lo +-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) ++PROGRAMS = $(bin_PROGRAMS) - install-data-am: install-gtkrcDATA install-libgnomeuiincludeHEADERS -@@ -1490,7 +1490,7 @@ - uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \ - uninstall-gtkrcDATA uninstall-libgnomeuiincludeHEADERS - uninstall: uninstall-recursive --all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) -+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) - all-redirect: all-recursive - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + gnome_segv_OBJECTS = gnome_segv.o + gnome_segv_DEPENDENCIES = libgnomeui.la \ diff --git a/x11/gnomelibs/files/patch-be b/x11/gnomelibs/files/patch-be index f5bdd3c1180c..478ed9ab2813 100644 --- a/x11/gnomelibs/files/patch-be +++ b/x11/gnomelibs/files/patch-be @@ -5,7 +5,7 @@ -libgnorba_la_LDFLAGS = -version-info 28:5:1 -rpath $(libdir) -+libgnorba_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir) ++libgnorba_la_LDFLAGS = -version-info 2:0:0 -rpath $(libdir) libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm loadshlib_SOURCES = loadshlib.c diff --git a/x11/gnomelibs/files/patch-bf b/x11/gnomelibs/files/patch-bf index 26760886d0b3..bdb98560937e 100644 --- a/x11/gnomelibs/files/patch-bf +++ b/x11/gnomelibs/files/patch-bf @@ -14,7 +14,7 @@ libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c libgnomesupport_la_LIBADD = @LTLIBOBJS@ -libgnomesupport_la_LDFLAGS = -version-info 0:0:0 -+libgnomesupport_la_LDFLAGS = -version-info 1:0:0 ++libgnomesupport_la_LDFLAGS = -version-info 2:0:0 BUILT_SOURCES = gnomesupport.h diff --git a/x11/gnomelibs/files/patch-bg b/x11/gnomelibs/files/patch-bg index 15a50ea71d3e..5a793e0dd1c7 100644 --- a/x11/gnomelibs/files/patch-bg +++ b/x11/gnomelibs/files/patch-bg @@ -1,30 +1,29 @@ ---- zvt/Makefile.in.orig Wed Apr 7 21:34:27 1999 -+++ zvt/Makefile.in Fri Apr 30 17:53:45 1999 +--- zvt/Makefile.in.orig Wed Apr 28 02:58:32 1999 ++++ zvt/Makefile.in Sat May 8 22:50:50 1999 +@@ -20,7 +20,7 @@ + exec_prefix = @exec_prefix@ + + bindir = @bindir@ +-sbindir = @sbindir@ ++sbindir = @bindir@ + libexecdir = @libexecdir@ + datadir = @datadir@ + sysconfdir = @sysconfdir@ @@ -160,7 +160,7 @@ libzvt_la_SOURCES = gnome-login-support.h gnome-login-support.c lists.c subshell.h subshell.c subshell-includes.h update.c vt.c zvtterm.c -libzvt_la_LDFLAGS = -version-info 4:3:2 -rpath $(libdir) -+libzvt_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir) ++libzvt_la_LDFLAGS = -version-info 2:0:0 -rpath $(libdir) libzvtinclude_HEADERS = lists.h vt.h vtx.h zvtterm.h -@@ -435,8 +435,7 @@ - check: check-am - installcheck-am: - installcheck: installcheck-am --install-exec-am: install-libLTLIBRARIES install-sbinPROGRAMS \ -- install-exec-local -+install-exec-am: install-libLTLIBRARIES - install-exec: install-exec-am +@@ -200,7 +200,7 @@ + libzvt_la_LIBADD = + libzvt_la_OBJECTS = gnome-login-support.lo lists.lo subshell.lo \ + update.lo vt.lo zvtterm.lo +-PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS) ++PROGRAMS = $(sbin_PROGRAMS) - install-data-am: install-libzvtincludeHEADERS -@@ -448,7 +447,7 @@ - uninstall-am: uninstall-libLTLIBRARIES uninstall-sbinPROGRAMS \ - uninstall-libzvtincludeHEADERS - uninstall: uninstall-am --all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) -+all-am: Makefile $(LTLIBRARIES) $(HEADERS) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + zterm_OBJECTS = zterm.o + zterm_DEPENDENCIES = libzvt.la diff --git a/x11/gnomelibs/files/patch-bi b/x11/gnomelibs/files/patch-bi index 8d49b031a833..09749e8c6f58 100644 --- a/x11/gnomelibs/files/patch-bi +++ b/x11/gnomelibs/files/patch-bi @@ -1,16 +1,20 @@ ---- libart_lgpl/Makefile.in.orig Tue Feb 16 01:09:07 1999 -+++ libart_lgpl/Makefile.in Fri Feb 19 00:20:20 1999 +--- libart_lgpl/Makefile.in.orig Wed Apr 28 02:57:51 1999 ++++ libart_lgpl/Makefile.in Fri Apr 30 00:19:41 1999 @@ -94,7 +94,7 @@ libart_lgpl_la_SOURCES = art_affine.c art_alphagamma.c art_bpath.c art_gray_svp.c art_misc.c art_pixbuf.c art_rect.c art_rect_svp.c art_rect_uta.c art_rgb.c art_rgb_affine.c art_rgb_affine_private.c art_rgb_affine_private.h art_rgb_bitmap_affine.c art_rgb_pixbuf_affine.c art_rgb_rgba_affine.c art_rgb_svp.c art_svp.c art_svp_ops.c art_svp_render_aa.c art_svp_vpath.c art_svp_vpath_stroke.c art_svp_wind.c art_svp_wind.h art_uta.c art_uta_ops.c art_uta_rect.c art_uta_vpath.c art_uta_svp.c art_vpath.c art_vpath_bpath.c art_vpath_svp.c -libart_lgpl_la_LDFLAGS = -version-info @LIBART_VERSION_INFO@ -+libart_lgpl_la_LDFLAGS = -version-info 1:0:0 ++libart_lgpl_la_LDFLAGS = -version-info 2:0:0 libart_lgplincdir = $(includedir)/libart_lgpl libart_lgplinc_HEADERS = art_affine.h art_alphagamma.h art_bpath.h art_filterlevel.h art_gray_svp.h art_misc.h art_pathcode.h art_pixbuf.h art_point.h art_rect.h art_rect_svp.h art_rect_uta.h art_rgb.h art_rgb_affine.h art_rgb_bitmap_affine.h art_rgb_pixbuf_affine.h art_rgb_rgba_affine.h art_rgb_svp.h art_svp.h art_svp_ops.h art_svp_render_aa.h art_svp_vpath.h art_svp_vpath_stroke.h art_uta.h art_uta_ops.h art_uta_rect.h art_uta_vpath.h art_uta_svp.h art_vpath.h art_vpath_bpath.h art_vpath_svp.h -@@ -118,7 +118,7 @@ - m4datadir = $(datadir)/aclocal +@@ -115,10 +115,10 @@ + testuta_DEPENDENCIES = $(DEPS) + testuta_LDADD = $(LDADDS) -lm + +-m4datadir = $(datadir)/aclocal ++m4datadir = $(prefix)/share/aclocal m4data_DATA = libart.m4 -confexecdir = $(libdir) @@ -18,15 +22,6 @@ confexec_DATA = libartConf.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs -@@ -559,7 +559,7 @@ - install-confexecDATA - install-exec: install-exec-am - --install-data-am: install-m4dataDATA install-libart_lgplincHEADERS -+install-data-am: install-libart_lgplincHEADERS - install-data: install-data-am - - install-am: all-am @@ -569,7 +569,7 @@ uninstall-confexecDATA uninstall-m4dataDATA \ uninstall-libart_lgplincHEADERS diff --git a/x11/gnomelibs/pkg-plist b/x11/gnomelibs/pkg-plist index 923390ca5e80..56dd10dbbc6b 100644 --- a/x11/gnomelibs/pkg-plist +++ b/x11/gnomelibs/pkg-plist @@ -1,3 +1,4 @@ +bin/dns-helper bin/gconfigger bin/gnome-bug bin/gnome-config @@ -5,6 +6,8 @@ bin/gnome-dump-metadata bin/gnome-gen-mimedb bin/gnome-moz-remote bin/gnome-name-service +bin/gnome-pty-helper +bin/gnome_segv bin/goad-browser bin/libart-config bin/loadshlib @@ -162,39 +165,32 @@ include/zvt/vt.h include/zvt/vtx.h include/zvt/zvtterm.h lib/libart_lgpl.a -lib/libart_lgpl.la lib/libart_lgpl.so -lib/libart_lgpl.so.1 +lib/libart_lgpl.so.2 lib/libgnome.a -lib/libgnome.la lib/libgnome.so -lib/libgnome.so.1 +lib/libgnome.so.2 lib/libgnomesupport.a -lib/libgnomesupport.la lib/libgnomesupport.so -lib/libgnomesupport.so.1 +lib/libgnomesupport.so.2 lib/libgnomeui.a -lib/libgnomeui.la lib/libgnomeui.so -lib/libgnomeui.so.1 +lib/libgnomeui.so.2 lib/libgnorba.a -lib/libgnorba.la lib/libgnorba.so -lib/libgnorba.so.1 +lib/libgnorba.so.2 lib/libgnorbagtk.a -lib/libgnorbagtk.la lib/libgnorbagtk.so lib/libgnorbagtk.so.0 lib/libgtkxmhtml.a -lib/libgtkxmhtml.la lib/libgtkxmhtml.so lib/libgtkxmhtml.so.1 lib/libzvt.a -lib/libzvt.la lib/libzvt.so -lib/libzvt.so.1 +lib/libzvt.so.2 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B +share/aclocal/libart.m4 share/gnome/gtkrc share/gnome/gtkrc.ja share/gnome/gtkrc.ko diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 81a67512674b..118947deb5a6 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.39 1999/05/01 03:20:33 steve Exp $ +# $Id: Makefile,v 1.40 1999/05/09 17:13:15 steve Exp $ # DISTNAME= gnome-libs-1.0.9 @@ -14,28 +14,27 @@ MASTER_SITE_SUBDIR= sources/gnome-libs MAINTAINER= nacai@iname.com -LIB_DEPENDS= gdk_imlib.3:${PORTSDIR}/graphics/imlib \ +LIB_DEPENDS= gdk_imlib.4:${PORTSDIR}/graphics/imlib \ Xpm.4:${PORTSDIR}/graphics/xpm \ - ORBit.1:${PORTSDIR}/devel/ORBit \ + ORBit.2:${PORTSDIR}/devel/ORBit \ esd.1:${PORTSDIR}/audio/esound -# implicit dependencies: -# gettext, gtk12, tiff34, jpeg, giflib, png +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes +LIBTOOLFILES= configure libart_lgpl/configure CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ --disable-gnome-hello \ --disable-test-gnome -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ -I${LOCALBASE}/include/giflib" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" + GTK_CONFIG="${GTK_CONFIG}" \ + LIBS="-L${LOCALBASE}/lib" -post-install: - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib +MAN1= gnome.1 .include <bsd.port.mk> diff --git a/x11/libgnome/files/patch-aa b/x11/libgnome/files/patch-aa index 02ba2b3b8c3c..d0b27f235165 100644 --- a/x11/libgnome/files/patch-aa +++ b/x11/libgnome/files/patch-aa @@ -1,6 +1,15 @@ ---- configure.orig Mon Mar 1 21:51:08 1999 -+++ configure Sat Mar 6 13:33:05 1999 -@@ -5149,7 +5149,7 @@ +--- configure.orig Tue Apr 27 21:24:19 1999 ++++ configure Sat May 22 21:16:46 1999 +@@ -2521,7 +2521,7 @@ + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- PTHREAD_LIB="-lc_r" ++ PTHREAD_LIB="" + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for pthread_create""... $ac_c" 1>&6 +@@ -5215,7 +5215,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo @@ -9,16 +18,16 @@ fi rm -f conftest* INSTOBJEXT=.mo -@@ -7233,7 +7233,7 @@ +@@ -7372,7 +7372,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 7239 "configure" + #line 7378 "configure" #include "confdefs.h" -@@ -10704,7 +10704,7 @@ +@@ -10859,7 +10859,7 @@ ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS" GNOME_LIBDIR='-L${libdir}' @@ -27,7 +36,7 @@ GNOME_IDLDIR='-I${datadir}/idl' -@@ -11548,10 +11548,6 @@ +@@ -11724,10 +11724,6 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac diff --git a/x11/libgnome/files/patch-ac b/x11/libgnome/files/patch-ac index be621cf51bcc..184d5e79b184 100644 --- a/x11/libgnome/files/patch-ac +++ b/x11/libgnome/files/patch-ac @@ -1,5 +1,5 @@ ---- gnome-config.in.orig Mon Feb 15 20:05:33 1999 -+++ gnome-config.in Tue Mar 2 09:00:51 1999 +--- gnome-config.in.orig Thu Apr 15 13:59:46 1999 ++++ gnome-config.in Sat May 8 17:32:13 1999 @@ -43,25 +43,25 @@ Known values for LIBRARY are: @@ -30,7 +30,7 @@ if test "x$conf_shs" = x || test "x$conf_shs" = 'x*Conf.sh'; then echo " <NONE>" -@@ -146,36 +146,36 @@ +@@ -146,19 +146,19 @@ usage 1 ;; glib) @@ -46,30 +46,17 @@ + the_flags="$the_flags `gtk12-config --cflags`" ;; gnome) -- the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@" -+ the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@ -lintl" + the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@" the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@" ;; gnomeui) - the_libs="$the_libs @GNOME_LIBDIR@ @GNOMEUI_LIBS@" -+ the_libs="$the_libs @GNOME_LIBDIR@ -lXpm -ljpeg -lpng -lz -ltiff -lgif @GNOMEUI_LIBS@ -lintl" ++ the_libs="$the_libs @GNOME_LIBDIR@ -lXpm -ljpeg -lpng -lz -ltiff -lgif @GNOMEUI_LIBS@" the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@" ;; gtkxmhtml) -- the_libs="$the_libs @GNOME_LIBDIR@ @GTKXMHTML_LIBS@" -+ the_libs="$the_libs @GNOME_LIBDIR@ @GTKXMHTML_LIBS@ -lintl" - ;; - gnorba) -- the_libs="$the_libs @GNOME_LIBDIR@ -lgnorba @ORBIT_LIBS@" -+ the_libs="$the_libs @GNOME_LIBDIR@ -lgnorba @ORBIT_LIBS@ -lintl" - the_flags="$the_flags @GNOME_INCLUDEDIR@ @ORBIT_CFLAGS@" - ;; - idl) - the_flags="@GNOME_IDLDIR@" - ;; - zvt) -- the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@" -+ the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@ -lintl" +@@ -175,7 +175,7 @@ + the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@" ;; *) - cnf_sh=${libdir}/${1}Conf.sh diff --git a/x11/libgnome/files/patch-ba b/x11/libgnome/files/patch-ba index 3d04ba56ebef..ab4a059b0c19 100644 --- a/x11/libgnome/files/patch-ba +++ b/x11/libgnome/files/patch-ba @@ -5,7 +5,7 @@ @FALSE_TRUE@libvfs = libvfs -SUBDIRS = po intl support macros tools images libart_lgpl libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt libgnorba idl $(test_gnome) devel-docs gnome-data $(libvfs) man gnome-faq -+SUBDIRS = po intl support macros tools images libart_lgpl libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt libgnorba idl $(test_gnome) gnome-data $(libvfs) ++SUBDIRS = po intl support macros tools images libart_lgpl libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt libgnorba idl $(test_gnome) gnome-data $(libvfs) man include_HEADERS = gnome.h diff --git a/x11/libgnome/files/patch-bc b/x11/libgnome/files/patch-bc index d643ed92a369..d77e1256acb6 100644 --- a/x11/libgnome/files/patch-bc +++ b/x11/libgnome/files/patch-bc @@ -1,15 +1,11 @@ --- libgnome/Makefile.in.orig Wed Apr 7 21:33:54 1999 +++ libgnome/Makefile.in Fri Apr 30 17:35:08 1999 -@@ -172,10 +172,10 @@ +@@ -172,7 +172,7 @@ EXTRA_DIST = parse-path.cP -libgnome_la_LDFLAGS = -version-info 35:3:3 #-rpath $(libdir) -+libgnome_la_LDFLAGS = -version-info 1:0:0 #-rpath $(libdir) ++libgnome_la_LDFLAGS = -version-info 2:0:0 #-rpath $(libdir) libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB) --bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote gconfigger gnome-gen-mimedb -+bin_PROGRAMS = gnome-dump-metadata gnome-moz-remote gconfigger gnome-gen-mimedb - - - dns_helper_SOURCES = dns-helper.c + bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote gconfigger gnome-gen-mimedb diff --git a/x11/libgnome/files/patch-bd b/x11/libgnome/files/patch-bd index 0742d83763b0..dc9615aa82cd 100644 --- a/x11/libgnome/files/patch-bd +++ b/x11/libgnome/files/patch-bd @@ -5,25 +5,16 @@ -libgnomeui_la_LDFLAGS = -version-info 41:1:9 -rpath $(libdir) -+libgnomeui_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir) ++libgnomeui_la_LDFLAGS = -version-info 2:0:0 -rpath $(libdir) libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) gnome_segv_LDADD = libgnomeui.la $(top_builddir)/libgnome/libgnome.la $(top_builddir)/libart_lgpl/libart_lgpl.la @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) $(INTLLIBS) -@@ -1478,7 +1478,7 @@ - check: check-recursive - installcheck-am: - installcheck: installcheck-recursive --install-exec-am: install-libLTLIBRARIES install-binPROGRAMS -+install-exec-am: install-libLTLIBRARIES - install-exec: install-exec-recursive +@@ -258,7 +258,7 @@ + gnome-startup.lo gnome-stock.lo gnome-winhints.lo \ + gnome-paper-selector.lo gnome-procbar.lo gnometypes.lo gtkcauldron.lo \ + gtk-clock.lo gtk-ted.lo gtkdial.lo gtkpixmapmenuitem.lo +-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) ++PROGRAMS = $(bin_PROGRAMS) - install-data-am: install-gtkrcDATA install-libgnomeuiincludeHEADERS -@@ -1490,7 +1490,7 @@ - uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \ - uninstall-gtkrcDATA uninstall-libgnomeuiincludeHEADERS - uninstall: uninstall-recursive --all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) -+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) - all-redirect: all-recursive - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + gnome_segv_OBJECTS = gnome_segv.o + gnome_segv_DEPENDENCIES = libgnomeui.la \ diff --git a/x11/libgnome/files/patch-be b/x11/libgnome/files/patch-be index f5bdd3c1180c..478ed9ab2813 100644 --- a/x11/libgnome/files/patch-be +++ b/x11/libgnome/files/patch-be @@ -5,7 +5,7 @@ -libgnorba_la_LDFLAGS = -version-info 28:5:1 -rpath $(libdir) -+libgnorba_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir) ++libgnorba_la_LDFLAGS = -version-info 2:0:0 -rpath $(libdir) libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm loadshlib_SOURCES = loadshlib.c diff --git a/x11/libgnome/files/patch-bf b/x11/libgnome/files/patch-bf index 26760886d0b3..bdb98560937e 100644 --- a/x11/libgnome/files/patch-bf +++ b/x11/libgnome/files/patch-bf @@ -14,7 +14,7 @@ libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c libgnomesupport_la_LIBADD = @LTLIBOBJS@ -libgnomesupport_la_LDFLAGS = -version-info 0:0:0 -+libgnomesupport_la_LDFLAGS = -version-info 1:0:0 ++libgnomesupport_la_LDFLAGS = -version-info 2:0:0 BUILT_SOURCES = gnomesupport.h diff --git a/x11/libgnome/files/patch-bg b/x11/libgnome/files/patch-bg index 15a50ea71d3e..5a793e0dd1c7 100644 --- a/x11/libgnome/files/patch-bg +++ b/x11/libgnome/files/patch-bg @@ -1,30 +1,29 @@ ---- zvt/Makefile.in.orig Wed Apr 7 21:34:27 1999 -+++ zvt/Makefile.in Fri Apr 30 17:53:45 1999 +--- zvt/Makefile.in.orig Wed Apr 28 02:58:32 1999 ++++ zvt/Makefile.in Sat May 8 22:50:50 1999 +@@ -20,7 +20,7 @@ + exec_prefix = @exec_prefix@ + + bindir = @bindir@ +-sbindir = @sbindir@ ++sbindir = @bindir@ + libexecdir = @libexecdir@ + datadir = @datadir@ + sysconfdir = @sysconfdir@ @@ -160,7 +160,7 @@ libzvt_la_SOURCES = gnome-login-support.h gnome-login-support.c lists.c subshell.h subshell.c subshell-includes.h update.c vt.c zvtterm.c -libzvt_la_LDFLAGS = -version-info 4:3:2 -rpath $(libdir) -+libzvt_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir) ++libzvt_la_LDFLAGS = -version-info 2:0:0 -rpath $(libdir) libzvtinclude_HEADERS = lists.h vt.h vtx.h zvtterm.h -@@ -435,8 +435,7 @@ - check: check-am - installcheck-am: - installcheck: installcheck-am --install-exec-am: install-libLTLIBRARIES install-sbinPROGRAMS \ -- install-exec-local -+install-exec-am: install-libLTLIBRARIES - install-exec: install-exec-am +@@ -200,7 +200,7 @@ + libzvt_la_LIBADD = + libzvt_la_OBJECTS = gnome-login-support.lo lists.lo subshell.lo \ + update.lo vt.lo zvtterm.lo +-PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS) ++PROGRAMS = $(sbin_PROGRAMS) - install-data-am: install-libzvtincludeHEADERS -@@ -448,7 +447,7 @@ - uninstall-am: uninstall-libLTLIBRARIES uninstall-sbinPROGRAMS \ - uninstall-libzvtincludeHEADERS - uninstall: uninstall-am --all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) -+all-am: Makefile $(LTLIBRARIES) $(HEADERS) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + zterm_OBJECTS = zterm.o + zterm_DEPENDENCIES = libzvt.la diff --git a/x11/libgnome/files/patch-bi b/x11/libgnome/files/patch-bi index 8d49b031a833..09749e8c6f58 100644 --- a/x11/libgnome/files/patch-bi +++ b/x11/libgnome/files/patch-bi @@ -1,16 +1,20 @@ ---- libart_lgpl/Makefile.in.orig Tue Feb 16 01:09:07 1999 -+++ libart_lgpl/Makefile.in Fri Feb 19 00:20:20 1999 +--- libart_lgpl/Makefile.in.orig Wed Apr 28 02:57:51 1999 ++++ libart_lgpl/Makefile.in Fri Apr 30 00:19:41 1999 @@ -94,7 +94,7 @@ libart_lgpl_la_SOURCES = art_affine.c art_alphagamma.c art_bpath.c art_gray_svp.c art_misc.c art_pixbuf.c art_rect.c art_rect_svp.c art_rect_uta.c art_rgb.c art_rgb_affine.c art_rgb_affine_private.c art_rgb_affine_private.h art_rgb_bitmap_affine.c art_rgb_pixbuf_affine.c art_rgb_rgba_affine.c art_rgb_svp.c art_svp.c art_svp_ops.c art_svp_render_aa.c art_svp_vpath.c art_svp_vpath_stroke.c art_svp_wind.c art_svp_wind.h art_uta.c art_uta_ops.c art_uta_rect.c art_uta_vpath.c art_uta_svp.c art_vpath.c art_vpath_bpath.c art_vpath_svp.c -libart_lgpl_la_LDFLAGS = -version-info @LIBART_VERSION_INFO@ -+libart_lgpl_la_LDFLAGS = -version-info 1:0:0 ++libart_lgpl_la_LDFLAGS = -version-info 2:0:0 libart_lgplincdir = $(includedir)/libart_lgpl libart_lgplinc_HEADERS = art_affine.h art_alphagamma.h art_bpath.h art_filterlevel.h art_gray_svp.h art_misc.h art_pathcode.h art_pixbuf.h art_point.h art_rect.h art_rect_svp.h art_rect_uta.h art_rgb.h art_rgb_affine.h art_rgb_bitmap_affine.h art_rgb_pixbuf_affine.h art_rgb_rgba_affine.h art_rgb_svp.h art_svp.h art_svp_ops.h art_svp_render_aa.h art_svp_vpath.h art_svp_vpath_stroke.h art_uta.h art_uta_ops.h art_uta_rect.h art_uta_vpath.h art_uta_svp.h art_vpath.h art_vpath_bpath.h art_vpath_svp.h -@@ -118,7 +118,7 @@ - m4datadir = $(datadir)/aclocal +@@ -115,10 +115,10 @@ + testuta_DEPENDENCIES = $(DEPS) + testuta_LDADD = $(LDADDS) -lm + +-m4datadir = $(datadir)/aclocal ++m4datadir = $(prefix)/share/aclocal m4data_DATA = libart.m4 -confexecdir = $(libdir) @@ -18,15 +22,6 @@ confexec_DATA = libartConf.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs -@@ -559,7 +559,7 @@ - install-confexecDATA - install-exec: install-exec-am - --install-data-am: install-m4dataDATA install-libart_lgplincHEADERS -+install-data-am: install-libart_lgplincHEADERS - install-data: install-data-am - - install-am: all-am @@ -569,7 +569,7 @@ uninstall-confexecDATA uninstall-m4dataDATA \ uninstall-libart_lgplincHEADERS diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index 923390ca5e80..56dd10dbbc6b 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -1,3 +1,4 @@ +bin/dns-helper bin/gconfigger bin/gnome-bug bin/gnome-config @@ -5,6 +6,8 @@ bin/gnome-dump-metadata bin/gnome-gen-mimedb bin/gnome-moz-remote bin/gnome-name-service +bin/gnome-pty-helper +bin/gnome_segv bin/goad-browser bin/libart-config bin/loadshlib @@ -162,39 +165,32 @@ include/zvt/vt.h include/zvt/vtx.h include/zvt/zvtterm.h lib/libart_lgpl.a -lib/libart_lgpl.la lib/libart_lgpl.so -lib/libart_lgpl.so.1 +lib/libart_lgpl.so.2 lib/libgnome.a -lib/libgnome.la lib/libgnome.so -lib/libgnome.so.1 +lib/libgnome.so.2 lib/libgnomesupport.a -lib/libgnomesupport.la lib/libgnomesupport.so -lib/libgnomesupport.so.1 +lib/libgnomesupport.so.2 lib/libgnomeui.a -lib/libgnomeui.la lib/libgnomeui.so -lib/libgnomeui.so.1 +lib/libgnomeui.so.2 lib/libgnorba.a -lib/libgnorba.la lib/libgnorba.so -lib/libgnorba.so.1 +lib/libgnorba.so.2 lib/libgnorbagtk.a -lib/libgnorbagtk.la lib/libgnorbagtk.so lib/libgnorbagtk.so.0 lib/libgtkxmhtml.a -lib/libgtkxmhtml.la lib/libgtkxmhtml.so lib/libgtkxmhtml.so.1 lib/libzvt.a -lib/libzvt.la lib/libzvt.so -lib/libzvt.so.1 +lib/libzvt.so.2 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B +share/aclocal/libart.m4 share/gnome/gtkrc share/gnome/gtkrc.ja share/gnome/gtkrc.ko |