diff options
| author | nectar <nectar@FreeBSD.org> | 1999-03-09 09:13:40 +0800 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 1999-03-09 09:13:40 +0800 |
| commit | 335b69e64c46a9b9a7f0d4d19ea28b244857926c (patch) | |
| tree | 0df43399e68f3e4b4439fba4d1524723babff3c7 | |
| parent | bf864b4f9741f1048d32868d9e3544a23fea1f39 (diff) | |
| download | freebsd-ports-gnome-335b69e64c46a9b9a7f0d4d19ea28b244857926c.tar.gz freebsd-ports-gnome-335b69e64c46a9b9a7f0d4d19ea28b244857926c.tar.zst freebsd-ports-gnome-335b69e64c46a9b9a7f0d4d19ea28b244857926c.zip | |
Upgrade to GNOME 1.0. The following are the details:
ports/audio/esound 0.2.7 -> 0.2.8 PR ports/10422
ports/audio/gnomeaudio 0.99.8 -> 1.0.0 PR ports/10426
ports/audio/libaudiofile 0.1.5 -> 0.1.6 PR ports/10421
ports/deskutils/gnomepim 0.99.8.1 -> 1.0.1 PR ports/10435
ports/devel/ORBit 0.3.98 -> 0.4.0 PR ports/10423
ports/devel/gettext shared libs now PR ports/10293
ports/devel/glib12 1.1.16 -> 1.2.0 PR ports/10419
ports/devel/libgtop 0.99.8 -> 1.0.1 PR ports/10430
ports/games/gnomegames 0.99.8 -> 1.0.1 PR ports/10436
ports/graphics/electriceyes distfile moved PR ports/10437
ports/graphics/imlib 1.9.3 -> 1.9.4 PR ports/10424
ports/lang/gnomeobjc 0.99.3 -> 1.0.1 PR ports/10441
ports/math/gnumeric 0.6 -> 0.15 PR ports/10439
ports/misc/gnomeutils 0.99.5 -> 1.0.1 PR ports/10442
ports/sysutils/gnomeadmin 0.99.1 -> 1.0.1 PR ports/10445
ports/sysutils/gnomecontrolcenter 0.99.3.1 -> 1.0.1 PR ports/10446
ports/sysutils/gtop 0.99.2 -> 1.0.1 PR ports/10477
ports/textproc/libxml 0.99.8 -> 1.0.0 PR ports/10438
ports/www/libghttp distfile moved PR ports/10429
ports/x11/gnome 0.99.3 -> 1.0.0 PR ports/10450
ports/x11/gnomecore 0.99.8.1 -> 1.0.1 PR ports/10432
ports/x11/gnomelibs 0.99.8.1 -> 1.0.1 PR ports/10425
ports/x11-fm/gnomemc 4.5.10 -> 4.5.23 PR ports/10448
ports/x11-toolkits/gtk-engines 0.1 -> 0.5 PR ports/10427
ports/x11-toolkits/gtk12 1.1.6 -> 1.2.0 PR ports/10420
Note that repository copies were made before this commit, as follows:
ports/devel/glib11-devel -> ports/devel/glib12
ports/x11-toolkits/gtk11-devel -> ports/x11-toolkits/gtk12
Submitted by: Jeremy Lea <reg@shale.csir.co.za>
236 files changed, 4600 insertions, 4570 deletions
diff --git a/audio/esound/Makefile b/audio/esound/Makefile index a9f95dc2b1d9..f9a8687490b2 100644 --- a/audio/esound/Makefile +++ b/audio/esound/Makefile @@ -1,15 +1,15 @@ # New ports collection makefile for: esound -# Version required: 0.2.7 +# Version required: 0.2.8 # Date created: 19 July 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.6 1998/12/26 05:56:52 vanilla Exp $ +# $Id: Makefile,v 1.7 1999/01/27 08:31:46 fenner Exp $ # -DISTNAME= esound-0.2.7 +DISTNAME= esound-0.2.8 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= esound +MASTER_SITE_SUBDIR= gnome-1.0/sources #MASTER_SITES= ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \ # ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \ # ftp://ftp.labs.redhat.com/pub/imlib/TAR/ diff --git a/audio/esound/distinfo b/audio/esound/distinfo index 68d8e0defe71..3abca1c95d5b 100644 --- a/audio/esound/distinfo +++ b/audio/esound/distinfo @@ -1 +1 @@ -MD5 (esound-0.2.7.tar.gz) = 3a530a942880268f8b9aaf3df38fd478 +MD5 (esound-0.2.8.tar.gz) = fa22beaa64d9da82858762cf1fc76de3 diff --git a/audio/esound/files/patch-aa b/audio/esound/files/patch-aa index 1bcc83d4f0ab..8c44e4fadbd5 100644 --- a/audio/esound/files/patch-aa +++ b/audio/esound/files/patch-aa @@ -1,19 +1,19 @@ ---- Makefile.in.orig Tue Dec 15 01:22:45 1998 -+++ Makefile.in Wed Dec 23 04:57:49 1998 -@@ -110,14 +110,14 @@ - esdfile.c \ - audio.c +--- Makefile.in.orig Wed Feb 24 22:23:07 1999 ++++ Makefile.in Mon Mar 1 19:45:21 1999 +@@ -104,14 +104,14 @@ + libesd_la_SOURCES = esdlib.c esdmgr.c esdfile.c audio.c + -libesd_la_LDFLAGS = -version-info @ESD_VERSION_INFO@ +libesd_la_LDFLAGS = -version-info 1:0:0 libesd_la_LIBADD = @AUDIOFILE_LIBS@ -lm - EXTRA_LTLIBRARIES = \ - libesddsp.la + EXTRA_LTLIBRARIES = libesddsp.la + -libesddsp_la_LDFLAGS = -rpath $(libdir) -version-info @ESD_VERSION_INFO@ +libesddsp_la_LDFLAGS = -rpath $(libdir) -version-info 1:0:0 - libesddsp_la_LIBADD = -ldl -lm + libesddsp_la_LIBADD = @DL_LIB@ -lm diff --git a/audio/esound/files/patch-ab b/audio/esound/files/patch-ab deleted file mode 100644 index 8a0d2ff0bf3f..000000000000 --- a/audio/esound/files/patch-ab +++ /dev/null @@ -1,19 +0,0 @@ ---- ltmain.sh.orig Thu Dec 31 19:15:49 1998 -+++ ltmain.sh Thu Dec 31 19:17:02 1998 -@@ -923,6 +923,16 @@ - versuffix="$current.$revision" - ;; - -+ freebsd) -+ version_vars="$version_vars major versuffix" -+ major="$current" -+ if [ $PORTOBJFORMAT = elf ]; then -+ versuffix="$current" -+ else -+ versuffix="$current.$revision" -+ fi -+ ;; -+ - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 diff --git a/audio/esound/files/patch-ac b/audio/esound/files/patch-ac index 05cd51b1c723..a8b2cfa912f1 100644 --- a/audio/esound/files/patch-ac +++ b/audio/esound/files/patch-ac @@ -1,34 +1,20 @@ ---- ltconfig.orig Tue Dec 15 01:22:13 1998 -+++ ltconfig Tue Feb 2 02:40:07 1999 -@@ -767,7 +767,7 @@ +--- ltconfig.orig Thu Jan 21 21:28:41 1999 ++++ ltconfig Mon Mar 1 19:23:29 1999 +@@ -1201,7 +1201,7 @@ ;; # FreeBSD 3, at last, uses gcc -shared to do shared libraries. - freebsd3*) + freebsd*) - archive_cmds='$CC -shared -o $lib$libobjs' + archive_cmds='$CC -shared -o $lib$libobjs$deplibs' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes -@@ -1105,10 +1105,21 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "$lib" | sed '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' +@@ -1606,7 +1606,7 @@ + shlibpath_var=PATH ;; -freebsd2* | freebsd3*) -+freebsd2*) - version_type=sunos - library_names_spec='$libname.so.$versuffix $libname.so' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ +freebsd*) -+ version_type=freebsd -+ library_names_spec='$libname.so.$versuffix $libname.so' -+ if [ $PORTOBJFORMAT = elf ]; then -+ finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir' -+ else -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ fi - shlibpath_var=LD_LIBRARY_PATH - ;; - + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` + version_type=freebsd-$objformat + library_names_spec='${libname}${release}.so$versuffix $libname.so' diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile index 0a8127c3c4e0..24c8568198ec 100644 --- a/audio/gnome-audio/Makefile +++ b/audio/gnome-audio/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: gnomeaudio -# Version required: 0.99.8 +# Version required: 1.0.0 # Date created: 29 Dec 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.4 1999/01/31 19:08:54 vanilla Exp $ +# $Id: Makefile,v 1.5 1999/02/19 04:24:59 vanilla Exp $ # -DISTNAME= gnome-audio-0.99.8 -PKGNAME= gnomeaudio-0.99.8 +DISTNAME= gnome-audio-1.0.0 +PKGNAME= gnomeaudio-1.0.0 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-audio +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= vanilla@FreeBSD.ORG @@ -23,4 +23,7 @@ NO_BUILD= yes INSTALL_TARGET= INSTALL_DATA="${INSTALL_DATA}" install +post-extract: + @${RM} -r ${WRKSRC}/sounds/sounds + .include <bsd.port.mk> diff --git a/audio/gnome-audio/distinfo b/audio/gnome-audio/distinfo index b284f75b64f0..b6a971e4403e 100644 --- a/audio/gnome-audio/distinfo +++ b/audio/gnome-audio/distinfo @@ -1 +1 @@ -MD5 (gnome-audio-0.99.8.tar.gz) = 68dc71c2317fc5ac5ba9dbfc7ac0f121 +MD5 (gnome-audio-1.0.0.tar.gz) = 3ae217dfa20fc8fbb67595a32d6beeec diff --git a/audio/gnome-audio/files/patch-aa b/audio/gnome-audio/files/patch-aa index 7a342f576f78..f503576c9f07 100644 --- a/audio/gnome-audio/files/patch-aa +++ b/audio/gnome-audio/files/patch-aa @@ -1,5 +1,5 @@ ---- sounds/Makefile.orig Tue Feb 16 01:07:51 1999 -+++ sounds/Makefile Fri Feb 19 03:28:42 1999 +--- sounds/Makefile.orig Wed Feb 24 22:19:09 1999 ++++ sounds/Makefile Sat Mar 6 15:20:39 1999 @@ -6,10 +6,10 @@ install-files: @@ -11,7 +11,7 @@ done install-default-links: -- ln -sf startup2.wav $(prefix)/share/sounds/login.wav +- ln -sf startup3.wav $(prefix)/share/sounds/login.wav - ln -sf shutdown1.wav $(prefix)/share/sounds/logout.wav -+ ln -sf startup1.wav $(prefix)/share/gnome/sounds/startup.wav ++ ln -sf startup3.wav $(prefix)/share/gnome/sounds/startup.wav + ln -sf shutdown1.wav $(prefix)/share/gnome/sounds/logout.wav diff --git a/audio/gnome-audio/pkg-plist b/audio/gnome-audio/pkg-plist index b3927a28402f..806f9647d5cd 100644 --- a/audio/gnome-audio/pkg-plist +++ b/audio/gnome-audio/pkg-plist @@ -1,33 +1,16 @@ -share/gnome/sounds/applause.wav share/gnome/sounds/card_shuffle.wav -share/gnome/sounds/duck.wav -share/gnome/sounds/gnibbles/appear.wav -share/gnome/sounds/gnibbles/bonus.wav -share/gnome/sounds/gnibbles/crash.wav -share/gnome/sounds/gnibbles/gobble.wav -share/gnome/sounds/gnibbles/laughter.wav -share/gnome/sounds/gnibbles/life.wav -share/gnome/sounds/gnibbles/pop.wav -share/gnome/sounds/gnibbles/reverse.wav -share/gnome/sounds/gnibbles/start.wav -share/gnome/sounds/gnibbles/teleport.wav -share/gnome/sounds/gnothello/flip-piece.wav -share/gnome/sounds/gnothello/gameover.wav share/gnome/sounds/gtk-events/activate.wav share/gnome/sounds/gtk-events/clicked.wav share/gnome/sounds/gtk-events/toggled.wav -share/gnome/sounds/impact-streak.wav share/gnome/sounds/login.wav share/gnome/sounds/logout.wav share/gnome/sounds/panel/slide.wav share/gnome/sounds/phone.wav -share/gnome/sounds/ricochet.wav share/gnome/sounds/shutdown1.wav share/gnome/sounds/startup.wav share/gnome/sounds/startup1.wav share/gnome/sounds/startup2.wav -@dirrm share/gnome/sounds/gnibbles -@dirrm share/gnome/sounds/gnothello +share/gnome/sounds/startup3.wav @dirrm share/gnome/sounds/gtk-events @dirrm share/gnome/sounds/panel @dirrm share/gnome/sounds diff --git a/audio/gnomeaudio/Makefile b/audio/gnomeaudio/Makefile index 0a8127c3c4e0..24c8568198ec 100644 --- a/audio/gnomeaudio/Makefile +++ b/audio/gnomeaudio/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: gnomeaudio -# Version required: 0.99.8 +# Version required: 1.0.0 # Date created: 29 Dec 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.4 1999/01/31 19:08:54 vanilla Exp $ +# $Id: Makefile,v 1.5 1999/02/19 04:24:59 vanilla Exp $ # -DISTNAME= gnome-audio-0.99.8 -PKGNAME= gnomeaudio-0.99.8 +DISTNAME= gnome-audio-1.0.0 +PKGNAME= gnomeaudio-1.0.0 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-audio +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= vanilla@FreeBSD.ORG @@ -23,4 +23,7 @@ NO_BUILD= yes INSTALL_TARGET= INSTALL_DATA="${INSTALL_DATA}" install +post-extract: + @${RM} -r ${WRKSRC}/sounds/sounds + .include <bsd.port.mk> diff --git a/audio/gnomeaudio/distinfo b/audio/gnomeaudio/distinfo index b284f75b64f0..b6a971e4403e 100644 --- a/audio/gnomeaudio/distinfo +++ b/audio/gnomeaudio/distinfo @@ -1 +1 @@ -MD5 (gnome-audio-0.99.8.tar.gz) = 68dc71c2317fc5ac5ba9dbfc7ac0f121 +MD5 (gnome-audio-1.0.0.tar.gz) = 3ae217dfa20fc8fbb67595a32d6beeec diff --git a/audio/gnomeaudio/files/patch-aa b/audio/gnomeaudio/files/patch-aa index 7a342f576f78..f503576c9f07 100644 --- a/audio/gnomeaudio/files/patch-aa +++ b/audio/gnomeaudio/files/patch-aa @@ -1,5 +1,5 @@ ---- sounds/Makefile.orig Tue Feb 16 01:07:51 1999 -+++ sounds/Makefile Fri Feb 19 03:28:42 1999 +--- sounds/Makefile.orig Wed Feb 24 22:19:09 1999 ++++ sounds/Makefile Sat Mar 6 15:20:39 1999 @@ -6,10 +6,10 @@ install-files: @@ -11,7 +11,7 @@ done install-default-links: -- ln -sf startup2.wav $(prefix)/share/sounds/login.wav +- ln -sf startup3.wav $(prefix)/share/sounds/login.wav - ln -sf shutdown1.wav $(prefix)/share/sounds/logout.wav -+ ln -sf startup1.wav $(prefix)/share/gnome/sounds/startup.wav ++ ln -sf startup3.wav $(prefix)/share/gnome/sounds/startup.wav + ln -sf shutdown1.wav $(prefix)/share/gnome/sounds/logout.wav diff --git a/audio/gnomeaudio/pkg-plist b/audio/gnomeaudio/pkg-plist index b3927a28402f..806f9647d5cd 100644 --- a/audio/gnomeaudio/pkg-plist +++ b/audio/gnomeaudio/pkg-plist @@ -1,33 +1,16 @@ -share/gnome/sounds/applause.wav share/gnome/sounds/card_shuffle.wav -share/gnome/sounds/duck.wav -share/gnome/sounds/gnibbles/appear.wav -share/gnome/sounds/gnibbles/bonus.wav -share/gnome/sounds/gnibbles/crash.wav -share/gnome/sounds/gnibbles/gobble.wav -share/gnome/sounds/gnibbles/laughter.wav -share/gnome/sounds/gnibbles/life.wav -share/gnome/sounds/gnibbles/pop.wav -share/gnome/sounds/gnibbles/reverse.wav -share/gnome/sounds/gnibbles/start.wav -share/gnome/sounds/gnibbles/teleport.wav -share/gnome/sounds/gnothello/flip-piece.wav -share/gnome/sounds/gnothello/gameover.wav share/gnome/sounds/gtk-events/activate.wav share/gnome/sounds/gtk-events/clicked.wav share/gnome/sounds/gtk-events/toggled.wav -share/gnome/sounds/impact-streak.wav share/gnome/sounds/login.wav share/gnome/sounds/logout.wav share/gnome/sounds/panel/slide.wav share/gnome/sounds/phone.wav -share/gnome/sounds/ricochet.wav share/gnome/sounds/shutdown1.wav share/gnome/sounds/startup.wav share/gnome/sounds/startup1.wav share/gnome/sounds/startup2.wav -@dirrm share/gnome/sounds/gnibbles -@dirrm share/gnome/sounds/gnothello +share/gnome/sounds/startup3.wav @dirrm share/gnome/sounds/gtk-events @dirrm share/gnome/sounds/panel @dirrm share/gnome/sounds diff --git a/audio/gnomeaudio2/Makefile b/audio/gnomeaudio2/Makefile index 0a8127c3c4e0..24c8568198ec 100644 --- a/audio/gnomeaudio2/Makefile +++ b/audio/gnomeaudio2/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: gnomeaudio -# Version required: 0.99.8 +# Version required: 1.0.0 # Date created: 29 Dec 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.4 1999/01/31 19:08:54 vanilla Exp $ +# $Id: Makefile,v 1.5 1999/02/19 04:24:59 vanilla Exp $ # -DISTNAME= gnome-audio-0.99.8 -PKGNAME= gnomeaudio-0.99.8 +DISTNAME= gnome-audio-1.0.0 +PKGNAME= gnomeaudio-1.0.0 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-audio +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= vanilla@FreeBSD.ORG @@ -23,4 +23,7 @@ NO_BUILD= yes INSTALL_TARGET= INSTALL_DATA="${INSTALL_DATA}" install +post-extract: + @${RM} -r ${WRKSRC}/sounds/sounds + .include <bsd.port.mk> diff --git a/audio/gnomeaudio2/distinfo b/audio/gnomeaudio2/distinfo index b284f75b64f0..b6a971e4403e 100644 --- a/audio/gnomeaudio2/distinfo +++ b/audio/gnomeaudio2/distinfo @@ -1 +1 @@ -MD5 (gnome-audio-0.99.8.tar.gz) = 68dc71c2317fc5ac5ba9dbfc7ac0f121 +MD5 (gnome-audio-1.0.0.tar.gz) = 3ae217dfa20fc8fbb67595a32d6beeec diff --git a/audio/gnomeaudio2/files/patch-aa b/audio/gnomeaudio2/files/patch-aa index 7a342f576f78..f503576c9f07 100644 --- a/audio/gnomeaudio2/files/patch-aa +++ b/audio/gnomeaudio2/files/patch-aa @@ -1,5 +1,5 @@ ---- sounds/Makefile.orig Tue Feb 16 01:07:51 1999 -+++ sounds/Makefile Fri Feb 19 03:28:42 1999 +--- sounds/Makefile.orig Wed Feb 24 22:19:09 1999 ++++ sounds/Makefile Sat Mar 6 15:20:39 1999 @@ -6,10 +6,10 @@ install-files: @@ -11,7 +11,7 @@ done install-default-links: -- ln -sf startup2.wav $(prefix)/share/sounds/login.wav +- ln -sf startup3.wav $(prefix)/share/sounds/login.wav - ln -sf shutdown1.wav $(prefix)/share/sounds/logout.wav -+ ln -sf startup1.wav $(prefix)/share/gnome/sounds/startup.wav ++ ln -sf startup3.wav $(prefix)/share/gnome/sounds/startup.wav + ln -sf shutdown1.wav $(prefix)/share/gnome/sounds/logout.wav diff --git a/audio/gnomeaudio2/pkg-plist b/audio/gnomeaudio2/pkg-plist index b3927a28402f..806f9647d5cd 100644 --- a/audio/gnomeaudio2/pkg-plist +++ b/audio/gnomeaudio2/pkg-plist @@ -1,33 +1,16 @@ -share/gnome/sounds/applause.wav share/gnome/sounds/card_shuffle.wav -share/gnome/sounds/duck.wav -share/gnome/sounds/gnibbles/appear.wav -share/gnome/sounds/gnibbles/bonus.wav -share/gnome/sounds/gnibbles/crash.wav -share/gnome/sounds/gnibbles/gobble.wav -share/gnome/sounds/gnibbles/laughter.wav -share/gnome/sounds/gnibbles/life.wav -share/gnome/sounds/gnibbles/pop.wav -share/gnome/sounds/gnibbles/reverse.wav -share/gnome/sounds/gnibbles/start.wav -share/gnome/sounds/gnibbles/teleport.wav -share/gnome/sounds/gnothello/flip-piece.wav -share/gnome/sounds/gnothello/gameover.wav share/gnome/sounds/gtk-events/activate.wav share/gnome/sounds/gtk-events/clicked.wav share/gnome/sounds/gtk-events/toggled.wav -share/gnome/sounds/impact-streak.wav share/gnome/sounds/login.wav share/gnome/sounds/logout.wav share/gnome/sounds/panel/slide.wav share/gnome/sounds/phone.wav -share/gnome/sounds/ricochet.wav share/gnome/sounds/shutdown1.wav share/gnome/sounds/startup.wav share/gnome/sounds/startup1.wav share/gnome/sounds/startup2.wav -@dirrm share/gnome/sounds/gnibbles -@dirrm share/gnome/sounds/gnothello +share/gnome/sounds/startup3.wav @dirrm share/gnome/sounds/gtk-events @dirrm share/gnome/sounds/panel @dirrm share/gnome/sounds diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile index ac855d3ca8ce..9457990217d2 100644 --- a/audio/libaudiofile/Makefile +++ b/audio/libaudiofile/Makefile @@ -1,15 +1,16 @@ # New ports collection makefile for: libaudiofile -# Version required: 0.1.5 +# Version required: 0.1.6 # Date created: 22 Dec 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.1.1.1 1998/12/23 19:08:50 vanilla Exp $ +# $Id: Makefile,v 1.2 1999/01/27 08:31:48 fenner Exp $ # -DISTNAME= libaudiofile-0.1.5 +DISTNAME= audiofile-0.1.6 +PKGNAME= libaudiofile-0.1.6 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= libaudiofile +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= vanilla@FreeBSD.ORG diff --git a/audio/libaudiofile/distinfo b/audio/libaudiofile/distinfo index 85b11de7d87c..ead33e69cbee 100644 --- a/audio/libaudiofile/distinfo +++ b/audio/libaudiofile/distinfo @@ -1 +1 @@ -MD5 (libaudiofile-0.1.5.tar.gz) = 9eaf6631b47750c2c9cdedaa8da5546c +MD5 (audiofile-0.1.6.tar.gz) = 787c59576393dfb7bdc1a2d2da67441e diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile index 00478acc31ba..15f0964a4172 100644 --- a/deskutils/gnome-pim/Makefile +++ b/deskutils/gnome-pim/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: gnomepim -# Version required: 0.99.8.1 +# Version required: 1.0.1 # Date created: 17 Jan 1999 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.3 1999/02/02 07:33:55 vanilla Exp $ +# $Id: Makefile,v 1.4 1999/02/19 04:30:03 vanilla Exp $ # -DISTNAME= gnome-pim-0.99.8.1 -PKGNAME= gnomepim-0.99.8.1 +DISTNAME= gnome-pim-1.0.1 +PKGNAME= gnomepim-1.0.1 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-pim +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com @@ -24,7 +24,7 @@ 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/gtk11d-config" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: diff --git a/deskutils/gnome-pim/distinfo b/deskutils/gnome-pim/distinfo index 22af0615e6ba..fc37cd217dd7 100644 --- a/deskutils/gnome-pim/distinfo +++ b/deskutils/gnome-pim/distinfo @@ -1 +1 @@ -MD5 (gnome-pim-0.99.8.1.tar.gz) = 7abb905be1b2018e6ee5053f294b7194 +MD5 (gnome-pim-1.0.1.tar.gz) = 1f299e994a4fceb0f520bf03385510c5 diff --git a/deskutils/gnome-pim/files/patch-ab b/deskutils/gnome-pim/files/patch-ab index e7a8e2b3ab95..e2aad34c8ed5 100644 --- a/deskutils/gnome-pim/files/patch-ab +++ b/deskutils/gnome-pim/files/patch-ab @@ -1,7 +1,7 @@ ---- gncal/Makefile.in.orig Tue Feb 2 09:08:47 1999 -+++ gncal/Makefile.in Tue Feb 2 09:09:32 1999 -@@ -111,11 +111,11 @@ - YACC = @YACC@ +--- gncal/Makefile.in.orig Mon Mar 1 00:39:07 1999 ++++ gncal/Makefile.in Wed Mar 3 10:45:10 1999 +@@ -112,11 +112,11 @@ + ZVT_LIBS = @ZVT_LIBS@ l = @l@ -help_base = $(datadir)/gnome/help/cal @@ -14,11 +14,23 @@ bin_PROGRAMS = gnomecal ---- gnomecard/Makefile.in.orig Tue Feb 2 09:09:12 1999 -+++ gnomecard/Makefile.in Tue Feb 2 09:10:02 1999 -@@ -113,11 +113,11 @@ +@@ -134,7 +134,7 @@ + EXTRA_DIST = gncal.desktop topic.dat gnome-cal.html bell.xpm recur.xpm + + +-Productivitydir = $(datadir)/gnome/apps/Applications ++Productivitydir = $(datadir)/apps/Applications + + Productivity_DATA = gncal.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +--- gnomecard/Makefile.in.orig Mon Mar 1 00:39:10 1999 ++++ gnomecard/Makefile.in Wed Mar 3 10:45:39 1999 +@@ -112,13 +112,13 @@ + ZVT_LIBS = @ZVT_LIBS@ + l = @l@ - SUBDIRS = help +-SUBDIRS = help ++# SUBDIRS = help -xpmhelp_base = $(datadir)/gnome/help/cal +xpmhelp_base = $(datadir)/help/cal @@ -30,6 +42,15 @@ bin_PROGRAMS = gnomecard +@@ -143,7 +143,7 @@ + EXTRA_DIST = addr.xpm addrtool.xpm cardedit.xpm cardnew.xpm cardfind.xpm email.xpm expl.xpm first.xpm geo.xpm ident.xpm last.xpm org.xpm sec.xpm tel.xpm teltool.xpm phone.xpm world.xpm gnomecard.desktop gnomecard.gnorba + + +-Productivitydir = $(datadir)/gnome/apps/Applications ++Productivitydir = $(datadir)/apps/Applications + + Productivity_DATA = gnomecard.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- gnomecard/help/C/Makefile.in.orig Tue Feb 2 09:10:22 1999 +++ gnomecard/help/C/Makefile.in Tue Feb 2 09:10:30 1999 @@ -112,7 +112,7 @@ @@ -41,14 +62,3 @@ gnomecard_help_DATA = index.html topic.dat ---- po/Makefile.in.in.orig Tue Feb 2 09:11:11 1999 -+++ po/Makefile.in.in Tue Feb 2 09:11:19 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/deskutils/gnome-pim/pkg-plist b/deskutils/gnome-pim/pkg-plist index 5ddc7de7c202..cc17d7df82f4 100644 --- a/deskutils/gnome-pim/pkg-plist +++ b/deskutils/gnome-pim/pkg-plist @@ -2,20 +2,11 @@ bin/gnomecal bin/gnomecard etc/CORBA/servers/gnomecard.gnorba lib/libversit.a -share/gnome/apps/Productivity/gncal.desktop -share/gnome/apps/Productivity/gnomecard.desktop +share/gnome/apps/Applications/gncal.desktop +share/gnome/apps/Applications/gnomecard.desktop share/gnome/help/cal/C/gnome-cal.html share/gnome/help/cal/C/index.html share/gnome/help/cal/C/topic.dat -share/gnome/help/gnomecard/C/description.html -share/gnome/help/gnomecard/C/dialogs.html -share/gnome/help/gnomecard/C/display.html -share/gnome/help/gnomecard/C/docbook.css -share/gnome/help/gnomecard/C/index.html -share/gnome/help/gnomecard/C/menubar.html -share/gnome/help/gnomecard/C/recordview.html -share/gnome/help/gnomecard/C/toolbar.html -share/gnome/help/gnomecard/C/topic.dat share/gnome/idl/gnome-pim.idl share/gnome/mime-info/gnome-pim.keys share/locale/cs/LC_MESSAGES/gnome-pim.mo @@ -24,13 +15,13 @@ share/locale/es/LC_MESSAGES/gnome-pim.mo share/locale/fi/LC_MESSAGES/gnome-pim.mo share/locale/fr/LC_MESSAGES/gnome-pim.mo share/locale/ga/LC_MESSAGES/gnome-pim.mo +share/locale/hu/LC_MESSAGES/gnome-pim.mo share/locale/it/LC_MESSAGES/gnome-pim.mo share/locale/ja/LC_MESSAGES/gnome-pim.mo share/locale/ko/LC_MESSAGES/gnome-pim.mo share/locale/no/LC_MESSAGES/gnome-pim.mo share/locale/pt/LC_MESSAGES/gnome-pim.mo share/locale/sv/LC_MESSAGES/gnome-pim.mo +share/locale/ru/LC_MESSAGES/gnome-pim.mo @dirrm share/gnome/help/cal/C @dirrm share/gnome/help/cal -@dirrm share/gnome/help/gnomecard/C -@dirrm share/gnome/help/gnomecard diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index afa832d7eb62..638052b77150 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -1,21 +1,22 @@ # New ports collection makefile for: gnomeutils -# Version required: 0.99.5 +# Version required: 1.0.1 # Date created: 03 July 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.5 1999/01/27 08:31:51 fenner Exp $ +# $Id: Makefile,v 1.6 1999/02/02 09:56:05 vanilla Exp $ # -DISTNAME= gnome-utils-0.99.5 -PKGNAME= gnomeutils-0.99.5 -CATEGORIES= misc +DISTNAME= gnome-utils-1.0.1 +PKGNAME= gnomeutils-1.0.1 +CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-utils +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= obgnome.1:${PORTSDIR}/lang/gnomeobjc USE_X_PREFIX= yes USE_GMAKE= yes @@ -24,7 +25,7 @@ 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/gtk11d-config" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" MAN1= gtt.1 diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo index 32cec07ed8c2..b35b2a17cd4c 100644 --- a/deskutils/gnome-utils/distinfo +++ b/deskutils/gnome-utils/distinfo @@ -1 +1 @@ -MD5 (gnome-utils-0.99.5.tar.gz) = 9eac5326842d1027edf2b959cbb23583 +MD5 (gnome-utils-1.0.1.tar.gz) = c267d32ddf310b3e9f70a2d915cccf5a diff --git a/deskutils/gnome-utils/files/patch-aa b/deskutils/gnome-utils/files/patch-aa index 7d8da8ddc7e7..2e73d96fd7b0 100644 --- a/deskutils/gnome-utils/files/patch-aa +++ b/deskutils/gnome-utils/files/patch-aa @@ -1,36 +1,20 @@ ---- configure.orig Tue Feb 2 09:42:09 1999 -+++ configure Tue Feb 2 09:43:37 1999 -@@ -1108,13 +1108,13 @@ - fi - - if test "$no_gnome_config" = "yes"; then -- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 --echo "configure:1113: checking for gnomeConf.sh file in $gnome_prefix" >&5 -- if test -f $gnome_prefix/gnomeConf.sh; then -+ echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6 -+echo "configure:1113: checking for gnomeConf.sh file in $prefix/share/gnome" >&5 -+ if test -f $prefix/share/gnome/gnomeConf.sh; then - echo "$ac_t""found" 1>&6 - echo "loading gnome configuration from" \ -- "$gnome_prefix/gnomeConf.sh" -- . $gnome_prefix/gnomeConf.sh -+ "$prefix/share/gnome/gnomeConf.sh" -+ . $prefix/share/gnome/gnomeConf.sh - - else - echo "$ac_t""not found" 1>&6 -@@ -3121,10 +3121,10 @@ - - if test $OBJECTIVE_C = yes; then +--- configure.orig Tue Mar 2 00:23:40 1999 ++++ configure Sat Mar 6 23:55:23 1999 +@@ -3143,7 +3143,7 @@ -- echo $ac_n "checking for obGnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 --echo "configure:3126: checking for obGnomeConf.sh file in $gnome_prefix" >&5 -- if test -f $gnome_prefix/obGnomeConf.sh; then -- . $gnome_prefix/obGnomeConf.sh -+ echo $ac_n "checking for obGnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6 -+echo "configure:3126: checking for obGnomeConf.sh file in $prefix/share/gnome" >&5 -+ if test -f $prefix/share/gnome/obGnomeConf.sh; then -+ . $prefix/share/gnome/obGnomeConf.sh - echo "$ac_t""found" 1>&6 - else - echo "$ac_t""not found" 1>&6 + echo $ac_n "checking for an obGnomeConf.sh""... $ac_c" 1>&6 + echo "configure:3146: checking for an obGnomeConf.sh" >&5 +- my_gnome_libdir=`$GNOME_CONFIG --libdir` ++ my_gnome_libdir=`$GNOME_CONFIG --sysconfdir` + if test -f $my_gnome_libdir/obGnomeConf.sh; then + . $my_gnome_libdir/obGnomeConf.sh + echo "$ac_t""found $my_gnome_libdir" 1>&6 +@@ -5389,7 +5389,7 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + CATOBJEXT=.mo +- DATADIRNAME=lib ++ DATADIRNAME=share + fi + rm -f conftest* + INSTOBJEXT=.mo diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist index 61b605449a7b..43750e5c635e 100644 --- a/deskutils/gnome-utils/pkg-plist +++ b/deskutils/gnome-utils/pkg-plist @@ -15,10 +15,11 @@ bin/gw bin/splac bin/splash share/gnome/apps/Applications/ghex.desktop -share/gnome/apps/Productivity/gtt.desktop -share/gnome/apps/System/gshutdown.desktop +share/gnome/apps/Applications/gtt.desktop +share/gnome/apps/Settings/gshutdown.desktop share/gnome/apps/Utilities/gcalc.desktop share/gnome/apps/Utilities/gcolorsel.desktop +share/gnome/apps/Utilities/gdiskfree.desktop share/gnome/apps/Utilities/gfontsel.desktop share/gnome/apps/Utilities/gless.desktop share/gnome/apps/Utilities/gsearchtool.desktop @@ -39,6 +40,10 @@ share/gnome/help/gstripchart/C/index.html share/gnome/help/gstripchart/C/topic.dat share/gnome/help/gtt/C/index.html share/gnome/help/gtt/C/topic.dat +share/gnome/help/gtt/de/index.html +share/gnome/help/gtt/de/topic.dat +share/gnome/help/gtt/es/index.html +share/gnome/help/gtt/es/topic.dat share/gnome/pixmaps/gnome-ghex.png share/locale/cs/LC_MESSAGES/gnome-utils.mo share/locale/de/LC_MESSAGES/gnome-utils.mo @@ -46,20 +51,24 @@ share/locale/es/LC_MESSAGES/gnome-utils.mo share/locale/fi/LC_MESSAGES/gnome-utils.mo share/locale/fr/LC_MESSAGES/gnome-utils.mo share/locale/ga/LC_MESSAGES/gnome-utils.mo +share/locale/hu/LC_MESSAGES/gnome-utils.mo share/locale/it/LC_MESSAGES/gnome-utils.mo share/locale/ja/LC_MESSAGES/gnome-utils.mo share/locale/ko/LC_MESSAGES/gnome-utils.mo share/locale/no/LC_MESSAGES/gnome-utils.mo share/locale/pt/LC_MESSAGES/gnome-utils.mo +share/locale/ru/LC_MESSAGES/gnome-utils.mo share/locale/sv/LC_MESSAGES/gnome-utils.mo -@dirrm share/gnome/gstripchart -@dirrm share/gnome/help/ghex/C -@dirrm share/gnome/help/ghex/es -@dirrm share/gnome/help/ghex -@dirrm share/gnome/help/gshutdown/C -@dirrm share/gnome/help/gshutdown/es -@dirrm share/gnome/help/gshutdown -@dirrm share/gnome/help/gstripchart/C -@dirrm share/gnome/help/gstripchart +@dirrm share/gnome/help/gtt/es +@dirrm share/gnome/help/gtt/de @dirrm share/gnome/help/gtt/C @dirrm share/gnome/help/gtt +@dirrm share/gnome/help/gstripchart/C +@dirrm share/gnome/help/gstripchart +@dirrm share/gnome/help/gshutdown/es +@dirrm share/gnome/help/gshutdown/C +@dirrm share/gnome/help/gshutdown +@dirrm share/gnome/help/ghex/es +@dirrm share/gnome/help/ghex/C +@dirrm share/gnome/help/ghex +@dirrm share/gnome/gstripchart diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile index 00478acc31ba..15f0964a4172 100644 --- a/deskutils/gnomepim/Makefile +++ b/deskutils/gnomepim/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: gnomepim -# Version required: 0.99.8.1 +# Version required: 1.0.1 # Date created: 17 Jan 1999 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.3 1999/02/02 07:33:55 vanilla Exp $ +# $Id: Makefile,v 1.4 1999/02/19 04:30:03 vanilla Exp $ # -DISTNAME= gnome-pim-0.99.8.1 -PKGNAME= gnomepim-0.99.8.1 +DISTNAME= gnome-pim-1.0.1 +PKGNAME= gnomepim-1.0.1 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-pim +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com @@ -24,7 +24,7 @@ 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/gtk11d-config" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: diff --git a/deskutils/gnomepim/distinfo b/deskutils/gnomepim/distinfo index 22af0615e6ba..fc37cd217dd7 100644 --- a/deskutils/gnomepim/distinfo +++ b/deskutils/gnomepim/distinfo @@ -1 +1 @@ -MD5 (gnome-pim-0.99.8.1.tar.gz) = 7abb905be1b2018e6ee5053f294b7194 +MD5 (gnome-pim-1.0.1.tar.gz) = 1f299e994a4fceb0f520bf03385510c5 diff --git a/deskutils/gnomepim/files/patch-ab b/deskutils/gnomepim/files/patch-ab index e7a8e2b3ab95..e2aad34c8ed5 100644 --- a/deskutils/gnomepim/files/patch-ab +++ b/deskutils/gnomepim/files/patch-ab @@ -1,7 +1,7 @@ ---- gncal/Makefile.in.orig Tue Feb 2 09:08:47 1999 -+++ gncal/Makefile.in Tue Feb 2 09:09:32 1999 -@@ -111,11 +111,11 @@ - YACC = @YACC@ +--- gncal/Makefile.in.orig Mon Mar 1 00:39:07 1999 ++++ gncal/Makefile.in Wed Mar 3 10:45:10 1999 +@@ -112,11 +112,11 @@ + ZVT_LIBS = @ZVT_LIBS@ l = @l@ -help_base = $(datadir)/gnome/help/cal @@ -14,11 +14,23 @@ bin_PROGRAMS = gnomecal ---- gnomecard/Makefile.in.orig Tue Feb 2 09:09:12 1999 -+++ gnomecard/Makefile.in Tue Feb 2 09:10:02 1999 -@@ -113,11 +113,11 @@ +@@ -134,7 +134,7 @@ + EXTRA_DIST = gncal.desktop topic.dat gnome-cal.html bell.xpm recur.xpm + + +-Productivitydir = $(datadir)/gnome/apps/Applications ++Productivitydir = $(datadir)/apps/Applications + + Productivity_DATA = gncal.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +--- gnomecard/Makefile.in.orig Mon Mar 1 00:39:10 1999 ++++ gnomecard/Makefile.in Wed Mar 3 10:45:39 1999 +@@ -112,13 +112,13 @@ + ZVT_LIBS = @ZVT_LIBS@ + l = @l@ - SUBDIRS = help +-SUBDIRS = help ++# SUBDIRS = help -xpmhelp_base = $(datadir)/gnome/help/cal +xpmhelp_base = $(datadir)/help/cal @@ -30,6 +42,15 @@ bin_PROGRAMS = gnomecard +@@ -143,7 +143,7 @@ + EXTRA_DIST = addr.xpm addrtool.xpm cardedit.xpm cardnew.xpm cardfind.xpm email.xpm expl.xpm first.xpm geo.xpm ident.xpm last.xpm org.xpm sec.xpm tel.xpm teltool.xpm phone.xpm world.xpm gnomecard.desktop gnomecard.gnorba + + +-Productivitydir = $(datadir)/gnome/apps/Applications ++Productivitydir = $(datadir)/apps/Applications + + Productivity_DATA = gnomecard.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- gnomecard/help/C/Makefile.in.orig Tue Feb 2 09:10:22 1999 +++ gnomecard/help/C/Makefile.in Tue Feb 2 09:10:30 1999 @@ -112,7 +112,7 @@ @@ -41,14 +62,3 @@ gnomecard_help_DATA = index.html topic.dat ---- po/Makefile.in.in.orig Tue Feb 2 09:11:11 1999 -+++ po/Makefile.in.in Tue Feb 2 09:11:19 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/deskutils/gnomepim/pkg-plist b/deskutils/gnomepim/pkg-plist index 5ddc7de7c202..cc17d7df82f4 100644 --- a/deskutils/gnomepim/pkg-plist +++ b/deskutils/gnomepim/pkg-plist @@ -2,20 +2,11 @@ bin/gnomecal bin/gnomecard etc/CORBA/servers/gnomecard.gnorba lib/libversit.a -share/gnome/apps/Productivity/gncal.desktop -share/gnome/apps/Productivity/gnomecard.desktop +share/gnome/apps/Applications/gncal.desktop +share/gnome/apps/Applications/gnomecard.desktop share/gnome/help/cal/C/gnome-cal.html share/gnome/help/cal/C/index.html share/gnome/help/cal/C/topic.dat -share/gnome/help/gnomecard/C/description.html -share/gnome/help/gnomecard/C/dialogs.html -share/gnome/help/gnomecard/C/display.html -share/gnome/help/gnomecard/C/docbook.css -share/gnome/help/gnomecard/C/index.html -share/gnome/help/gnomecard/C/menubar.html -share/gnome/help/gnomecard/C/recordview.html -share/gnome/help/gnomecard/C/toolbar.html -share/gnome/help/gnomecard/C/topic.dat share/gnome/idl/gnome-pim.idl share/gnome/mime-info/gnome-pim.keys share/locale/cs/LC_MESSAGES/gnome-pim.mo @@ -24,13 +15,13 @@ share/locale/es/LC_MESSAGES/gnome-pim.mo share/locale/fi/LC_MESSAGES/gnome-pim.mo share/locale/fr/LC_MESSAGES/gnome-pim.mo share/locale/ga/LC_MESSAGES/gnome-pim.mo +share/locale/hu/LC_MESSAGES/gnome-pim.mo share/locale/it/LC_MESSAGES/gnome-pim.mo share/locale/ja/LC_MESSAGES/gnome-pim.mo share/locale/ko/LC_MESSAGES/gnome-pim.mo share/locale/no/LC_MESSAGES/gnome-pim.mo share/locale/pt/LC_MESSAGES/gnome-pim.mo share/locale/sv/LC_MESSAGES/gnome-pim.mo +share/locale/ru/LC_MESSAGES/gnome-pim.mo @dirrm share/gnome/help/cal/C @dirrm share/gnome/help/cal -@dirrm share/gnome/help/gnomecard/C -@dirrm share/gnome/help/gnomecard diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile index afa832d7eb62..638052b77150 100644 --- a/deskutils/gnomeutils2/Makefile +++ b/deskutils/gnomeutils2/Makefile @@ -1,21 +1,22 @@ # New ports collection makefile for: gnomeutils -# Version required: 0.99.5 +# Version required: 1.0.1 # Date created: 03 July 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.5 1999/01/27 08:31:51 fenner Exp $ +# $Id: Makefile,v 1.6 1999/02/02 09:56:05 vanilla Exp $ # -DISTNAME= gnome-utils-0.99.5 -PKGNAME= gnomeutils-0.99.5 -CATEGORIES= misc +DISTNAME= gnome-utils-1.0.1 +PKGNAME= gnomeutils-1.0.1 +CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-utils +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= obgnome.1:${PORTSDIR}/lang/gnomeobjc USE_X_PREFIX= yes USE_GMAKE= yes @@ -24,7 +25,7 @@ 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/gtk11d-config" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" MAN1= gtt.1 diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo index 32cec07ed8c2..b35b2a17cd4c 100644 --- a/deskutils/gnomeutils2/distinfo +++ b/deskutils/gnomeutils2/distinfo @@ -1 +1 @@ -MD5 (gnome-utils-0.99.5.tar.gz) = 9eac5326842d1027edf2b959cbb23583 +MD5 (gnome-utils-1.0.1.tar.gz) = c267d32ddf310b3e9f70a2d915cccf5a diff --git a/deskutils/gnomeutils2/files/patch-aa b/deskutils/gnomeutils2/files/patch-aa index 7d8da8ddc7e7..2e73d96fd7b0 100644 --- a/deskutils/gnomeutils2/files/patch-aa +++ b/deskutils/gnomeutils2/files/patch-aa @@ -1,36 +1,20 @@ ---- configure.orig Tue Feb 2 09:42:09 1999 -+++ configure Tue Feb 2 09:43:37 1999 -@@ -1108,13 +1108,13 @@ - fi - - if test "$no_gnome_config" = "yes"; then -- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 --echo "configure:1113: checking for gnomeConf.sh file in $gnome_prefix" >&5 -- if test -f $gnome_prefix/gnomeConf.sh; then -+ echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6 -+echo "configure:1113: checking for gnomeConf.sh file in $prefix/share/gnome" >&5 -+ if test -f $prefix/share/gnome/gnomeConf.sh; then - echo "$ac_t""found" 1>&6 - echo "loading gnome configuration from" \ -- "$gnome_prefix/gnomeConf.sh" -- . $gnome_prefix/gnomeConf.sh -+ "$prefix/share/gnome/gnomeConf.sh" -+ . $prefix/share/gnome/gnomeConf.sh - - else - echo "$ac_t""not found" 1>&6 -@@ -3121,10 +3121,10 @@ - - if test $OBJECTIVE_C = yes; then +--- configure.orig Tue Mar 2 00:23:40 1999 ++++ configure Sat Mar 6 23:55:23 1999 +@@ -3143,7 +3143,7 @@ -- echo $ac_n "checking for obGnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 --echo "configure:3126: checking for obGnomeConf.sh file in $gnome_prefix" >&5 -- if test -f $gnome_prefix/obGnomeConf.sh; then -- . $gnome_prefix/obGnomeConf.sh -+ echo $ac_n "checking for obGnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6 -+echo "configure:3126: checking for obGnomeConf.sh file in $prefix/share/gnome" >&5 -+ if test -f $prefix/share/gnome/obGnomeConf.sh; then -+ . $prefix/share/gnome/obGnomeConf.sh - echo "$ac_t""found" 1>&6 - else - echo "$ac_t""not found" 1>&6 + echo $ac_n "checking for an obGnomeConf.sh""... $ac_c" 1>&6 + echo "configure:3146: checking for an obGnomeConf.sh" >&5 +- my_gnome_libdir=`$GNOME_CONFIG --libdir` ++ my_gnome_libdir=`$GNOME_CONFIG --sysconfdir` + if test -f $my_gnome_libdir/obGnomeConf.sh; then + . $my_gnome_libdir/obGnomeConf.sh + echo "$ac_t""found $my_gnome_libdir" 1>&6 +@@ -5389,7 +5389,7 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + CATOBJEXT=.mo +- DATADIRNAME=lib ++ DATADIRNAME=share + fi + rm -f conftest* + INSTOBJEXT=.mo diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist index 61b605449a7b..43750e5c635e 100644 --- a/deskutils/gnomeutils2/pkg-plist +++ b/deskutils/gnomeutils2/pkg-plist @@ -15,10 +15,11 @@ bin/gw bin/splac bin/splash share/gnome/apps/Applications/ghex.desktop -share/gnome/apps/Productivity/gtt.desktop -share/gnome/apps/System/gshutdown.desktop +share/gnome/apps/Applications/gtt.desktop +share/gnome/apps/Settings/gshutdown.desktop share/gnome/apps/Utilities/gcalc.desktop share/gnome/apps/Utilities/gcolorsel.desktop +share/gnome/apps/Utilities/gdiskfree.desktop share/gnome/apps/Utilities/gfontsel.desktop share/gnome/apps/Utilities/gless.desktop share/gnome/apps/Utilities/gsearchtool.desktop @@ -39,6 +40,10 @@ share/gnome/help/gstripchart/C/index.html share/gnome/help/gstripchart/C/topic.dat share/gnome/help/gtt/C/index.html share/gnome/help/gtt/C/topic.dat +share/gnome/help/gtt/de/index.html +share/gnome/help/gtt/de/topic.dat +share/gnome/help/gtt/es/index.html +share/gnome/help/gtt/es/topic.dat share/gnome/pixmaps/gnome-ghex.png share/locale/cs/LC_MESSAGES/gnome-utils.mo share/locale/de/LC_MESSAGES/gnome-utils.mo @@ -46,20 +51,24 @@ share/locale/es/LC_MESSAGES/gnome-utils.mo share/locale/fi/LC_MESSAGES/gnome-utils.mo share/locale/fr/LC_MESSAGES/gnome-utils.mo share/locale/ga/LC_MESSAGES/gnome-utils.mo +share/locale/hu/LC_MESSAGES/gnome-utils.mo share/locale/it/LC_MESSAGES/gnome-utils.mo share/locale/ja/LC_MESSAGES/gnome-utils.mo share/locale/ko/LC_MESSAGES/gnome-utils.mo share/locale/no/LC_MESSAGES/gnome-utils.mo share/locale/pt/LC_MESSAGES/gnome-utils.mo +share/locale/ru/LC_MESSAGES/gnome-utils.mo share/locale/sv/LC_MESSAGES/gnome-utils.mo -@dirrm share/gnome/gstripchart -@dirrm share/gnome/help/ghex/C -@dirrm share/gnome/help/ghex/es -@dirrm share/gnome/help/ghex -@dirrm share/gnome/help/gshutdown/C -@dirrm share/gnome/help/gshutdown/es -@dirrm share/gnome/help/gshutdown -@dirrm share/gnome/help/gstripchart/C -@dirrm share/gnome/help/gstripchart +@dirrm share/gnome/help/gtt/es +@dirrm share/gnome/help/gtt/de @dirrm share/gnome/help/gtt/C @dirrm share/gnome/help/gtt +@dirrm share/gnome/help/gstripchart/C +@dirrm share/gnome/help/gstripchart +@dirrm share/gnome/help/gshutdown/es +@dirrm share/gnome/help/gshutdown/C +@dirrm share/gnome/help/gshutdown +@dirrm share/gnome/help/ghex/es +@dirrm share/gnome/help/ghex/C +@dirrm share/gnome/help/ghex +@dirrm share/gnome/gstripchart diff --git a/devel/Makefile b/devel/Makefile index fa621058898f..cdac0fe44b13 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.158 1999/02/10 15:56:10 billf Exp $ +# $Id: Makefile,v 1.159 1999/03/02 01:54:57 steve Exp $ # SUBDIR += ElectricFence @@ -44,6 +44,7 @@ SUBDIR += glade SUBDIR += glib11 SUBDIR += glib11-devel + SUBDIR += glib12 SUBDIR += gmake SUBDIR += id-utils SUBDIR += ilu diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile index d7371d88bfa6..7317e7015572 100644 --- a/devel/ORBit/Makefile +++ b/devel/ORBit/Makefile @@ -1,24 +1,24 @@ # New ports collection makefile for: orbit -# Version required: 0.3.98 +# Version required: 0.4.0 # Date Created: 16 Aug 1998 # Whom: Chia-liang Kao <clkao@CirX.ORG> # -# $Id: Makefile,v 1.13 1999/01/31 16:57:13 vanilla Exp $ +# $Id: Makefile,v 1.14 1999/02/18 17:49:05 vanilla Exp $ # -DISTNAME= ORBit-0.3.98 +DISTNAME= ORBit-0.4.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= ORBit MAINTAINER= clkao@CirX.ORG -LIB_DEPENDS= glib11d.2:${PORTSDIR}/devel/glib11-devel +LIB_DEPENDS= glib12.1:${PORTSDIR}/devel/glib12 GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ENV= GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" +CONFIGURE_ENV= GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" CONFIGURE_ARGS= --disable-indent pre-install: diff --git a/devel/ORBit/distinfo b/devel/ORBit/distinfo index 70fa965d9807..cc28ec485663 100644 --- a/devel/ORBit/distinfo +++ b/devel/ORBit/distinfo @@ -1 +1 @@ -MD5 (ORBit-0.3.98.tar.gz) = 3c3368d25d2dd154130ec882d63ce602 +MD5 (ORBit-0.4.0.tar.gz) = 41182664df08b1a5c4a9a7e46823d0cc diff --git a/devel/ORBit/files/patch-ac b/devel/ORBit/files/patch-ac index 97e231005bab..a4ebc3344f61 100644 --- a/devel/ORBit/files/patch-ac +++ b/devel/ORBit/files/patch-ac @@ -42,41 +42,41 @@ INCLUDES = -I. -I$(top_builddir)/src -I$(top_srcdir)/src @GLIB_CFLAGS@ ---- libIDL/Makefile.in.orig Mon Feb 15 12:59:56 1999 -+++ libIDL/Makefile.in Thu Feb 18 22:55:15 1999 -@@ -50,7 +50,7 @@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - --INSTALL = @INSTALL@ -+INSTALL = @INSTALL_PROGRAM@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -76,7 +76,7 @@ - LEX = @LEX@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ +--- libIDL/Makefile.in.orig Thu Feb 25 17:17:07 1999 ++++ libIDL/Makefile.in Mon Mar 1 18:54:57 1999 +@@ -89,7 +89,7 @@ + LT_RELEASE = @LT_RELEASE@ + LT_REVISION = @LT_REVISION@ + MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split NM = @NM@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ -@@ -101,7 +101,7 @@ +@@ -120,7 +120,7 @@ libIDL_la_SOURCES = parser.c parser.h lexer.c ns.c util.c util.h rename.h --libIDL_la_LDFLAGS = -version-info 5:9:5 +-libIDL_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) +libIDL_la_LDFLAGS = -version-info 1:0:0 - tstidl_SOURCES = tstidl.c + + m4datadir = $(datadir)/aclocal +@@ -130,7 +130,7 @@ tstidl_LDFLAGS = -static -@@ -478,7 +478,7 @@ - uninstall-am: uninstall-libLTLIBRARIES uninstall-info \ - uninstall-pkgincludeHEADERS + tstidl_LDADD = libIDL.la + +-confexecdir = $(libdir) ++confexecdir = $(sysconfdir) + confexec_DATA = libIDLConf.sh + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -580,7 +580,7 @@ + uninstall-info uninstall-confexecDATA \ + uninstall-m4dataDATA uninstall-pkgincludeHEADERS uninstall: uninstall-am --all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) -+all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS) +-all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \ ++all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(SCRIPTS) \ + $(DATA) $(HEADERS) all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install diff --git a/devel/ORBit/files/patch-ad b/devel/ORBit/files/patch-ad index 44689977d4f7..bc0a5f58b9c9 100644 --- a/devel/ORBit/files/patch-ad +++ b/devel/ORBit/files/patch-ad @@ -6,8 +6,8 @@ - client (calls glib-config) - server (calls glib-config) -+ client (calls glib11d-config) -+ server (calls glib11d-config) ++ client (calls glib12-config) ++ server (calls glib12-config) EOF exit $1 @@ -17,8 +17,8 @@ client|server) - the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib-config --libs` @LIBS@ -lm" - the_flags="$the_flags `glib-config --cflags` -I@includedir@" -+ the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib11d-config --libs` @LIBS@ -lm" -+ the_flags="$the_flags `glib11d-config --cflags` -I@includedir@" ++ the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib12-config --libs` @LIBS@ -lm" ++ the_flags="$the_flags `glib12-config --cflags` -I@includedir@" ;; --use-service=*) diff --git a/devel/ORBit/files/patch-ae b/devel/ORBit/files/patch-ae new file mode 100644 index 000000000000..1468b8fed6bd --- /dev/null +++ b/devel/ORBit/files/patch-ae @@ -0,0 +1,13 @@ +--- configure.orig Fri Feb 19 00:50:06 1999 ++++ configure Fri Feb 19 00:50:21 1999 +@@ -5288,10 +5288,6 @@ + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. diff --git a/devel/ORBit/pkg-plist b/devel/ORBit/pkg-plist index 453ddbaa26dc..f1424dd5e314 100644 --- a/devel/ORBit/pkg-plist +++ b/devel/ORBit/pkg-plist @@ -1,3 +1,4 @@ +bin/libIDL-config bin/name-client bin/old-name-server bin/orbit-config @@ -5,6 +6,7 @@ bin/orbit-event-server bin/orbit-idl bin/orbit-ird bin/orbit-name-server +etc/libIDLConf.sh include/IIOP/IIOP-config.h include/IIOP/IIOP-types.h include/IIOP/IIOP.h @@ -90,6 +92,7 @@ lib/libORBitutil.so.1 lib/libname-server.a @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B +share/aclocal/libIDL.m4 @dirrm include/IIOP @dirrm include/ORBitservices @dirrm include/ORBitutil diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index d7371d88bfa6..7317e7015572 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -1,24 +1,24 @@ # New ports collection makefile for: orbit -# Version required: 0.3.98 +# Version required: 0.4.0 # Date Created: 16 Aug 1998 # Whom: Chia-liang Kao <clkao@CirX.ORG> # -# $Id: Makefile,v 1.13 1999/01/31 16:57:13 vanilla Exp $ +# $Id: Makefile,v 1.14 1999/02/18 17:49:05 vanilla Exp $ # -DISTNAME= ORBit-0.3.98 +DISTNAME= ORBit-0.4.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= ORBit MAINTAINER= clkao@CirX.ORG -LIB_DEPENDS= glib11d.2:${PORTSDIR}/devel/glib11-devel +LIB_DEPENDS= glib12.1:${PORTSDIR}/devel/glib12 GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ENV= GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" +CONFIGURE_ENV= GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" CONFIGURE_ARGS= --disable-indent pre-install: diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo index 70fa965d9807..cc28ec485663 100644 --- a/devel/ORBit2/distinfo +++ b/devel/ORBit2/distinfo @@ -1 +1 @@ -MD5 (ORBit-0.3.98.tar.gz) = 3c3368d25d2dd154130ec882d63ce602 +MD5 (ORBit-0.4.0.tar.gz) = 41182664df08b1a5c4a9a7e46823d0cc diff --git a/devel/ORBit2/files/patch-ac b/devel/ORBit2/files/patch-ac index 97e231005bab..a4ebc3344f61 100644 --- a/devel/ORBit2/files/patch-ac +++ b/devel/ORBit2/files/patch-ac @@ -42,41 +42,41 @@ INCLUDES = -I. -I$(top_builddir)/src -I$(top_srcdir)/src @GLIB_CFLAGS@ ---- libIDL/Makefile.in.orig Mon Feb 15 12:59:56 1999 -+++ libIDL/Makefile.in Thu Feb 18 22:55:15 1999 -@@ -50,7 +50,7 @@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - --INSTALL = @INSTALL@ -+INSTALL = @INSTALL_PROGRAM@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -76,7 +76,7 @@ - LEX = @LEX@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ +--- libIDL/Makefile.in.orig Thu Feb 25 17:17:07 1999 ++++ libIDL/Makefile.in Mon Mar 1 18:54:57 1999 +@@ -89,7 +89,7 @@ + LT_RELEASE = @LT_RELEASE@ + LT_REVISION = @LT_REVISION@ + MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split NM = @NM@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ -@@ -101,7 +101,7 @@ +@@ -120,7 +120,7 @@ libIDL_la_SOURCES = parser.c parser.h lexer.c ns.c util.c util.h rename.h --libIDL_la_LDFLAGS = -version-info 5:9:5 +-libIDL_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) +libIDL_la_LDFLAGS = -version-info 1:0:0 - tstidl_SOURCES = tstidl.c + + m4datadir = $(datadir)/aclocal +@@ -130,7 +130,7 @@ tstidl_LDFLAGS = -static -@@ -478,7 +478,7 @@ - uninstall-am: uninstall-libLTLIBRARIES uninstall-info \ - uninstall-pkgincludeHEADERS + tstidl_LDADD = libIDL.la + +-confexecdir = $(libdir) ++confexecdir = $(sysconfdir) + confexec_DATA = libIDLConf.sh + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -580,7 +580,7 @@ + uninstall-info uninstall-confexecDATA \ + uninstall-m4dataDATA uninstall-pkgincludeHEADERS uninstall: uninstall-am --all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) -+all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS) +-all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \ ++all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(SCRIPTS) \ + $(DATA) $(HEADERS) all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install diff --git a/devel/ORBit2/files/patch-ad b/devel/ORBit2/files/patch-ad index 44689977d4f7..bc0a5f58b9c9 100644 --- a/devel/ORBit2/files/patch-ad +++ b/devel/ORBit2/files/patch-ad @@ -6,8 +6,8 @@ - client (calls glib-config) - server (calls glib-config) -+ client (calls glib11d-config) -+ server (calls glib11d-config) ++ client (calls glib12-config) ++ server (calls glib12-config) EOF exit $1 @@ -17,8 +17,8 @@ client|server) - the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib-config --libs` @LIBS@ -lm" - the_flags="$the_flags `glib-config --cflags` -I@includedir@" -+ the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib11d-config --libs` @LIBS@ -lm" -+ the_flags="$the_flags `glib11d-config --cflags` -I@includedir@" ++ the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib12-config --libs` @LIBS@ -lm" ++ the_flags="$the_flags `glib12-config --cflags` -I@includedir@" ;; --use-service=*) diff --git a/devel/ORBit2/files/patch-ae b/devel/ORBit2/files/patch-ae new file mode 100644 index 000000000000..1468b8fed6bd --- /dev/null +++ b/devel/ORBit2/files/patch-ae @@ -0,0 +1,13 @@ +--- configure.orig Fri Feb 19 00:50:06 1999 ++++ configure Fri Feb 19 00:50:21 1999 +@@ -5288,10 +5288,6 @@ + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist index 453ddbaa26dc..f1424dd5e314 100644 --- a/devel/ORBit2/pkg-plist +++ b/devel/ORBit2/pkg-plist @@ -1,3 +1,4 @@ +bin/libIDL-config bin/name-client bin/old-name-server bin/orbit-config @@ -5,6 +6,7 @@ bin/orbit-event-server bin/orbit-idl bin/orbit-ird bin/orbit-name-server +etc/libIDLConf.sh include/IIOP/IIOP-config.h include/IIOP/IIOP-types.h include/IIOP/IIOP.h @@ -90,6 +92,7 @@ lib/libORBitutil.so.1 lib/libname-server.a @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B +share/aclocal/libIDL.m4 @dirrm include/IIOP @dirrm include/ORBitservices @dirrm include/ORBitutil diff --git a/devel/gettext-devel/Makefile b/devel/gettext-devel/Makefile index 05c902bd6683..2631f2db3c05 100644 --- a/devel/gettext-devel/Makefile +++ b/devel/gettext-devel/Makefile @@ -3,17 +3,19 @@ # Date created: 16 March 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.6 1999/01/12 16:50:26 vanilla Exp $ +# $Id: Makefile,v 1.7 1999/03/08 07:28:22 asami Exp $ # DISTNAME= gettext-0.10.35 CATEGORIES= devel -MASTER_SITES= ftp://alpha.gnu.ai.mit.edu/gnu/ +MASTER_SITES= ftp://alpha.gnu.ai.mit.edu/gnu/ \ + ftp://alpha.gnu.org/pub/gnu MAINTAINER= nacai@iname.com GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gnu-gettext + +PLIST_SUB= X11BASE=${X11BASE} pre-configure: ${RM} ${WRKSRC}/doc/gettext.info* @@ -25,5 +27,6 @@ post-install: @install-info ${PREFIX}/info/gettext.info ${PREFIX}/info/dir ${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \ ${PREFIX}/share/gettext/po-mode.el + ${MKDIR} ${X11BASE}/share/locale .include <bsd.port.mk> diff --git a/devel/gettext-devel/files/patch-ae b/devel/gettext-devel/files/patch-ae index 29dad1ad6f74..73bde596d6c4 100644 --- a/devel/gettext-devel/files/patch-ae +++ b/devel/gettext-devel/files/patch-ae @@ -1,5 +1,14 @@ ---- configure.orig Fri May 1 13:48:25 1998 -+++ configure Thu Dec 3 20:11:52 1998 +--- configure.orig Fri May 1 07:48:25 1998 ++++ configure Wed Feb 17 02:05:55 1999 +@@ -3958,7 +3958,7 @@ + fi + + +- l= ++ l=l + + + test -d po || mkdir po @@ -4004,7 +4004,7 @@ ;; esac diff --git a/devel/gettext-devel/files/patch-ah b/devel/gettext-devel/files/patch-ah new file mode 100644 index 000000000000..a45dc903c3b9 --- /dev/null +++ b/devel/gettext-devel/files/patch-ah @@ -0,0 +1,11 @@ +--- intl/Makefile.in.orig Wed Feb 17 02:18:40 1999 ++++ intl/Makefile.in Wed Feb 17 02:30:13 1999 +@@ -119,7 +119,7 @@ + $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \ + fi; \ + $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \ +- $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \ ++ $(LIBTOOL) --mode=install $(INSTALL) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \ + else \ + : ; \ + fi diff --git a/devel/gettext-devel/pkg-plist b/devel/gettext-devel/pkg-plist index 4899dd242253..6d3c89b44981 100644 --- a/devel/gettext-devel/pkg-plist +++ b/devel/gettext-devel/pkg-plist @@ -12,6 +12,11 @@ info/gettext.info @exec install-info %D/info/gettext.info %D/info/dir include/libintl.h lib/libintl.a +lib/libintl.la +lib/libintl.so +lib/libintl.so.1 +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R share/aclocal/gettext.m4 share/aclocal/lcmessage.m4 share/aclocal/progtest.m4 @@ -57,28 +62,6 @@ share/locale/locale.alias @dirrm share/gettext/intl @dirrm share/gettext/po @dirrm share/gettext -@dirrm share/locale/da/LC_MESSAGES -@dirrm share/locale/da -@dirrm share/locale/de/LC_MESSAGES -@dirrm share/locale/de -@dirrm share/locale/es/LC_MESSAGES -@dirrm share/locale/es -@dirrm share/locale/fr/LC_MESSAGES -@dirrm share/locale/fr -@dirrm share/locale/ko/LC_MESSAGES -@dirrm share/locale/ko -@dirrm share/locale/nl/LC_MESSAGES -@dirrm share/locale/nl -@dirrm share/locale/no/LC_MESSAGES -@dirrm share/locale/no -@dirrm share/locale/no@nynorsk/LC_MESSAGES -@dirrm share/locale/no@nynorsk -@dirrm share/locale/pl/LC_MESSAGES -@dirrm share/locale/pl -@dirrm share/locale/pt/LC_MESSAGES -@dirrm share/locale/pt -@dirrm share/locale/sl/LC_MESSAGES -@dirrm share/locale/sl -@dirrm share/locale/sv/LC_MESSAGES -@dirrm share/locale/sv -@dirrm share/locale +@unexec rm -r %D/share/locale +@exec mkdir -p %%X11BASE%%/share/locale +@unexec rm -r %%X11BASE%%/share/locale diff --git a/devel/gettext-old/Makefile b/devel/gettext-old/Makefile index 05c902bd6683..2631f2db3c05 100644 --- a/devel/gettext-old/Makefile +++ b/devel/gettext-old/Makefile @@ -3,17 +3,19 @@ # Date created: 16 March 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.6 1999/01/12 16:50:26 vanilla Exp $ +# $Id: Makefile,v 1.7 1999/03/08 07:28:22 asami Exp $ # DISTNAME= gettext-0.10.35 CATEGORIES= devel -MASTER_SITES= ftp://alpha.gnu.ai.mit.edu/gnu/ +MASTER_SITES= ftp://alpha.gnu.ai.mit.edu/gnu/ \ + ftp://alpha.gnu.org/pub/gnu MAINTAINER= nacai@iname.com GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gnu-gettext + +PLIST_SUB= X11BASE=${X11BASE} pre-configure: ${RM} ${WRKSRC}/doc/gettext.info* @@ -25,5 +27,6 @@ post-install: @install-info ${PREFIX}/info/gettext.info ${PREFIX}/info/dir ${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \ ${PREFIX}/share/gettext/po-mode.el + ${MKDIR} ${X11BASE}/share/locale .include <bsd.port.mk> diff --git a/devel/gettext-old/files/patch-ae b/devel/gettext-old/files/patch-ae index 29dad1ad6f74..73bde596d6c4 100644 --- a/devel/gettext-old/files/patch-ae +++ b/devel/gettext-old/files/patch-ae @@ -1,5 +1,14 @@ ---- configure.orig Fri May 1 13:48:25 1998 -+++ configure Thu Dec 3 20:11:52 1998 +--- configure.orig Fri May 1 07:48:25 1998 ++++ configure Wed Feb 17 02:05:55 1999 +@@ -3958,7 +3958,7 @@ + fi + + +- l= ++ l=l + + + test -d po || mkdir po @@ -4004,7 +4004,7 @@ ;; esac diff --git a/devel/gettext-old/files/patch-ah b/devel/gettext-old/files/patch-ah new file mode 100644 index 000000000000..a45dc903c3b9 --- /dev/null +++ b/devel/gettext-old/files/patch-ah @@ -0,0 +1,11 @@ +--- intl/Makefile.in.orig Wed Feb 17 02:18:40 1999 ++++ intl/Makefile.in Wed Feb 17 02:30:13 1999 +@@ -119,7 +119,7 @@ + $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \ + fi; \ + $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \ +- $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \ ++ $(LIBTOOL) --mode=install $(INSTALL) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \ + else \ + : ; \ + fi diff --git a/devel/gettext-old/pkg-plist b/devel/gettext-old/pkg-plist index 4899dd242253..6d3c89b44981 100644 --- a/devel/gettext-old/pkg-plist +++ b/devel/gettext-old/pkg-plist @@ -12,6 +12,11 @@ info/gettext.info @exec install-info %D/info/gettext.info %D/info/dir include/libintl.h lib/libintl.a +lib/libintl.la +lib/libintl.so +lib/libintl.so.1 +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R share/aclocal/gettext.m4 share/aclocal/lcmessage.m4 share/aclocal/progtest.m4 @@ -57,28 +62,6 @@ share/locale/locale.alias @dirrm share/gettext/intl @dirrm share/gettext/po @dirrm share/gettext -@dirrm share/locale/da/LC_MESSAGES -@dirrm share/locale/da -@dirrm share/locale/de/LC_MESSAGES -@dirrm share/locale/de -@dirrm share/locale/es/LC_MESSAGES -@dirrm share/locale/es -@dirrm share/locale/fr/LC_MESSAGES -@dirrm share/locale/fr -@dirrm share/locale/ko/LC_MESSAGES -@dirrm share/locale/ko -@dirrm share/locale/nl/LC_MESSAGES -@dirrm share/locale/nl -@dirrm share/locale/no/LC_MESSAGES -@dirrm share/locale/no -@dirrm share/locale/no@nynorsk/LC_MESSAGES -@dirrm share/locale/no@nynorsk -@dirrm share/locale/pl/LC_MESSAGES -@dirrm share/locale/pl -@dirrm share/locale/pt/LC_MESSAGES -@dirrm share/locale/pt -@dirrm share/locale/sl/LC_MESSAGES -@dirrm share/locale/sl -@dirrm share/locale/sv/LC_MESSAGES -@dirrm share/locale/sv -@dirrm share/locale +@unexec rm -r %D/share/locale +@exec mkdir -p %%X11BASE%%/share/locale +@unexec rm -r %%X11BASE%%/share/locale diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index 05c902bd6683..2631f2db3c05 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -3,17 +3,19 @@ # Date created: 16 March 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.6 1999/01/12 16:50:26 vanilla Exp $ +# $Id: Makefile,v 1.7 1999/03/08 07:28:22 asami Exp $ # DISTNAME= gettext-0.10.35 CATEGORIES= devel -MASTER_SITES= ftp://alpha.gnu.ai.mit.edu/gnu/ +MASTER_SITES= ftp://alpha.gnu.ai.mit.edu/gnu/ \ + ftp://alpha.gnu.org/pub/gnu MAINTAINER= nacai@iname.com GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gnu-gettext + +PLIST_SUB= X11BASE=${X11BASE} pre-configure: ${RM} ${WRKSRC}/doc/gettext.info* @@ -25,5 +27,6 @@ post-install: @install-info ${PREFIX}/info/gettext.info ${PREFIX}/info/dir ${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \ ${PREFIX}/share/gettext/po-mode.el + ${MKDIR} ${X11BASE}/share/locale .include <bsd.port.mk> diff --git a/devel/gettext/files/patch-ae b/devel/gettext/files/patch-ae index 29dad1ad6f74..73bde596d6c4 100644 --- a/devel/gettext/files/patch-ae +++ b/devel/gettext/files/patch-ae @@ -1,5 +1,14 @@ ---- configure.orig Fri May 1 13:48:25 1998 -+++ configure Thu Dec 3 20:11:52 1998 +--- configure.orig Fri May 1 07:48:25 1998 ++++ configure Wed Feb 17 02:05:55 1999 +@@ -3958,7 +3958,7 @@ + fi + + +- l= ++ l=l + + + test -d po || mkdir po @@ -4004,7 +4004,7 @@ ;; esac diff --git a/devel/gettext/files/patch-ah b/devel/gettext/files/patch-ah new file mode 100644 index 000000000000..a45dc903c3b9 --- /dev/null +++ b/devel/gettext/files/patch-ah @@ -0,0 +1,11 @@ +--- intl/Makefile.in.orig Wed Feb 17 02:18:40 1999 ++++ intl/Makefile.in Wed Feb 17 02:30:13 1999 +@@ -119,7 +119,7 @@ + $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \ + fi; \ + $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \ +- $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \ ++ $(LIBTOOL) --mode=install $(INSTALL) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \ + else \ + : ; \ + fi diff --git a/devel/gettext/pkg-plist b/devel/gettext/pkg-plist index 4899dd242253..6d3c89b44981 100644 --- a/devel/gettext/pkg-plist +++ b/devel/gettext/pkg-plist @@ -12,6 +12,11 @@ info/gettext.info @exec install-info %D/info/gettext.info %D/info/dir include/libintl.h lib/libintl.a +lib/libintl.la +lib/libintl.so +lib/libintl.so.1 +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R share/aclocal/gettext.m4 share/aclocal/lcmessage.m4 share/aclocal/progtest.m4 @@ -57,28 +62,6 @@ share/locale/locale.alias @dirrm share/gettext/intl @dirrm share/gettext/po @dirrm share/gettext -@dirrm share/locale/da/LC_MESSAGES -@dirrm share/locale/da -@dirrm share/locale/de/LC_MESSAGES -@dirrm share/locale/de -@dirrm share/locale/es/LC_MESSAGES -@dirrm share/locale/es -@dirrm share/locale/fr/LC_MESSAGES -@dirrm share/locale/fr -@dirrm share/locale/ko/LC_MESSAGES -@dirrm share/locale/ko -@dirrm share/locale/nl/LC_MESSAGES -@dirrm share/locale/nl -@dirrm share/locale/no/LC_MESSAGES -@dirrm share/locale/no -@dirrm share/locale/no@nynorsk/LC_MESSAGES -@dirrm share/locale/no@nynorsk -@dirrm share/locale/pl/LC_MESSAGES -@dirrm share/locale/pl -@dirrm share/locale/pt/LC_MESSAGES -@dirrm share/locale/pt -@dirrm share/locale/sl/LC_MESSAGES -@dirrm share/locale/sl -@dirrm share/locale/sv/LC_MESSAGES -@dirrm share/locale/sv -@dirrm share/locale +@unexec rm -r %D/share/locale +@exec mkdir -p %%X11BASE%%/share/locale +@unexec rm -r %%X11BASE%%/share/locale diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile index 7343c701a67b..7992787f2356 100644 --- a/devel/glib12/Makefile +++ b/devel/glib12/Makefile @@ -1,24 +1,24 @@ -# New ports collection makefile for: glib11-devel -# Version required: 1.1.16 +# New ports collection makefile for: glib12 +# Version required: 1.2.0 # Date Created: 28 July 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.16 1999/01/30 20:23:09 sada Exp $ +# $Id: Makefile,v 1.17 1999/02/17 18:12:08 vanilla Exp $ # -DISTNAME= glib-1.1.16 +DISTNAME= glib-1.2.0 CATEGORIES= devel -MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ - ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ - http://www.ameth.org/gimp/gtk/v1.1/ +MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \ + ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \ + http://www.ameth.org/gimp/gtk/v1.2/ MAINTAINER= vanilla@FreeBSD.ORG GNU_CONFIGURE= yes -CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib11d +CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12 -MAN1= glib-config.1 +MAN1= glib12-config.1 post-install: @if [ ! -f ${PREFIX}/info/dir ]; then \ diff --git a/devel/glib12/distinfo b/devel/glib12/distinfo index 84c47db10e06..3339035c5518 100644 --- a/devel/glib12/distinfo +++ b/devel/glib12/distinfo @@ -1 +1 @@ -MD5 (glib-1.1.16.tar.gz) = f1b32a51becffdad18193b84656989b0 +MD5 (glib-1.2.0.tar.gz) = b19f308dbbd393b6199e743cb1c648a1 diff --git a/devel/glib12/files/patch-ab b/devel/glib12/files/patch-ab index df40e4bbf003..0ae004d00c11 100644 --- a/devel/glib12/files/patch-ab +++ b/devel/glib12/files/patch-ab @@ -11,113 +11,91 @@ +configincludedir = $(includedir) -bin_SCRIPTS = glib-config -+bin_SCRIPTS = glib11d-config ++bin_SCRIPTS = glib12-config BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h -@@ -102,9 +102,9 @@ - EXTRA_DIST = glib.m4 glib.spec acglib.m4 sanity_check README.win32 glib.def makefile.msc giowin32.c glibconfig.h.win32 config.h.win32 +@@ -102,7 +102,7 @@ + EXTRA_DIST = glib.m4 glib.spec.in acglib.m4 sanity_check README.win32 glib.def makefile.msc giowin32.c glibconfig.h.win32 config.h.win32 -lib_LTLIBRARIES = libglib.la -+lib_LTLIBRARIES = libglib11d.la ++lib_LTLIBRARIES = libglib12.la --libglib_la_SOURCES = garray.c gcache.c gcompletion.c gdataset.c gdate.c gerror.c ghash.c ghook.c giochannel.c giounix.c glist.c gmain.c gmem.c gmessages.c gmutex.c gnode.c gprimes.c grel.c gscanner.c gslist.c gstrfuncs.c gstring.c gtimer.c gtree.c gutils.c -+libglib11d_la_SOURCES = garray.c gcache.c gcompletion.c gdataset.c gdate.c gerror.c ghash.c ghook.c giochannel.c giounix.c glist.c gmain.c gmem.c gmessages.c gmutex.c gnode.c gprimes.c grel.c gscanner.c gslist.c gstrfuncs.c gstring.c gtimer.c gtree.c gutils.c + libglib_la_SOURCES = garray.c gcache.c gcompletion.c gdataset.c gdate.c gerror.c ghash.c ghook.c giochannel.c giounix.c glist.c gmain.c gmem.c gmessages.c gmutex.c gnode.c gprimes.c grel.c gscanner.c gslist.c gstrfuncs.c gstring.c gtimer.c gtree.c gutils.c - - include_HEADERS = glib.h @@ -113,20 +113,20 @@ configinclude_DATA = glibconfig.h -libglib_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -+libglib11d_la_LDFLAGS = -version-info 2:1:0 ++libglib_la_LDFLAGS = -version-info 1:0:0 noinst_PROGRAMS = testglib testgdate testgdateparser -testglib_LDADD = libglib.la -testgdate_LDADD = libglib.la -testgdateparser_LDADD = libglib.la -+testglib_LDADD = libglib11d.la -+testgdate_LDADD = libglib11d.la -+testgdateparser_LDADD = libglib11d.la ++testglib_LDADD = libglib12.la ++testgdate_LDADD = libglib12.la ++testgdateparser_LDADD = libglib12.la m4datadir = $(datadir)/aclocal m4data_DATA = glib.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h --CONFIG_CLEAN_FILES = glib-config -+CONFIG_CLEAN_FILES = glib11d-config +-CONFIG_CLEAN_FILES = glib.spec glib-config ++CONFIG_CLEAN_FILES = glib12-config LTLIBRARIES = $(lib_LTLIBRARIES) -@@ -134,8 +134,8 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ --libglib_la_LIBADD = --libglib_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \ -+libglib11d_la_LIBADD = -+libglib11d_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \ - gdate.lo gerror.lo ghash.lo ghook.lo giochannel.lo giounix.lo glist.lo \ - gmain.lo gmem.lo gmessages.lo gmutex.lo gnode.lo gprimes.lo grel.lo \ - gscanner.lo gslist.lo gstrfuncs.lo gstring.lo gtimer.lo gtree.lo \ @@ -144,15 +144,15 @@ testglib_SOURCES = testglib.c testglib_OBJECTS = testglib.o -testglib_DEPENDENCIES = libglib.la -+testglib_DEPENDENCIES = libglib11d.la ++testglib_DEPENDENCIES = libglib12.la testglib_LDFLAGS = testgdate_SOURCES = testgdate.c testgdate_OBJECTS = testgdate.o -testgdate_DEPENDENCIES = libglib.la -+testgdate_DEPENDENCIES = libglib11d.la ++testgdate_DEPENDENCIES = libglib12.la testgdate_LDFLAGS = testgdateparser_SOURCES = testgdateparser.c testgdateparser_OBJECTS = testgdateparser.o -testgdateparser_DEPENDENCIES = libglib.la -+testgdateparser_DEPENDENCIES = libglib11d.la ++testgdateparser_DEPENDENCIES = libglib12.la testgdateparser_LDFLAGS = SCRIPTS = $(bin_SCRIPTS) -@@ -175,8 +175,8 @@ - - TAR = tar - GZIP_ENV = --best --SOURCES = $(libglib_la_SOURCES) testglib.c testgdate.c testgdateparser.c --OBJECTS = $(libglib_la_OBJECTS) testglib.o testgdate.o testgdateparser.o -+SOURCES = $(libglib11d_la_SOURCES) testglib.c testgdate.c testgdateparser.c -+OBJECTS = $(libglib11d_la_OBJECTS) testglib.o testgdate.o testgdateparser.o - - all: all-redirect - .SUFFIXES: -@@ -223,7 +223,10 @@ - -rm -f config.h - +@@ -226,7 +226,7 @@ maintainer-clean-hdr: + glib.spec: $(top_builddir)/config.status glib.spec.in + cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -glib-config: $(top_builddir)/config.status glib-config.in -+glib11d-config.in: glib-config.in -+ cp glib-config.in glib11d-config.in -+ -+glib11d-config: $(top_builddir)/config.status glib11d-config.in ++glib12-config: $(top_builddir)/config.status glib12-config.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status mostlyclean-libLTLIBRARIES: -@@ -289,8 +292,8 @@ +@@ -292,7 +292,7 @@ maintainer-clean-libtool: -libglib.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libglib_la_LDFLAGS) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS) -+libglib11d.la: $(libglib11d_la_OBJECTS) $(libglib11d_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libglib11d_la_LDFLAGS) $(libglib11d_la_OBJECTS) $(libglib11d_la_LIBADD) $(LIBS) ++libglib12.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libglib_la_LDFLAGS) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS) mostlyclean-noinstPROGRAMS: +@@ -535,7 +535,6 @@ + || exit 1; \ + fi; \ + done +- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook -@@ -558,7 +561,7 @@ + info-am: + info: info-recursive +@@ -562,7 +561,7 @@ uninstall-configincludeDATA uninstall-m4dataDATA \ uninstall-includeHEADERS uninstall: uninstall-recursive @@ -126,114 +104,69 @@ $(HEADERS) config.h all-redirect: all-recursive-am install-strip: +@@ -640,7 +639,8 @@ + installdirs mostlyclean-generic distclean-generic clean-generic \ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + +-glib-config: glib-config.in ++glib12-config.in: glib-config.in ++ cp glib-config.in glib12-config.in + + configure: configure.in acglib.m4 + glibconfig.h: stamp-gc-h --- gmodule/Makefile.in.orig Thu Jan 28 23:01:00 1999 +++ gmodule/Makefile.in Thu Jan 28 23:06:56 1999 -@@ -98,29 +98,29 @@ +@@ -98,12 +98,12 @@ include_HEADERS = gmodule.h -libglib = $(top_builddir)/libglib.la # -lglib -+libglib = $(top_builddir)/libglib11d.la # -lglib ++libglib = $(top_builddir)/libglib12.la # -lglib -lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la -+lib_LTLIBRARIES = libgmodule11d.la libgplugin11d_a.la libgplugin11d_b.la ++lib_LTLIBRARIES = libgmodule12.la libgplugin12_a.la libgplugin12_b.la --libgmodule_la_SOURCES = gmodule.c + libgmodule_la_SOURCES = gmodule.c -libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -+libgmodule11d_la_SOURCES = gmodule.c -+libgmodule11d_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info 2:1:0 - - --libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) -+libgmodule11d_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) - # we should really depend on $(libglib) for libgmodule.la, but libtool has a - # problem with this ;( - --libgplugin_a_la_SOURCES = libgplugin_a.c --libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ --libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) -- --libgplugin_b_la_SOURCES = libgplugin_b.c --libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ --libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) -+libgplugin11d_a_la_SOURCES = libgplugin_a.c -+libgplugin11d_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -+libgplugin11d_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) -+ -+libgplugin11d_b_la_SOURCES = libgplugin_b.c -+libgplugin11d_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -+libgplugin11d_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) ++libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info 1:0:0 + + + libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) +@@ -120,7 +120,7 @@ noinst_PROGRAMS = testgmodule testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@ -testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@ -+testgmodule_LDADD = libgmodule11d.la $(libglib) @G_MODULE_LIBS@ ++testgmodule_LDADD = libgmodule12.la $(libglib) @G_MODULE_LIBS@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = gmoduleconf.h -@@ -131,22 +131,22 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ --libgmodule_la_DEPENDENCIES = --libgmodule_la_OBJECTS = gmodule.lo --libgplugin_a_la_DEPENDENCIES = --libgplugin_a_la_OBJECTS = libgplugin_a.lo --libgplugin_b_la_DEPENDENCIES = --libgplugin_b_la_OBJECTS = libgplugin_b.lo -+libgmodule11d_la_DEPENDENCIES = -+libgmodule11d_la_OBJECTS = gmodule.lo -+libgplugin11d_a_la_DEPENDENCIES = -+libgplugin11d_a_la_OBJECTS = libgplugin_a.lo -+libgplugin11d_b_la_DEPENDENCIES = -+libgplugin11d_b_la_OBJECTS = libgplugin_b.lo - PROGRAMS = $(noinst_PROGRAMS) +@@ -141,7 +141,7 @@ testgmodule_SOURCES = testgmodule.c testgmodule_OBJECTS = testgmodule.o -testgmodule_DEPENDENCIES = libgmodule.la $(top_builddir)/libglib.la -+testgmodule_DEPENDENCIES = libgmodule11d.la $(top_builddir)/libglib11d.la ++testgmodule_DEPENDENCIES = libgmodule12.la $(top_builddir)/libglib12.la CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(CCLD) -export-dynamic $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ - HEADERS = $(include_HEADERS) - - DIST_COMMON = AUTHORS COPYING ChangeLog Makefile.am Makefile.in \ -@@ -157,8 +157,8 @@ - - TAR = tar - GZIP_ENV = --best --SOURCES = $(libgmodule_la_SOURCES) $(libgplugin_a_la_SOURCES) $(libgplugin_b_la_SOURCES) testgmodule.c --OBJECTS = $(libgmodule_la_OBJECTS) $(libgplugin_a_la_OBJECTS) $(libgplugin_b_la_OBJECTS) testgmodule.o -+SOURCES = $(libgmodule11d_la_SOURCES) $(libgplugin11d_a_la_SOURCES) $(libgplugin11d_b_la_SOURCES) testgmodule.c -+OBJECTS = $(libgmodule11d_la_OBJECTS) $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_b_la_OBJECTS) testgmodule.o - - all: all-redirect - .SUFFIXES: -@@ -226,14 +226,14 @@ +@@ -226,13 +226,13 @@ maintainer-clean-libtool: -libgmodule.la: $(libgmodule_la_OBJECTS) $(libgmodule_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libgmodule_la_LDFLAGS) $(libgmodule_la_OBJECTS) $(libgmodule_la_LIBADD) $(LIBS) -+libgmodule11d.la: $(libgmodule11d_la_OBJECTS) $(libgmodule11d_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libgmodule11d_la_LDFLAGS) $(libgmodule11d_la_OBJECTS) $(libgmodule11d_la_LIBADD) $(LIBS) ++libgmodule12.la: $(libgmodule_la_OBJECTS) $(libgmodule_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libgmodule_la_LDFLAGS) $(libgmodule_la_OBJECTS) $(libgmodule_la_LIBADD) $(LIBS) -libgplugin_a.la: $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libgplugin_a_la_LDFLAGS) $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_LIBADD) $(LIBS) -+libgplugin11d_a.la: $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_a_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libgplugin11d_a_la_LDFLAGS) $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_a_la_LIBADD) $(LIBS) ++libgplugin12_a.la: $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libgplugin_a_la_LDFLAGS) $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_LIBADD) $(LIBS) -libgplugin_b.la: $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libgplugin_b_la_LDFLAGS) $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_LIBADD) $(LIBS) -+libgplugin11d_b.la: $(libgplugin11d_b_la_OBJECTS) $(libgplugin11d_b_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libgplugin11d_b_la_LDFLAGS) $(libgplugin11d_b_la_OBJECTS) $(libgplugin11d_b_la_LIBADD) $(LIBS) ++libgplugin12_b.la: $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libgplugin_b_la_LDFLAGS) $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_LIBADD) $(LIBS) mostlyclean-noinstPROGRAMS: - @@ -327,7 +327,7 @@ install: install-am uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS @@ -248,11 +181,11 @@ done -install-libLTLIBRARIES: libgmodule.la -+install-libLTLIBRARIES: libgmodule11d.la ++install-libLTLIBRARIES: libgmodule12.la @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libdir) - @list='libgmodule.la'; for p in $$list; do \ -+ @list='libgmodule11d.la'; for p in $$list; do \ ++ @list='libgmodule12.la'; for p in $$list; do \ if test -f $$p; then \ echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \ $(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \ @@ -263,65 +196,42 @@ -libglib = $(top_builddir)/libglib.la # -lglib -+libglib = $(top_builddir)/libglib11d.la # -lglib ++libglib = $(top_builddir)/libglib12.la # -lglib -lib_LTLIBRARIES = libgthread.la -+lib_LTLIBRARIES = libgthread11d.la ++lib_LTLIBRARIES = libgthread12.la --libgthread_la_SOURCES = gthread.c + libgthread_la_SOURCES = gthread.c -libgthread_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -+libgthread11d_la_SOURCES = gthread.c -+libgthread11d_la_LDFLAGS = -version-info 2:1:0 ++libgthread_la_LDFLAGS = -version-info 1:0:0 --libgthread_la_LIBADD = @G_THREAD_LIBS@ -+libgthread11d_la_LIBADD = @G_THREAD_LIBS@ + libgthread_la_LIBADD = @G_THREAD_LIBS@ noinst_PROGRAMS = testgthread -testgthread_LDADD = ../libglib.la libgthread.la -+testgthread_LDADD = ../libglib11d.la libgthread11d.la ++testgthread_LDADD = ../libglib12.la libgthread12.la mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = -@@ -114,13 +114,13 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ --libgthread_la_DEPENDENCIES = --libgthread_la_OBJECTS = gthread.lo -+libgthread11d_la_DEPENDENCIES = -+libgthread11d_la_OBJECTS = gthread.lo - PROGRAMS = $(noinst_PROGRAMS) +@@ -120,7 +120,7 @@ testgthread_SOURCES = testgthread.c testgthread_OBJECTS = testgthread.o -testgthread_DEPENDENCIES = ../libglib.la libgthread.la -+testgthread_DEPENDENCIES = ../libglib11d.la libgthread11d.la ++testgthread_DEPENDENCIES = ../libglib12.la libgthread12.la testgthread_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -134,8 +134,8 @@ - - TAR = tar - GZIP_ENV = --best --SOURCES = $(libgthread_la_SOURCES) testgthread.c --OBJECTS = $(libgthread_la_OBJECTS) testgthread.o -+SOURCES = $(libgthread11d_la_SOURCES) testgthread.c -+OBJECTS = $(libgthread11d_la_OBJECTS) testgthread.o - - all: all-redirect - .SUFFIXES: -@@ -211,8 +211,8 @@ +@@ -211,7 +211,7 @@ maintainer-clean-libtool: -libgthread.la: $(libgthread_la_OBJECTS) $(libgthread_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libgthread_la_LDFLAGS) $(libgthread_la_OBJECTS) $(libgthread_la_LIBADD) $(LIBS) -+libgthread11d.la: $(libgthread11d_la_OBJECTS) $(libgthread11d_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libgthread11d_la_LDFLAGS) $(libgthread11d_la_OBJECTS) $(libgthread11d_la_LIBADD) $(LIBS) ++libgthread12.la: $(libgthread_la_OBJECTS) $(libgthread_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libgthread_la_LDFLAGS) $(libgthread_la_OBJECTS) $(libgthread_la_LIBADD) $(LIBS) mostlyclean-noinstPROGRAMS: - @@ -291,7 +291,7 @@ install: install-am uninstall-am: uninstall-libLTLIBRARIES @@ -331,3 +241,116 @@ all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +--- docs/Makefile.in.orig Tue Mar 2 10:39:11 1999 ++++ docs/Makefile.in Tue Mar 2 10:40:18 1999 +@@ -89,9 +89,9 @@ + + info_TEXINFOS = glib.texi + +-man_MANS = glib-config.1 ++man_MANS = glib12-config.1 + +-EXTRA_DIST = glib-config.1 glib.html glib_toc.html ++EXTRA_DIST = glib12-config.1 glib.html glib_toc.html + + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +@@ -125,6 +125,8 @@ + glib.info: glib.texi + glib.dvi: glib.texi + ++glib12-config.1: glib-config.1 ++ cp glib-config.1 glib12-config.1 + + DVIPS = dvips + +--- tests/Makefile.in.orig Tue Mar 2 10:42:05 1999 ++++ tests/Makefile.in Tue Mar 2 10:42:39 1999 +@@ -94,17 +94,17 @@ + + noinst_PROGRAMS = $(TESTS) + +-array_test_LDADD = $(top_builddir)/libglib.la +-dirname_test_LDADD = $(top_builddir)/libglib.la +-hash_test_LDADD = $(top_builddir)/libglib.la +-list_test_LDADD = $(top_builddir)/libglib.la +-node_test_LDADD = $(top_builddir)/libglib.la +-relation_test_LDADD = $(top_builddir)/libglib.la +-slist_test_LDADD = $(top_builddir)/libglib.la +-string_test_LDADD = $(top_builddir)/libglib.la +-strfunc_test_LDADD = $(top_builddir)/libglib.la +-tree_test_LDADD = $(top_builddir)/libglib.la +-type_test_LDADD = $(top_builddir)/libglib.la ++array_test_LDADD = $(top_builddir)/libglib12.la ++dirname_test_LDADD = $(top_builddir)/libglib12.la ++hash_test_LDADD = $(top_builddir)/libglib12.la ++list_test_LDADD = $(top_builddir)/libglib12.la ++node_test_LDADD = $(top_builddir)/libglib12.la ++relation_test_LDADD = $(top_builddir)/libglib12.la ++slist_test_LDADD = $(top_builddir)/libglib12.la ++string_test_LDADD = $(top_builddir)/libglib12.la ++strfunc_test_LDADD = $(top_builddir)/libglib12.la ++tree_test_LDADD = $(top_builddir)/libglib12.la ++type_test_LDADD = $(top_builddir)/libglib12.la + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = +@@ -117,47 +117,47 @@ + LIBS = @LIBS@ + array_test_SOURCES = array-test.c + array_test_OBJECTS = array-test.o +-array_test_DEPENDENCIES = $(top_builddir)/libglib.la ++array_test_DEPENDENCIES = $(top_builddir)/libglib12.la + array_test_LDFLAGS = + dirname_test_SOURCES = dirname-test.c + dirname_test_OBJECTS = dirname-test.o +-dirname_test_DEPENDENCIES = $(top_builddir)/libglib.la ++dirname_test_DEPENDENCIES = $(top_builddir)/libglib12.la + dirname_test_LDFLAGS = + hash_test_SOURCES = hash-test.c + hash_test_OBJECTS = hash-test.o +-hash_test_DEPENDENCIES = $(top_builddir)/libglib.la ++hash_test_DEPENDENCIES = $(top_builddir)/libglib12.la + hash_test_LDFLAGS = + list_test_SOURCES = list-test.c + list_test_OBJECTS = list-test.o +-list_test_DEPENDENCIES = $(top_builddir)/libglib.la ++list_test_DEPENDENCIES = $(top_builddir)/libglib12.la + list_test_LDFLAGS = + node_test_SOURCES = node-test.c + node_test_OBJECTS = node-test.o +-node_test_DEPENDENCIES = $(top_builddir)/libglib.la ++node_test_DEPENDENCIES = $(top_builddir)/libglib12.la + node_test_LDFLAGS = + relation_test_SOURCES = relation-test.c + relation_test_OBJECTS = relation-test.o +-relation_test_DEPENDENCIES = $(top_builddir)/libglib.la ++relation_test_DEPENDENCIES = $(top_builddir)/libglib12.la + relation_test_LDFLAGS = + slist_test_SOURCES = slist-test.c + slist_test_OBJECTS = slist-test.o +-slist_test_DEPENDENCIES = $(top_builddir)/libglib.la ++slist_test_DEPENDENCIES = $(top_builddir)/libglib12.la + slist_test_LDFLAGS = + string_test_SOURCES = string-test.c + string_test_OBJECTS = string-test.o +-string_test_DEPENDENCIES = $(top_builddir)/libglib.la ++string_test_DEPENDENCIES = $(top_builddir)/libglib12.la + string_test_LDFLAGS = + strfunc_test_SOURCES = strfunc-test.c + strfunc_test_OBJECTS = strfunc-test.o +-strfunc_test_DEPENDENCIES = $(top_builddir)/libglib.la ++strfunc_test_DEPENDENCIES = $(top_builddir)/libglib12.la + strfunc_test_LDFLAGS = + tree_test_SOURCES = tree-test.c + tree_test_OBJECTS = tree-test.o +-tree_test_DEPENDENCIES = $(top_builddir)/libglib.la ++tree_test_DEPENDENCIES = $(top_builddir)/libglib12.la + tree_test_LDFLAGS = + type_test_SOURCES = type-test.c + type_test_OBJECTS = type-test.o +-type_test_DEPENDENCIES = $(top_builddir)/libglib.la ++type_test_DEPENDENCIES = $(top_builddir)/libglib12.la + type_test_LDFLAGS = + CFLAGS = @CFLAGS@ + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/devel/glib12/files/patch-ac b/devel/glib12/files/patch-ac index 3570ed47a9dc..1532d62c6f74 100644 --- a/devel/glib12/files/patch-ac +++ b/devel/glib12/files/patch-ac @@ -5,7 +5,7 @@ { cat <<EOF -Usage: glib-config [OPTIONS] [LIBRARIES] -+Usage: glib11d-config [OPTIONS] [LIBRARIES] ++Usage: glib12-config [OPTIONS] [LIBRARIES] Options: [--prefix[=DIR]] [--exec-prefix[=DIR]] @@ -21,16 +21,16 @@ libsa="" if test "$lib_glib" = "yes"; then - libsp="$libsp -lglib" -+ libsp="$libsp -lglib11d" ++ libsp="$libsp -lglib12" fi if test "$lib_gthread" = "yes"; then - libsp="-lgthread $libsp" -+ libsp="-rdynamic -lgthread11d $libsp" ++ libsp="-lgthread12 $libsp" libsa="$libsa @G_THREAD_LIBS@" fi if test "$lib_gmodule" = "yes"; then - libsp="@G_MODULE_LDFLAGS@ -lgmodule $libsp" -+ libsp="@G_MODULE_LDFLAGS@ -lgmodule11d $libsp" ++ libsp="@G_MODULE_LDFLAGS@ -lgmodule12 $libsp" libsa="$libsa @G_MODULE_LIBS@" fi echo -L@libdir@ $libsp $libsa diff --git a/devel/glib12/files/patch-ad b/devel/glib12/files/patch-ad index 6ad303c7ab4b..f373a5042242 100644 --- a/devel/glib12/files/patch-ad +++ b/devel/glib12/files/patch-ad @@ -1,6 +1,6 @@ --- configure.in.orig Thu Jan 28 09:59:01 1999 +++ configure.in Thu Jan 28 23:13:01 1999 -@@ -250,7 +250,7 @@ +@@ -268,7 +268,7 @@ AC_CHECK_HEADERS(values.h, AC_DEFINE(HAVE_VALUES_H)) # Check for some functions @@ -9,7 +9,17 @@ # Check for sys_errlist AC_MSG_CHECKING(for sys_errlist) -@@ -732,11 +732,13 @@ +@@ -507,6 +507,9 @@ + linux*) + G_MODULE_LDFLAGS='-rdynamic' + ;; ++ freebsd*) ++ G_MODULE_LDFLAGS='-Wl,-E' ++ ;; + esac + LIBS_orig="$LIBS" + LDFLAGS_orig="$LDFLAGS" +@@ -716,11 +719,13 @@ G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads" fi ;; @@ -18,17 +28,17 @@ - - # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support - # -mthreads flag. -+ *-*-freebsd2.2* | *-*-freebsd3* | *-*-freebsd4*) ++ *-*-freebsd*) + if test x"$G_THREAD_LIBS" = x"-lc_r"; then + G_THREAD_CFLAGS="-D_THREAD_SAFE -pthread" + have_poll=no + else -+ G_THREAD_CFLAGS="-D_THREAD_SAFE" ++ G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS" + fi ;; esac -@@ -785,6 +788,9 @@ +@@ -834,6 +839,9 @@ dnl **************************************** dnl *** GLib POLL* compatibility defines *** dnl **************************************** diff --git a/devel/glib12/files/patch-ae b/devel/glib12/files/patch-ae index fcb74bc9edae..32343d705d05 100644 --- a/devel/glib12/files/patch-ae +++ b/devel/glib12/files/patch-ae @@ -9,7 +9,17 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo "configure:3765: checking for $ac_func" >&5 -@@ -5302,11 +5302,13 @@ +@@ -4610,6 +4610,9 @@ + linux*) + G_MODULE_LDFLAGS='-rdynamic' + ;; ++ freebsd*) ++ G_MODULE_LDFLAGS='-Wl,-E' ++ ;; + esac + LIBS_orig="$LIBS" + LDFLAGS_orig="$LDFLAGS" +@@ -5302,11 +5305,13 @@ G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads" fi ;; @@ -23,180 +33,12 @@ + G_THREAD_CFLAGS="-D_THREAD_SAFE -pthread" + have_poll=no + else -+ G_THREAD_CFLAGS="-D_THREAD_SAFE" ++ G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS" + fi ;; esac -@@ -5315,7 +5317,7 @@ - old_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $G_THREAD_CFLAGS" - cat > conftest.$ac_ext <<EOF --#line 5319 "configure" -+#line 5321 "configure" - #include "confdefs.h" - #include <time.h> - EOF -@@ -5332,7 +5334,7 @@ - CPPFLAGS=$old_CPPFLAGS - - echo $ac_n "checking necessary compiler options""... $ac_c" 1>&6 --echo "configure:5336: checking necessary compiler options" >&5 -+echo "configure:5338: checking necessary compiler options" >&5 - - echo "$ac_t""$G_THREAD_CFLAGS" 1>&6 - else -@@ -5350,12 +5352,12 @@ - for ac_func in localtime_r rand_r - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5354: checking for $ac_func" >&5 -+echo "configure:5356: checking for $ac_func" >&5 - 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 --#line 5359 "configure" -+#line 5361 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -5378,7 +5380,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -5404,7 +5406,7 @@ - - if test "$ac_cv_header_pwd_h" = "yes"; then - echo $ac_n "checking for getpwuid_r""... $ac_c" 1>&6 --echo "configure:5408: checking for getpwuid_r" >&5 -+echo "configure:5410: checking for getpwuid_r" >&5 - if eval "test \"`echo '$''{'ac_cv_func_getpwuid_r'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5412,7 +5414,7 @@ - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <<EOF --#line 5416 "configure" -+#line 5418 "configure" - #include "confdefs.h" - #include <errno.h> - int main () { char buffer[10000], *pointer; -@@ -5423,7 +5425,7 @@ - sizeof (buffer), &pointer); - return errno == ENOSYS;} - EOF --if { (eval echo configure:5427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:5429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_func_getpwuid_r=yes - else -@@ -5448,20 +5450,20 @@ - fi - if test "$ac_cv_func_getpwuid_r" = "yes"; then - echo $ac_n "checking whether getpwuid_r is posix like""... $ac_c" 1>&6 --echo "configure:5452: checking whether getpwuid_r is posix like" >&5 -+echo "configure:5454: checking whether getpwuid_r is posix like" >&5 - # getpwuid_r(0, NULL, NULL, 0) is the signature on - # solaris, if that is not found, the prog below won't - # compile, then the posix signature is assumed as - # the default. - cat > conftest.$ac_ext <<EOF --#line 5458 "configure" -+#line 5460 "configure" - #include "confdefs.h" - #include <pwd.h> - int main() { - getpwuid_r(0, NULL, NULL, 0); - ; return 0; } - EOF --if { (eval echo configure:5465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""no" 1>&6 - else -@@ -5479,17 +5481,17 @@ - fi - if test x"$have_threads" = xposix; then - echo $ac_n "checking whether pthread_getspecific is posix like""... $ac_c" 1>&6 --echo "configure:5483: checking whether pthread_getspecific is posix like" >&5 -+echo "configure:5485: checking whether pthread_getspecific is posix like" >&5 - # PCThreads has pthread_getspecific(pthread_key_t, void **); - cat > conftest.$ac_ext <<EOF --#line 5486 "configure" -+#line 5488 "configure" - #include "confdefs.h" - #include <pthread.h> - int main() { - pthread_getspecific(0,NULL); - ; return 0; } - EOF --if { (eval echo configure:5493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""no" 1>&6 - else -@@ -5530,7 +5532,7 @@ - case "$mutex_has_default" in - "yes") - echo $ac_n "checking size of $mutex_default_type""... $ac_c" 1>&6 --echo "configure:5534: checking size of $mutex_default_type" >&5 -+echo "configure:5536: checking size of $mutex_default_type" >&5 - if eval "test \"`echo '$''{'glib_cv_sizeof_gmutex'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5538,7 +5540,7 @@ - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <<EOF --#line 5542 "configure" -+#line 5544 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <$mutex_header_file> -@@ -5550,7 +5552,7 @@ - exit(0); - } - EOF --if { (eval echo configure:5554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:5556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - glib_cv_sizeof_gmutex=`cat conftestval` - else -@@ -5570,7 +5572,7 @@ - - - echo $ac_n "checking byte contents of $mutex_default_type""... $ac_c" 1>&6 --echo "configure:5574: checking byte contents of $mutex_default_type" >&5 -+echo "configure:5576: checking byte contents of $mutex_default_type" >&5 - if eval "test \"`echo '$''{'glib_cv_byte_contents_gmutex'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5578,7 +5580,7 @@ - glib_cv_byte_contents_gmutex=0 - else - cat > conftest.$ac_ext <<EOF --#line 5582 "configure" -+#line 5584 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <$mutex_header_file> -@@ -5595,7 +5597,7 @@ - exit(0); - } - EOF --if { (eval echo configure:5599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:5601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - glib_cv_byte_contents_gmutex=`cat conftestval` - else -@@ -5623,6 +5625,63 @@ +@@ -5623,6 +5628,63 @@ @@ -204,12 +46,12 @@ + for ac_func in poll +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:5633: checking for $ac_func" >&5 ++echo "configure:5636: checking for $ac_func" >&5 +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 -+#line 5638 "configure" ++#line 5641 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ @@ -232,7 +74,7 @@ + +; return 0; } +EOF -+if { (eval echo configure:5661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else @@ -260,26 +102,3 @@ glib_sysdefso="glibconfig-sysdefs.h" glib_sysdef_msg=`echo POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32 | sed 's/:[^ ]*//g'` if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then -@@ -5631,7 +5690,7 @@ - glib_nl='\n' - fi - echo $ac_n "checking system definitions for $glib_sysdef_msg""... $ac_c" 1>&6 --echo "configure:5635: checking system definitions for $glib_sysdef_msg" >&5 -+echo "configure:5694: checking system definitions for $glib_sysdef_msg" >&5 - cat >confrun.c <<_______EOF - #include <stdio.h> - #include <sys/types.h> -@@ -5658,11 +5717,11 @@ - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <<EOF --#line 5662 "configure" -+#line 5721 "configure" - #include "confdefs.h" - `cat confrun.c` - EOF --if { (eval echo configure:5666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:5725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - echo "$ac_t""done" 1>&6 - else diff --git a/devel/glib12/pkg-descr b/devel/glib12/pkg-descr index 469154423427..65e7944cba86 100644 --- a/devel/glib12/pkg-descr +++ b/devel/glib12/pkg-descr @@ -1,10 +1,7 @@ -This is GLib version 1.1. GLib, is a library which includes support +This is GLib version 1.2. GLib, is a library which includes support routines for C such as lists, trees, hashes, memory allocation, and many other things. -Versions of GLib prior to 1.1.0 are distributed with GTK+ versions 1.1.0 -and earlier. - The official ftp site is: ftp://ftp.gtk.org/pub/gtk diff --git a/devel/glib12/pkg-plist b/devel/glib12/pkg-plist index a2c5ff7fd2f2..85ba872ce363 100644 --- a/devel/glib12/pkg-plist +++ b/devel/glib12/pkg-plist @@ -1,24 +1,24 @@ -bin/glib11d-config -include/glib11d/glib.h -include/glib11d/glibconfig.h -include/glib11d/gmodule.h +bin/glib12-config +include/glib12/glib.h +include/glib12/glibconfig.h +include/glib12/gmodule.h @unexec install-info --delete %D/info/glib.info %D/info/dir info/glib.info @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/glib.info %D/info/dir -lib/libglib11d.a -lib/libglib11d.la -lib/libglib11d.so -lib/libglib11d.so.2.1 -lib/libgmodule11d.a -lib/libgmodule11d.la -lib/libgmodule11d.so -lib/libgmodule11d.so.2.1 -lib/libgthread11d.a -lib/libgthread11d.la -lib/libgthread11d.so -lib/libgthread11d.so.2.1 +lib/libglib12.a +lib/libglib12.la +lib/libglib12.so +lib/libglib12.so.1 +lib/libgmodule12.a +lib/libgmodule12.la +lib/libgmodule12.so +lib/libgmodule12.so.1 +lib/libgthread12.a +lib/libgthread12.la +lib/libgthread12.so +lib/libgthread12.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/aclocal/glib.m4 -@dirrm include/glib11d +@dirrm include/glib12 diff --git a/devel/glib13/Makefile b/devel/glib13/Makefile index 7343c701a67b..7992787f2356 100644 --- a/devel/glib13/Makefile +++ b/devel/glib13/Makefile @@ -1,24 +1,24 @@ -# New ports collection makefile for: glib11-devel -# Version required: 1.1.16 +# New ports collection makefile for: glib12 +# Version required: 1.2.0 # Date Created: 28 July 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.16 1999/01/30 20:23:09 sada Exp $ +# $Id: Makefile,v 1.17 1999/02/17 18:12:08 vanilla Exp $ # -DISTNAME= glib-1.1.16 +DISTNAME= glib-1.2.0 CATEGORIES= devel -MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ - ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ - http://www.ameth.org/gimp/gtk/v1.1/ +MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \ + ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \ + http://www.ameth.org/gimp/gtk/v1.2/ MAINTAINER= vanilla@FreeBSD.ORG GNU_CONFIGURE= yes -CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib11d +CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12 -MAN1= glib-config.1 +MAN1= glib12-config.1 post-install: @if [ ! -f ${PREFIX}/info/dir ]; then \ diff --git a/devel/glib13/distinfo b/devel/glib13/distinfo index 84c47db10e06..3339035c5518 100644 --- a/devel/glib13/distinfo +++ b/devel/glib13/distinfo @@ -1 +1 @@ -MD5 (glib-1.1.16.tar.gz) = f1b32a51becffdad18193b84656989b0 +MD5 (glib-1.2.0.tar.gz) = b19f308dbbd393b6199e743cb1c648a1 diff --git a/devel/glib13/files/patch-ab b/devel/glib13/files/patch-ab index df40e4bbf003..0ae004d00c11 100644 --- a/devel/glib13/files/patch-ab +++ b/devel/glib13/files/patch-ab @@ -11,113 +11,91 @@ +configincludedir = $(includedir) -bin_SCRIPTS = glib-config -+bin_SCRIPTS = glib11d-config ++bin_SCRIPTS = glib12-config BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h -@@ -102,9 +102,9 @@ - EXTRA_DIST = glib.m4 glib.spec acglib.m4 sanity_check README.win32 glib.def makefile.msc giowin32.c glibconfig.h.win32 config.h.win32 +@@ -102,7 +102,7 @@ + EXTRA_DIST = glib.m4 glib.spec.in acglib.m4 sanity_check README.win32 glib.def makefile.msc giowin32.c glibconfig.h.win32 config.h.win32 -lib_LTLIBRARIES = libglib.la -+lib_LTLIBRARIES = libglib11d.la ++lib_LTLIBRARIES = libglib12.la --libglib_la_SOURCES = garray.c gcache.c gcompletion.c gdataset.c gdate.c gerror.c ghash.c ghook.c giochannel.c giounix.c glist.c gmain.c gmem.c gmessages.c gmutex.c gnode.c gprimes.c grel.c gscanner.c gslist.c gstrfuncs.c gstring.c gtimer.c gtree.c gutils.c -+libglib11d_la_SOURCES = garray.c gcache.c gcompletion.c gdataset.c gdate.c gerror.c ghash.c ghook.c giochannel.c giounix.c glist.c gmain.c gmem.c gmessages.c gmutex.c gnode.c gprimes.c grel.c gscanner.c gslist.c gstrfuncs.c gstring.c gtimer.c gtree.c gutils.c + libglib_la_SOURCES = garray.c gcache.c gcompletion.c gdataset.c gdate.c gerror.c ghash.c ghook.c giochannel.c giounix.c glist.c gmain.c gmem.c gmessages.c gmutex.c gnode.c gprimes.c grel.c gscanner.c gslist.c gstrfuncs.c gstring.c gtimer.c gtree.c gutils.c - - include_HEADERS = glib.h @@ -113,20 +113,20 @@ configinclude_DATA = glibconfig.h -libglib_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -+libglib11d_la_LDFLAGS = -version-info 2:1:0 ++libglib_la_LDFLAGS = -version-info 1:0:0 noinst_PROGRAMS = testglib testgdate testgdateparser -testglib_LDADD = libglib.la -testgdate_LDADD = libglib.la -testgdateparser_LDADD = libglib.la -+testglib_LDADD = libglib11d.la -+testgdate_LDADD = libglib11d.la -+testgdateparser_LDADD = libglib11d.la ++testglib_LDADD = libglib12.la ++testgdate_LDADD = libglib12.la ++testgdateparser_LDADD = libglib12.la m4datadir = $(datadir)/aclocal m4data_DATA = glib.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h --CONFIG_CLEAN_FILES = glib-config -+CONFIG_CLEAN_FILES = glib11d-config +-CONFIG_CLEAN_FILES = glib.spec glib-config ++CONFIG_CLEAN_FILES = glib12-config LTLIBRARIES = $(lib_LTLIBRARIES) -@@ -134,8 +134,8 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ --libglib_la_LIBADD = --libglib_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \ -+libglib11d_la_LIBADD = -+libglib11d_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \ - gdate.lo gerror.lo ghash.lo ghook.lo giochannel.lo giounix.lo glist.lo \ - gmain.lo gmem.lo gmessages.lo gmutex.lo gnode.lo gprimes.lo grel.lo \ - gscanner.lo gslist.lo gstrfuncs.lo gstring.lo gtimer.lo gtree.lo \ @@ -144,15 +144,15 @@ testglib_SOURCES = testglib.c testglib_OBJECTS = testglib.o -testglib_DEPENDENCIES = libglib.la -+testglib_DEPENDENCIES = libglib11d.la ++testglib_DEPENDENCIES = libglib12.la testglib_LDFLAGS = testgdate_SOURCES = testgdate.c testgdate_OBJECTS = testgdate.o -testgdate_DEPENDENCIES = libglib.la -+testgdate_DEPENDENCIES = libglib11d.la ++testgdate_DEPENDENCIES = libglib12.la testgdate_LDFLAGS = testgdateparser_SOURCES = testgdateparser.c testgdateparser_OBJECTS = testgdateparser.o -testgdateparser_DEPENDENCIES = libglib.la -+testgdateparser_DEPENDENCIES = libglib11d.la ++testgdateparser_DEPENDENCIES = libglib12.la testgdateparser_LDFLAGS = SCRIPTS = $(bin_SCRIPTS) -@@ -175,8 +175,8 @@ - - TAR = tar - GZIP_ENV = --best --SOURCES = $(libglib_la_SOURCES) testglib.c testgdate.c testgdateparser.c --OBJECTS = $(libglib_la_OBJECTS) testglib.o testgdate.o testgdateparser.o -+SOURCES = $(libglib11d_la_SOURCES) testglib.c testgdate.c testgdateparser.c -+OBJECTS = $(libglib11d_la_OBJECTS) testglib.o testgdate.o testgdateparser.o - - all: all-redirect - .SUFFIXES: -@@ -223,7 +223,10 @@ - -rm -f config.h - +@@ -226,7 +226,7 @@ maintainer-clean-hdr: + glib.spec: $(top_builddir)/config.status glib.spec.in + cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -glib-config: $(top_builddir)/config.status glib-config.in -+glib11d-config.in: glib-config.in -+ cp glib-config.in glib11d-config.in -+ -+glib11d-config: $(top_builddir)/config.status glib11d-config.in ++glib12-config: $(top_builddir)/config.status glib12-config.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status mostlyclean-libLTLIBRARIES: -@@ -289,8 +292,8 @@ +@@ -292,7 +292,7 @@ maintainer-clean-libtool: -libglib.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libglib_la_LDFLAGS) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS) -+libglib11d.la: $(libglib11d_la_OBJECTS) $(libglib11d_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libglib11d_la_LDFLAGS) $(libglib11d_la_OBJECTS) $(libglib11d_la_LIBADD) $(LIBS) ++libglib12.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libglib_la_LDFLAGS) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS) mostlyclean-noinstPROGRAMS: +@@ -535,7 +535,6 @@ + || exit 1; \ + fi; \ + done +- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook -@@ -558,7 +561,7 @@ + info-am: + info: info-recursive +@@ -562,7 +561,7 @@ uninstall-configincludeDATA uninstall-m4dataDATA \ uninstall-includeHEADERS uninstall: uninstall-recursive @@ -126,114 +104,69 @@ $(HEADERS) config.h all-redirect: all-recursive-am install-strip: +@@ -640,7 +639,8 @@ + installdirs mostlyclean-generic distclean-generic clean-generic \ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + +-glib-config: glib-config.in ++glib12-config.in: glib-config.in ++ cp glib-config.in glib12-config.in + + configure: configure.in acglib.m4 + glibconfig.h: stamp-gc-h --- gmodule/Makefile.in.orig Thu Jan 28 23:01:00 1999 +++ gmodule/Makefile.in Thu Jan 28 23:06:56 1999 -@@ -98,29 +98,29 @@ +@@ -98,12 +98,12 @@ include_HEADERS = gmodule.h -libglib = $(top_builddir)/libglib.la # -lglib -+libglib = $(top_builddir)/libglib11d.la # -lglib ++libglib = $(top_builddir)/libglib12.la # -lglib -lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la -+lib_LTLIBRARIES = libgmodule11d.la libgplugin11d_a.la libgplugin11d_b.la ++lib_LTLIBRARIES = libgmodule12.la libgplugin12_a.la libgplugin12_b.la --libgmodule_la_SOURCES = gmodule.c + libgmodule_la_SOURCES = gmodule.c -libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -+libgmodule11d_la_SOURCES = gmodule.c -+libgmodule11d_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info 2:1:0 - - --libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) -+libgmodule11d_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) - # we should really depend on $(libglib) for libgmodule.la, but libtool has a - # problem with this ;( - --libgplugin_a_la_SOURCES = libgplugin_a.c --libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ --libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) -- --libgplugin_b_la_SOURCES = libgplugin_b.c --libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ --libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) -+libgplugin11d_a_la_SOURCES = libgplugin_a.c -+libgplugin11d_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -+libgplugin11d_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) -+ -+libgplugin11d_b_la_SOURCES = libgplugin_b.c -+libgplugin11d_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -+libgplugin11d_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) ++libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info 1:0:0 + + + libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) +@@ -120,7 +120,7 @@ noinst_PROGRAMS = testgmodule testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@ -testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@ -+testgmodule_LDADD = libgmodule11d.la $(libglib) @G_MODULE_LIBS@ ++testgmodule_LDADD = libgmodule12.la $(libglib) @G_MODULE_LIBS@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = gmoduleconf.h -@@ -131,22 +131,22 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ --libgmodule_la_DEPENDENCIES = --libgmodule_la_OBJECTS = gmodule.lo --libgplugin_a_la_DEPENDENCIES = --libgplugin_a_la_OBJECTS = libgplugin_a.lo --libgplugin_b_la_DEPENDENCIES = --libgplugin_b_la_OBJECTS = libgplugin_b.lo -+libgmodule11d_la_DEPENDENCIES = -+libgmodule11d_la_OBJECTS = gmodule.lo -+libgplugin11d_a_la_DEPENDENCIES = -+libgplugin11d_a_la_OBJECTS = libgplugin_a.lo -+libgplugin11d_b_la_DEPENDENCIES = -+libgplugin11d_b_la_OBJECTS = libgplugin_b.lo - PROGRAMS = $(noinst_PROGRAMS) +@@ -141,7 +141,7 @@ testgmodule_SOURCES = testgmodule.c testgmodule_OBJECTS = testgmodule.o -testgmodule_DEPENDENCIES = libgmodule.la $(top_builddir)/libglib.la -+testgmodule_DEPENDENCIES = libgmodule11d.la $(top_builddir)/libglib11d.la ++testgmodule_DEPENDENCIES = libgmodule12.la $(top_builddir)/libglib12.la CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(CCLD) -export-dynamic $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ - HEADERS = $(include_HEADERS) - - DIST_COMMON = AUTHORS COPYING ChangeLog Makefile.am Makefile.in \ -@@ -157,8 +157,8 @@ - - TAR = tar - GZIP_ENV = --best --SOURCES = $(libgmodule_la_SOURCES) $(libgplugin_a_la_SOURCES) $(libgplugin_b_la_SOURCES) testgmodule.c --OBJECTS = $(libgmodule_la_OBJECTS) $(libgplugin_a_la_OBJECTS) $(libgplugin_b_la_OBJECTS) testgmodule.o -+SOURCES = $(libgmodule11d_la_SOURCES) $(libgplugin11d_a_la_SOURCES) $(libgplugin11d_b_la_SOURCES) testgmodule.c -+OBJECTS = $(libgmodule11d_la_OBJECTS) $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_b_la_OBJECTS) testgmodule.o - - all: all-redirect - .SUFFIXES: -@@ -226,14 +226,14 @@ +@@ -226,13 +226,13 @@ maintainer-clean-libtool: -libgmodule.la: $(libgmodule_la_OBJECTS) $(libgmodule_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libgmodule_la_LDFLAGS) $(libgmodule_la_OBJECTS) $(libgmodule_la_LIBADD) $(LIBS) -+libgmodule11d.la: $(libgmodule11d_la_OBJECTS) $(libgmodule11d_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libgmodule11d_la_LDFLAGS) $(libgmodule11d_la_OBJECTS) $(libgmodule11d_la_LIBADD) $(LIBS) ++libgmodule12.la: $(libgmodule_la_OBJECTS) $(libgmodule_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libgmodule_la_LDFLAGS) $(libgmodule_la_OBJECTS) $(libgmodule_la_LIBADD) $(LIBS) -libgplugin_a.la: $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libgplugin_a_la_LDFLAGS) $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_LIBADD) $(LIBS) -+libgplugin11d_a.la: $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_a_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libgplugin11d_a_la_LDFLAGS) $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_a_la_LIBADD) $(LIBS) ++libgplugin12_a.la: $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libgplugin_a_la_LDFLAGS) $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_LIBADD) $(LIBS) -libgplugin_b.la: $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libgplugin_b_la_LDFLAGS) $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_LIBADD) $(LIBS) -+libgplugin11d_b.la: $(libgplugin11d_b_la_OBJECTS) $(libgplugin11d_b_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libgplugin11d_b_la_LDFLAGS) $(libgplugin11d_b_la_OBJECTS) $(libgplugin11d_b_la_LIBADD) $(LIBS) ++libgplugin12_b.la: $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libgplugin_b_la_LDFLAGS) $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_LIBADD) $(LIBS) mostlyclean-noinstPROGRAMS: - @@ -327,7 +327,7 @@ install: install-am uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS @@ -248,11 +181,11 @@ done -install-libLTLIBRARIES: libgmodule.la -+install-libLTLIBRARIES: libgmodule11d.la ++install-libLTLIBRARIES: libgmodule12.la @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libdir) - @list='libgmodule.la'; for p in $$list; do \ -+ @list='libgmodule11d.la'; for p in $$list; do \ ++ @list='libgmodule12.la'; for p in $$list; do \ if test -f $$p; then \ echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \ $(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \ @@ -263,65 +196,42 @@ -libglib = $(top_builddir)/libglib.la # -lglib -+libglib = $(top_builddir)/libglib11d.la # -lglib ++libglib = $(top_builddir)/libglib12.la # -lglib -lib_LTLIBRARIES = libgthread.la -+lib_LTLIBRARIES = libgthread11d.la ++lib_LTLIBRARIES = libgthread12.la --libgthread_la_SOURCES = gthread.c + libgthread_la_SOURCES = gthread.c -libgthread_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -+libgthread11d_la_SOURCES = gthread.c -+libgthread11d_la_LDFLAGS = -version-info 2:1:0 ++libgthread_la_LDFLAGS = -version-info 1:0:0 --libgthread_la_LIBADD = @G_THREAD_LIBS@ -+libgthread11d_la_LIBADD = @G_THREAD_LIBS@ + libgthread_la_LIBADD = @G_THREAD_LIBS@ noinst_PROGRAMS = testgthread -testgthread_LDADD = ../libglib.la libgthread.la -+testgthread_LDADD = ../libglib11d.la libgthread11d.la ++testgthread_LDADD = ../libglib12.la libgthread12.la mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = -@@ -114,13 +114,13 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ --libgthread_la_DEPENDENCIES = --libgthread_la_OBJECTS = gthread.lo -+libgthread11d_la_DEPENDENCIES = -+libgthread11d_la_OBJECTS = gthread.lo - PROGRAMS = $(noinst_PROGRAMS) +@@ -120,7 +120,7 @@ testgthread_SOURCES = testgthread.c testgthread_OBJECTS = testgthread.o -testgthread_DEPENDENCIES = ../libglib.la libgthread.la -+testgthread_DEPENDENCIES = ../libglib11d.la libgthread11d.la ++testgthread_DEPENDENCIES = ../libglib12.la libgthread12.la testgthread_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -134,8 +134,8 @@ - - TAR = tar - GZIP_ENV = --best --SOURCES = $(libgthread_la_SOURCES) testgthread.c --OBJECTS = $(libgthread_la_OBJECTS) testgthread.o -+SOURCES = $(libgthread11d_la_SOURCES) testgthread.c -+OBJECTS = $(libgthread11d_la_OBJECTS) testgthread.o - - all: all-redirect - .SUFFIXES: -@@ -211,8 +211,8 @@ +@@ -211,7 +211,7 @@ maintainer-clean-libtool: -libgthread.la: $(libgthread_la_OBJECTS) $(libgthread_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libgthread_la_LDFLAGS) $(libgthread_la_OBJECTS) $(libgthread_la_LIBADD) $(LIBS) -+libgthread11d.la: $(libgthread11d_la_OBJECTS) $(libgthread11d_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libgthread11d_la_LDFLAGS) $(libgthread11d_la_OBJECTS) $(libgthread11d_la_LIBADD) $(LIBS) ++libgthread12.la: $(libgthread_la_OBJECTS) $(libgthread_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libgthread_la_LDFLAGS) $(libgthread_la_OBJECTS) $(libgthread_la_LIBADD) $(LIBS) mostlyclean-noinstPROGRAMS: - @@ -291,7 +291,7 @@ install: install-am uninstall-am: uninstall-libLTLIBRARIES @@ -331,3 +241,116 @@ all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +--- docs/Makefile.in.orig Tue Mar 2 10:39:11 1999 ++++ docs/Makefile.in Tue Mar 2 10:40:18 1999 +@@ -89,9 +89,9 @@ + + info_TEXINFOS = glib.texi + +-man_MANS = glib-config.1 ++man_MANS = glib12-config.1 + +-EXTRA_DIST = glib-config.1 glib.html glib_toc.html ++EXTRA_DIST = glib12-config.1 glib.html glib_toc.html + + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +@@ -125,6 +125,8 @@ + glib.info: glib.texi + glib.dvi: glib.texi + ++glib12-config.1: glib-config.1 ++ cp glib-config.1 glib12-config.1 + + DVIPS = dvips + +--- tests/Makefile.in.orig Tue Mar 2 10:42:05 1999 ++++ tests/Makefile.in Tue Mar 2 10:42:39 1999 +@@ -94,17 +94,17 @@ + + noinst_PROGRAMS = $(TESTS) + +-array_test_LDADD = $(top_builddir)/libglib.la +-dirname_test_LDADD = $(top_builddir)/libglib.la +-hash_test_LDADD = $(top_builddir)/libglib.la +-list_test_LDADD = $(top_builddir)/libglib.la +-node_test_LDADD = $(top_builddir)/libglib.la +-relation_test_LDADD = $(top_builddir)/libglib.la +-slist_test_LDADD = $(top_builddir)/libglib.la +-string_test_LDADD = $(top_builddir)/libglib.la +-strfunc_test_LDADD = $(top_builddir)/libglib.la +-tree_test_LDADD = $(top_builddir)/libglib.la +-type_test_LDADD = $(top_builddir)/libglib.la ++array_test_LDADD = $(top_builddir)/libglib12.la ++dirname_test_LDADD = $(top_builddir)/libglib12.la ++hash_test_LDADD = $(top_builddir)/libglib12.la ++list_test_LDADD = $(top_builddir)/libglib12.la ++node_test_LDADD = $(top_builddir)/libglib12.la ++relation_test_LDADD = $(top_builddir)/libglib12.la ++slist_test_LDADD = $(top_builddir)/libglib12.la ++string_test_LDADD = $(top_builddir)/libglib12.la ++strfunc_test_LDADD = $(top_builddir)/libglib12.la ++tree_test_LDADD = $(top_builddir)/libglib12.la ++type_test_LDADD = $(top_builddir)/libglib12.la + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = +@@ -117,47 +117,47 @@ + LIBS = @LIBS@ + array_test_SOURCES = array-test.c + array_test_OBJECTS = array-test.o +-array_test_DEPENDENCIES = $(top_builddir)/libglib.la ++array_test_DEPENDENCIES = $(top_builddir)/libglib12.la + array_test_LDFLAGS = + dirname_test_SOURCES = dirname-test.c + dirname_test_OBJECTS = dirname-test.o +-dirname_test_DEPENDENCIES = $(top_builddir)/libglib.la ++dirname_test_DEPENDENCIES = $(top_builddir)/libglib12.la + dirname_test_LDFLAGS = + hash_test_SOURCES = hash-test.c + hash_test_OBJECTS = hash-test.o +-hash_test_DEPENDENCIES = $(top_builddir)/libglib.la ++hash_test_DEPENDENCIES = $(top_builddir)/libglib12.la + hash_test_LDFLAGS = + list_test_SOURCES = list-test.c + list_test_OBJECTS = list-test.o +-list_test_DEPENDENCIES = $(top_builddir)/libglib.la ++list_test_DEPENDENCIES = $(top_builddir)/libglib12.la + list_test_LDFLAGS = + node_test_SOURCES = node-test.c + node_test_OBJECTS = node-test.o +-node_test_DEPENDENCIES = $(top_builddir)/libglib.la ++node_test_DEPENDENCIES = $(top_builddir)/libglib12.la + node_test_LDFLAGS = + relation_test_SOURCES = relation-test.c + relation_test_OBJECTS = relation-test.o +-relation_test_DEPENDENCIES = $(top_builddir)/libglib.la ++relation_test_DEPENDENCIES = $(top_builddir)/libglib12.la + relation_test_LDFLAGS = + slist_test_SOURCES = slist-test.c + slist_test_OBJECTS = slist-test.o +-slist_test_DEPENDENCIES = $(top_builddir)/libglib.la ++slist_test_DEPENDENCIES = $(top_builddir)/libglib12.la + slist_test_LDFLAGS = + string_test_SOURCES = string-test.c + string_test_OBJECTS = string-test.o +-string_test_DEPENDENCIES = $(top_builddir)/libglib.la ++string_test_DEPENDENCIES = $(top_builddir)/libglib12.la + string_test_LDFLAGS = + strfunc_test_SOURCES = strfunc-test.c + strfunc_test_OBJECTS = strfunc-test.o +-strfunc_test_DEPENDENCIES = $(top_builddir)/libglib.la ++strfunc_test_DEPENDENCIES = $(top_builddir)/libglib12.la + strfunc_test_LDFLAGS = + tree_test_SOURCES = tree-test.c + tree_test_OBJECTS = tree-test.o +-tree_test_DEPENDENCIES = $(top_builddir)/libglib.la ++tree_test_DEPENDENCIES = $(top_builddir)/libglib12.la + tree_test_LDFLAGS = + type_test_SOURCES = type-test.c + type_test_OBJECTS = type-test.o +-type_test_DEPENDENCIES = $(top_builddir)/libglib.la ++type_test_DEPENDENCIES = $(top_builddir)/libglib12.la + type_test_LDFLAGS = + CFLAGS = @CFLAGS@ + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/devel/glib13/files/patch-ae b/devel/glib13/files/patch-ae index fcb74bc9edae..32343d705d05 100644 --- a/devel/glib13/files/patch-ae +++ b/devel/glib13/files/patch-ae @@ -9,7 +9,17 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo "configure:3765: checking for $ac_func" >&5 -@@ -5302,11 +5302,13 @@ +@@ -4610,6 +4610,9 @@ + linux*) + G_MODULE_LDFLAGS='-rdynamic' + ;; ++ freebsd*) ++ G_MODULE_LDFLAGS='-Wl,-E' ++ ;; + esac + LIBS_orig="$LIBS" + LDFLAGS_orig="$LDFLAGS" +@@ -5302,11 +5305,13 @@ G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads" fi ;; @@ -23,180 +33,12 @@ + G_THREAD_CFLAGS="-D_THREAD_SAFE -pthread" + have_poll=no + else -+ G_THREAD_CFLAGS="-D_THREAD_SAFE" ++ G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS" + fi ;; esac -@@ -5315,7 +5317,7 @@ - old_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $G_THREAD_CFLAGS" - cat > conftest.$ac_ext <<EOF --#line 5319 "configure" -+#line 5321 "configure" - #include "confdefs.h" - #include <time.h> - EOF -@@ -5332,7 +5334,7 @@ - CPPFLAGS=$old_CPPFLAGS - - echo $ac_n "checking necessary compiler options""... $ac_c" 1>&6 --echo "configure:5336: checking necessary compiler options" >&5 -+echo "configure:5338: checking necessary compiler options" >&5 - - echo "$ac_t""$G_THREAD_CFLAGS" 1>&6 - else -@@ -5350,12 +5352,12 @@ - for ac_func in localtime_r rand_r - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5354: checking for $ac_func" >&5 -+echo "configure:5356: checking for $ac_func" >&5 - 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 --#line 5359 "configure" -+#line 5361 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -5378,7 +5380,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -5404,7 +5406,7 @@ - - if test "$ac_cv_header_pwd_h" = "yes"; then - echo $ac_n "checking for getpwuid_r""... $ac_c" 1>&6 --echo "configure:5408: checking for getpwuid_r" >&5 -+echo "configure:5410: checking for getpwuid_r" >&5 - if eval "test \"`echo '$''{'ac_cv_func_getpwuid_r'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5412,7 +5414,7 @@ - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <<EOF --#line 5416 "configure" -+#line 5418 "configure" - #include "confdefs.h" - #include <errno.h> - int main () { char buffer[10000], *pointer; -@@ -5423,7 +5425,7 @@ - sizeof (buffer), &pointer); - return errno == ENOSYS;} - EOF --if { (eval echo configure:5427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:5429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_func_getpwuid_r=yes - else -@@ -5448,20 +5450,20 @@ - fi - if test "$ac_cv_func_getpwuid_r" = "yes"; then - echo $ac_n "checking whether getpwuid_r is posix like""... $ac_c" 1>&6 --echo "configure:5452: checking whether getpwuid_r is posix like" >&5 -+echo "configure:5454: checking whether getpwuid_r is posix like" >&5 - # getpwuid_r(0, NULL, NULL, 0) is the signature on - # solaris, if that is not found, the prog below won't - # compile, then the posix signature is assumed as - # the default. - cat > conftest.$ac_ext <<EOF --#line 5458 "configure" -+#line 5460 "configure" - #include "confdefs.h" - #include <pwd.h> - int main() { - getpwuid_r(0, NULL, NULL, 0); - ; return 0; } - EOF --if { (eval echo configure:5465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""no" 1>&6 - else -@@ -5479,17 +5481,17 @@ - fi - if test x"$have_threads" = xposix; then - echo $ac_n "checking whether pthread_getspecific is posix like""... $ac_c" 1>&6 --echo "configure:5483: checking whether pthread_getspecific is posix like" >&5 -+echo "configure:5485: checking whether pthread_getspecific is posix like" >&5 - # PCThreads has pthread_getspecific(pthread_key_t, void **); - cat > conftest.$ac_ext <<EOF --#line 5486 "configure" -+#line 5488 "configure" - #include "confdefs.h" - #include <pthread.h> - int main() { - pthread_getspecific(0,NULL); - ; return 0; } - EOF --if { (eval echo configure:5493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""no" 1>&6 - else -@@ -5530,7 +5532,7 @@ - case "$mutex_has_default" in - "yes") - echo $ac_n "checking size of $mutex_default_type""... $ac_c" 1>&6 --echo "configure:5534: checking size of $mutex_default_type" >&5 -+echo "configure:5536: checking size of $mutex_default_type" >&5 - if eval "test \"`echo '$''{'glib_cv_sizeof_gmutex'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5538,7 +5540,7 @@ - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <<EOF --#line 5542 "configure" -+#line 5544 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <$mutex_header_file> -@@ -5550,7 +5552,7 @@ - exit(0); - } - EOF --if { (eval echo configure:5554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:5556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - glib_cv_sizeof_gmutex=`cat conftestval` - else -@@ -5570,7 +5572,7 @@ - - - echo $ac_n "checking byte contents of $mutex_default_type""... $ac_c" 1>&6 --echo "configure:5574: checking byte contents of $mutex_default_type" >&5 -+echo "configure:5576: checking byte contents of $mutex_default_type" >&5 - if eval "test \"`echo '$''{'glib_cv_byte_contents_gmutex'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5578,7 +5580,7 @@ - glib_cv_byte_contents_gmutex=0 - else - cat > conftest.$ac_ext <<EOF --#line 5582 "configure" -+#line 5584 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <$mutex_header_file> -@@ -5595,7 +5597,7 @@ - exit(0); - } - EOF --if { (eval echo configure:5599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:5601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - glib_cv_byte_contents_gmutex=`cat conftestval` - else -@@ -5623,6 +5625,63 @@ +@@ -5623,6 +5628,63 @@ @@ -204,12 +46,12 @@ + for ac_func in poll +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:5633: checking for $ac_func" >&5 ++echo "configure:5636: checking for $ac_func" >&5 +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 -+#line 5638 "configure" ++#line 5641 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ @@ -232,7 +74,7 @@ + +; return 0; } +EOF -+if { (eval echo configure:5661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else @@ -260,26 +102,3 @@ glib_sysdefso="glibconfig-sysdefs.h" glib_sysdef_msg=`echo POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32 | sed 's/:[^ ]*//g'` if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then -@@ -5631,7 +5690,7 @@ - glib_nl='\n' - fi - echo $ac_n "checking system definitions for $glib_sysdef_msg""... $ac_c" 1>&6 --echo "configure:5635: checking system definitions for $glib_sysdef_msg" >&5 -+echo "configure:5694: checking system definitions for $glib_sysdef_msg" >&5 - cat >confrun.c <<_______EOF - #include <stdio.h> - #include <sys/types.h> -@@ -5658,11 +5717,11 @@ - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <<EOF --#line 5662 "configure" -+#line 5721 "configure" - #include "confdefs.h" - `cat confrun.c` - EOF --if { (eval echo configure:5666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:5725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - echo "$ac_t""done" 1>&6 - else diff --git a/devel/glib13/pkg-descr b/devel/glib13/pkg-descr index 469154423427..65e7944cba86 100644 --- a/devel/glib13/pkg-descr +++ b/devel/glib13/pkg-descr @@ -1,10 +1,7 @@ -This is GLib version 1.1. GLib, is a library which includes support +This is GLib version 1.2. GLib, is a library which includes support routines for C such as lists, trees, hashes, memory allocation, and many other things. -Versions of GLib prior to 1.1.0 are distributed with GTK+ versions 1.1.0 -and earlier. - The official ftp site is: ftp://ftp.gtk.org/pub/gtk diff --git a/devel/glib13/pkg-plist b/devel/glib13/pkg-plist index a2c5ff7fd2f2..85ba872ce363 100644 --- a/devel/glib13/pkg-plist +++ b/devel/glib13/pkg-plist @@ -1,24 +1,24 @@ -bin/glib11d-config -include/glib11d/glib.h -include/glib11d/glibconfig.h -include/glib11d/gmodule.h +bin/glib12-config +include/glib12/glib.h +include/glib12/glibconfig.h +include/glib12/gmodule.h @unexec install-info --delete %D/info/glib.info %D/info/dir info/glib.info @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/glib.info %D/info/dir -lib/libglib11d.a -lib/libglib11d.la -lib/libglib11d.so -lib/libglib11d.so.2.1 -lib/libgmodule11d.a -lib/libgmodule11d.la -lib/libgmodule11d.so -lib/libgmodule11d.so.2.1 -lib/libgthread11d.a -lib/libgthread11d.la -lib/libgthread11d.so -lib/libgthread11d.so.2.1 +lib/libglib12.a +lib/libglib12.la +lib/libglib12.so +lib/libglib12.so.1 +lib/libgmodule12.a +lib/libgmodule12.la +lib/libgmodule12.so +lib/libgmodule12.so.1 +lib/libgthread12.a +lib/libgthread12.la +lib/libgthread12.so +lib/libgthread12.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/aclocal/glib.m4 -@dirrm include/glib11d +@dirrm include/glib12 diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 7343c701a67b..7992787f2356 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -1,24 +1,24 @@ -# New ports collection makefile for: glib11-devel -# Version required: 1.1.16 +# New ports collection makefile for: glib12 +# Version required: 1.2.0 # Date Created: 28 July 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.16 1999/01/30 20:23:09 sada Exp $ +# $Id: Makefile,v 1.17 1999/02/17 18:12:08 vanilla Exp $ # -DISTNAME= glib-1.1.16 +DISTNAME= glib-1.2.0 CATEGORIES= devel -MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ - ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ - http://www.ameth.org/gimp/gtk/v1.1/ +MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \ + ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \ + http://www.ameth.org/gimp/gtk/v1.2/ MAINTAINER= vanilla@FreeBSD.ORG GNU_CONFIGURE= yes -CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib11d +CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12 -MAN1= glib-config.1 +MAN1= glib12-config.1 post-install: @if [ ! -f ${PREFIX}/info/dir ]; then \ diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index 84c47db10e06..3339035c5518 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1 +1 @@ -MD5 (glib-1.1.16.tar.gz) = f1b32a51becffdad18193b84656989b0 +MD5 (glib-1.2.0.tar.gz) = b19f308dbbd393b6199e743cb1c648a1 diff --git a/devel/glib20/files/patch-ab b/devel/glib20/files/patch-ab index df40e4bbf003..0ae004d00c11 100644 --- a/devel/glib20/files/patch-ab +++ b/devel/glib20/files/patch-ab @@ -11,113 +11,91 @@ +configincludedir = $(includedir) -bin_SCRIPTS = glib-config -+bin_SCRIPTS = glib11d-config ++bin_SCRIPTS = glib12-config BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h -@@ -102,9 +102,9 @@ - EXTRA_DIST = glib.m4 glib.spec acglib.m4 sanity_check README.win32 glib.def makefile.msc giowin32.c glibconfig.h.win32 config.h.win32 +@@ -102,7 +102,7 @@ + EXTRA_DIST = glib.m4 glib.spec.in acglib.m4 sanity_check README.win32 glib.def makefile.msc giowin32.c glibconfig.h.win32 config.h.win32 -lib_LTLIBRARIES = libglib.la -+lib_LTLIBRARIES = libglib11d.la ++lib_LTLIBRARIES = libglib12.la --libglib_la_SOURCES = garray.c gcache.c gcompletion.c gdataset.c gdate.c gerror.c ghash.c ghook.c giochannel.c giounix.c glist.c gmain.c gmem.c gmessages.c gmutex.c gnode.c gprimes.c grel.c gscanner.c gslist.c gstrfuncs.c gstring.c gtimer.c gtree.c gutils.c -+libglib11d_la_SOURCES = garray.c gcache.c gcompletion.c gdataset.c gdate.c gerror.c ghash.c ghook.c giochannel.c giounix.c glist.c gmain.c gmem.c gmessages.c gmutex.c gnode.c gprimes.c grel.c gscanner.c gslist.c gstrfuncs.c gstring.c gtimer.c gtree.c gutils.c + libglib_la_SOURCES = garray.c gcache.c gcompletion.c gdataset.c gdate.c gerror.c ghash.c ghook.c giochannel.c giounix.c glist.c gmain.c gmem.c gmessages.c gmutex.c gnode.c gprimes.c grel.c gscanner.c gslist.c gstrfuncs.c gstring.c gtimer.c gtree.c gutils.c - - include_HEADERS = glib.h @@ -113,20 +113,20 @@ configinclude_DATA = glibconfig.h -libglib_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -+libglib11d_la_LDFLAGS = -version-info 2:1:0 ++libglib_la_LDFLAGS = -version-info 1:0:0 noinst_PROGRAMS = testglib testgdate testgdateparser -testglib_LDADD = libglib.la -testgdate_LDADD = libglib.la -testgdateparser_LDADD = libglib.la -+testglib_LDADD = libglib11d.la -+testgdate_LDADD = libglib11d.la -+testgdateparser_LDADD = libglib11d.la ++testglib_LDADD = libglib12.la ++testgdate_LDADD = libglib12.la ++testgdateparser_LDADD = libglib12.la m4datadir = $(datadir)/aclocal m4data_DATA = glib.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h --CONFIG_CLEAN_FILES = glib-config -+CONFIG_CLEAN_FILES = glib11d-config +-CONFIG_CLEAN_FILES = glib.spec glib-config ++CONFIG_CLEAN_FILES = glib12-config LTLIBRARIES = $(lib_LTLIBRARIES) -@@ -134,8 +134,8 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ --libglib_la_LIBADD = --libglib_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \ -+libglib11d_la_LIBADD = -+libglib11d_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \ - gdate.lo gerror.lo ghash.lo ghook.lo giochannel.lo giounix.lo glist.lo \ - gmain.lo gmem.lo gmessages.lo gmutex.lo gnode.lo gprimes.lo grel.lo \ - gscanner.lo gslist.lo gstrfuncs.lo gstring.lo gtimer.lo gtree.lo \ @@ -144,15 +144,15 @@ testglib_SOURCES = testglib.c testglib_OBJECTS = testglib.o -testglib_DEPENDENCIES = libglib.la -+testglib_DEPENDENCIES = libglib11d.la ++testglib_DEPENDENCIES = libglib12.la testglib_LDFLAGS = testgdate_SOURCES = testgdate.c testgdate_OBJECTS = testgdate.o -testgdate_DEPENDENCIES = libglib.la -+testgdate_DEPENDENCIES = libglib11d.la ++testgdate_DEPENDENCIES = libglib12.la testgdate_LDFLAGS = testgdateparser_SOURCES = testgdateparser.c testgdateparser_OBJECTS = testgdateparser.o -testgdateparser_DEPENDENCIES = libglib.la -+testgdateparser_DEPENDENCIES = libglib11d.la ++testgdateparser_DEPENDENCIES = libglib12.la testgdateparser_LDFLAGS = SCRIPTS = $(bin_SCRIPTS) -@@ -175,8 +175,8 @@ - - TAR = tar - GZIP_ENV = --best --SOURCES = $(libglib_la_SOURCES) testglib.c testgdate.c testgdateparser.c --OBJECTS = $(libglib_la_OBJECTS) testglib.o testgdate.o testgdateparser.o -+SOURCES = $(libglib11d_la_SOURCES) testglib.c testgdate.c testgdateparser.c -+OBJECTS = $(libglib11d_la_OBJECTS) testglib.o testgdate.o testgdateparser.o - - all: all-redirect - .SUFFIXES: -@@ -223,7 +223,10 @@ - -rm -f config.h - +@@ -226,7 +226,7 @@ maintainer-clean-hdr: + glib.spec: $(top_builddir)/config.status glib.spec.in + cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -glib-config: $(top_builddir)/config.status glib-config.in -+glib11d-config.in: glib-config.in -+ cp glib-config.in glib11d-config.in -+ -+glib11d-config: $(top_builddir)/config.status glib11d-config.in ++glib12-config: $(top_builddir)/config.status glib12-config.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status mostlyclean-libLTLIBRARIES: -@@ -289,8 +292,8 @@ +@@ -292,7 +292,7 @@ maintainer-clean-libtool: -libglib.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libglib_la_LDFLAGS) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS) -+libglib11d.la: $(libglib11d_la_OBJECTS) $(libglib11d_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libglib11d_la_LDFLAGS) $(libglib11d_la_OBJECTS) $(libglib11d_la_LIBADD) $(LIBS) ++libglib12.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libglib_la_LDFLAGS) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS) mostlyclean-noinstPROGRAMS: +@@ -535,7 +535,6 @@ + || exit 1; \ + fi; \ + done +- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook -@@ -558,7 +561,7 @@ + info-am: + info: info-recursive +@@ -562,7 +561,7 @@ uninstall-configincludeDATA uninstall-m4dataDATA \ uninstall-includeHEADERS uninstall: uninstall-recursive @@ -126,114 +104,69 @@ $(HEADERS) config.h all-redirect: all-recursive-am install-strip: +@@ -640,7 +639,8 @@ + installdirs mostlyclean-generic distclean-generic clean-generic \ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + +-glib-config: glib-config.in ++glib12-config.in: glib-config.in ++ cp glib-config.in glib12-config.in + + configure: configure.in acglib.m4 + glibconfig.h: stamp-gc-h --- gmodule/Makefile.in.orig Thu Jan 28 23:01:00 1999 +++ gmodule/Makefile.in Thu Jan 28 23:06:56 1999 -@@ -98,29 +98,29 @@ +@@ -98,12 +98,12 @@ include_HEADERS = gmodule.h -libglib = $(top_builddir)/libglib.la # -lglib -+libglib = $(top_builddir)/libglib11d.la # -lglib ++libglib = $(top_builddir)/libglib12.la # -lglib -lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la -+lib_LTLIBRARIES = libgmodule11d.la libgplugin11d_a.la libgplugin11d_b.la ++lib_LTLIBRARIES = libgmodule12.la libgplugin12_a.la libgplugin12_b.la --libgmodule_la_SOURCES = gmodule.c + libgmodule_la_SOURCES = gmodule.c -libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -+libgmodule11d_la_SOURCES = gmodule.c -+libgmodule11d_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info 2:1:0 - - --libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) -+libgmodule11d_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) - # we should really depend on $(libglib) for libgmodule.la, but libtool has a - # problem with this ;( - --libgplugin_a_la_SOURCES = libgplugin_a.c --libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ --libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) -- --libgplugin_b_la_SOURCES = libgplugin_b.c --libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ --libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) -+libgplugin11d_a_la_SOURCES = libgplugin_a.c -+libgplugin11d_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -+libgplugin11d_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) -+ -+libgplugin11d_b_la_SOURCES = libgplugin_b.c -+libgplugin11d_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -+libgplugin11d_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) ++libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info 1:0:0 + + + libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) +@@ -120,7 +120,7 @@ noinst_PROGRAMS = testgmodule testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@ -testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@ -+testgmodule_LDADD = libgmodule11d.la $(libglib) @G_MODULE_LIBS@ ++testgmodule_LDADD = libgmodule12.la $(libglib) @G_MODULE_LIBS@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = gmoduleconf.h -@@ -131,22 +131,22 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ --libgmodule_la_DEPENDENCIES = --libgmodule_la_OBJECTS = gmodule.lo --libgplugin_a_la_DEPENDENCIES = --libgplugin_a_la_OBJECTS = libgplugin_a.lo --libgplugin_b_la_DEPENDENCIES = --libgplugin_b_la_OBJECTS = libgplugin_b.lo -+libgmodule11d_la_DEPENDENCIES = -+libgmodule11d_la_OBJECTS = gmodule.lo -+libgplugin11d_a_la_DEPENDENCIES = -+libgplugin11d_a_la_OBJECTS = libgplugin_a.lo -+libgplugin11d_b_la_DEPENDENCIES = -+libgplugin11d_b_la_OBJECTS = libgplugin_b.lo - PROGRAMS = $(noinst_PROGRAMS) +@@ -141,7 +141,7 @@ testgmodule_SOURCES = testgmodule.c testgmodule_OBJECTS = testgmodule.o -testgmodule_DEPENDENCIES = libgmodule.la $(top_builddir)/libglib.la -+testgmodule_DEPENDENCIES = libgmodule11d.la $(top_builddir)/libglib11d.la ++testgmodule_DEPENDENCIES = libgmodule12.la $(top_builddir)/libglib12.la CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(CCLD) -export-dynamic $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ - HEADERS = $(include_HEADERS) - - DIST_COMMON = AUTHORS COPYING ChangeLog Makefile.am Makefile.in \ -@@ -157,8 +157,8 @@ - - TAR = tar - GZIP_ENV = --best --SOURCES = $(libgmodule_la_SOURCES) $(libgplugin_a_la_SOURCES) $(libgplugin_b_la_SOURCES) testgmodule.c --OBJECTS = $(libgmodule_la_OBJECTS) $(libgplugin_a_la_OBJECTS) $(libgplugin_b_la_OBJECTS) testgmodule.o -+SOURCES = $(libgmodule11d_la_SOURCES) $(libgplugin11d_a_la_SOURCES) $(libgplugin11d_b_la_SOURCES) testgmodule.c -+OBJECTS = $(libgmodule11d_la_OBJECTS) $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_b_la_OBJECTS) testgmodule.o - - all: all-redirect - .SUFFIXES: -@@ -226,14 +226,14 @@ +@@ -226,13 +226,13 @@ maintainer-clean-libtool: -libgmodule.la: $(libgmodule_la_OBJECTS) $(libgmodule_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libgmodule_la_LDFLAGS) $(libgmodule_la_OBJECTS) $(libgmodule_la_LIBADD) $(LIBS) -+libgmodule11d.la: $(libgmodule11d_la_OBJECTS) $(libgmodule11d_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libgmodule11d_la_LDFLAGS) $(libgmodule11d_la_OBJECTS) $(libgmodule11d_la_LIBADD) $(LIBS) ++libgmodule12.la: $(libgmodule_la_OBJECTS) $(libgmodule_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libgmodule_la_LDFLAGS) $(libgmodule_la_OBJECTS) $(libgmodule_la_LIBADD) $(LIBS) -libgplugin_a.la: $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libgplugin_a_la_LDFLAGS) $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_LIBADD) $(LIBS) -+libgplugin11d_a.la: $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_a_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libgplugin11d_a_la_LDFLAGS) $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_a_la_LIBADD) $(LIBS) ++libgplugin12_a.la: $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libgplugin_a_la_LDFLAGS) $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_LIBADD) $(LIBS) -libgplugin_b.la: $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libgplugin_b_la_LDFLAGS) $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_LIBADD) $(LIBS) -+libgplugin11d_b.la: $(libgplugin11d_b_la_OBJECTS) $(libgplugin11d_b_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libgplugin11d_b_la_LDFLAGS) $(libgplugin11d_b_la_OBJECTS) $(libgplugin11d_b_la_LIBADD) $(LIBS) ++libgplugin12_b.la: $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libgplugin_b_la_LDFLAGS) $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_LIBADD) $(LIBS) mostlyclean-noinstPROGRAMS: - @@ -327,7 +327,7 @@ install: install-am uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS @@ -248,11 +181,11 @@ done -install-libLTLIBRARIES: libgmodule.la -+install-libLTLIBRARIES: libgmodule11d.la ++install-libLTLIBRARIES: libgmodule12.la @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libdir) - @list='libgmodule.la'; for p in $$list; do \ -+ @list='libgmodule11d.la'; for p in $$list; do \ ++ @list='libgmodule12.la'; for p in $$list; do \ if test -f $$p; then \ echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \ $(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \ @@ -263,65 +196,42 @@ -libglib = $(top_builddir)/libglib.la # -lglib -+libglib = $(top_builddir)/libglib11d.la # -lglib ++libglib = $(top_builddir)/libglib12.la # -lglib -lib_LTLIBRARIES = libgthread.la -+lib_LTLIBRARIES = libgthread11d.la ++lib_LTLIBRARIES = libgthread12.la --libgthread_la_SOURCES = gthread.c + libgthread_la_SOURCES = gthread.c -libgthread_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -+libgthread11d_la_SOURCES = gthread.c -+libgthread11d_la_LDFLAGS = -version-info 2:1:0 ++libgthread_la_LDFLAGS = -version-info 1:0:0 --libgthread_la_LIBADD = @G_THREAD_LIBS@ -+libgthread11d_la_LIBADD = @G_THREAD_LIBS@ + libgthread_la_LIBADD = @G_THREAD_LIBS@ noinst_PROGRAMS = testgthread -testgthread_LDADD = ../libglib.la libgthread.la -+testgthread_LDADD = ../libglib11d.la libgthread11d.la ++testgthread_LDADD = ../libglib12.la libgthread12.la mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = -@@ -114,13 +114,13 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ --libgthread_la_DEPENDENCIES = --libgthread_la_OBJECTS = gthread.lo -+libgthread11d_la_DEPENDENCIES = -+libgthread11d_la_OBJECTS = gthread.lo - PROGRAMS = $(noinst_PROGRAMS) +@@ -120,7 +120,7 @@ testgthread_SOURCES = testgthread.c testgthread_OBJECTS = testgthread.o -testgthread_DEPENDENCIES = ../libglib.la libgthread.la -+testgthread_DEPENDENCIES = ../libglib11d.la libgthread11d.la ++testgthread_DEPENDENCIES = ../libglib12.la libgthread12.la testgthread_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -134,8 +134,8 @@ - - TAR = tar - GZIP_ENV = --best --SOURCES = $(libgthread_la_SOURCES) testgthread.c --OBJECTS = $(libgthread_la_OBJECTS) testgthread.o -+SOURCES = $(libgthread11d_la_SOURCES) testgthread.c -+OBJECTS = $(libgthread11d_la_OBJECTS) testgthread.o - - all: all-redirect - .SUFFIXES: -@@ -211,8 +211,8 @@ +@@ -211,7 +211,7 @@ maintainer-clean-libtool: -libgthread.la: $(libgthread_la_OBJECTS) $(libgthread_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libgthread_la_LDFLAGS) $(libgthread_la_OBJECTS) $(libgthread_la_LIBADD) $(LIBS) -+libgthread11d.la: $(libgthread11d_la_OBJECTS) $(libgthread11d_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libgthread11d_la_LDFLAGS) $(libgthread11d_la_OBJECTS) $(libgthread11d_la_LIBADD) $(LIBS) ++libgthread12.la: $(libgthread_la_OBJECTS) $(libgthread_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libgthread_la_LDFLAGS) $(libgthread_la_OBJECTS) $(libgthread_la_LIBADD) $(LIBS) mostlyclean-noinstPROGRAMS: - @@ -291,7 +291,7 @@ install: install-am uninstall-am: uninstall-libLTLIBRARIES @@ -331,3 +241,116 @@ all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +--- docs/Makefile.in.orig Tue Mar 2 10:39:11 1999 ++++ docs/Makefile.in Tue Mar 2 10:40:18 1999 +@@ -89,9 +89,9 @@ + + info_TEXINFOS = glib.texi + +-man_MANS = glib-config.1 ++man_MANS = glib12-config.1 + +-EXTRA_DIST = glib-config.1 glib.html glib_toc.html ++EXTRA_DIST = glib12-config.1 glib.html glib_toc.html + + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +@@ -125,6 +125,8 @@ + glib.info: glib.texi + glib.dvi: glib.texi + ++glib12-config.1: glib-config.1 ++ cp glib-config.1 glib12-config.1 + + DVIPS = dvips + +--- tests/Makefile.in.orig Tue Mar 2 10:42:05 1999 ++++ tests/Makefile.in Tue Mar 2 10:42:39 1999 +@@ -94,17 +94,17 @@ + + noinst_PROGRAMS = $(TESTS) + +-array_test_LDADD = $(top_builddir)/libglib.la +-dirname_test_LDADD = $(top_builddir)/libglib.la +-hash_test_LDADD = $(top_builddir)/libglib.la +-list_test_LDADD = $(top_builddir)/libglib.la +-node_test_LDADD = $(top_builddir)/libglib.la +-relation_test_LDADD = $(top_builddir)/libglib.la +-slist_test_LDADD = $(top_builddir)/libglib.la +-string_test_LDADD = $(top_builddir)/libglib.la +-strfunc_test_LDADD = $(top_builddir)/libglib.la +-tree_test_LDADD = $(top_builddir)/libglib.la +-type_test_LDADD = $(top_builddir)/libglib.la ++array_test_LDADD = $(top_builddir)/libglib12.la ++dirname_test_LDADD = $(top_builddir)/libglib12.la ++hash_test_LDADD = $(top_builddir)/libglib12.la ++list_test_LDADD = $(top_builddir)/libglib12.la ++node_test_LDADD = $(top_builddir)/libglib12.la ++relation_test_LDADD = $(top_builddir)/libglib12.la ++slist_test_LDADD = $(top_builddir)/libglib12.la ++string_test_LDADD = $(top_builddir)/libglib12.la ++strfunc_test_LDADD = $(top_builddir)/libglib12.la ++tree_test_LDADD = $(top_builddir)/libglib12.la ++type_test_LDADD = $(top_builddir)/libglib12.la + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = +@@ -117,47 +117,47 @@ + LIBS = @LIBS@ + array_test_SOURCES = array-test.c + array_test_OBJECTS = array-test.o +-array_test_DEPENDENCIES = $(top_builddir)/libglib.la ++array_test_DEPENDENCIES = $(top_builddir)/libglib12.la + array_test_LDFLAGS = + dirname_test_SOURCES = dirname-test.c + dirname_test_OBJECTS = dirname-test.o +-dirname_test_DEPENDENCIES = $(top_builddir)/libglib.la ++dirname_test_DEPENDENCIES = $(top_builddir)/libglib12.la + dirname_test_LDFLAGS = + hash_test_SOURCES = hash-test.c + hash_test_OBJECTS = hash-test.o +-hash_test_DEPENDENCIES = $(top_builddir)/libglib.la ++hash_test_DEPENDENCIES = $(top_builddir)/libglib12.la + hash_test_LDFLAGS = + list_test_SOURCES = list-test.c + list_test_OBJECTS = list-test.o +-list_test_DEPENDENCIES = $(top_builddir)/libglib.la ++list_test_DEPENDENCIES = $(top_builddir)/libglib12.la + list_test_LDFLAGS = + node_test_SOURCES = node-test.c + node_test_OBJECTS = node-test.o +-node_test_DEPENDENCIES = $(top_builddir)/libglib.la ++node_test_DEPENDENCIES = $(top_builddir)/libglib12.la + node_test_LDFLAGS = + relation_test_SOURCES = relation-test.c + relation_test_OBJECTS = relation-test.o +-relation_test_DEPENDENCIES = $(top_builddir)/libglib.la ++relation_test_DEPENDENCIES = $(top_builddir)/libglib12.la + relation_test_LDFLAGS = + slist_test_SOURCES = slist-test.c + slist_test_OBJECTS = slist-test.o +-slist_test_DEPENDENCIES = $(top_builddir)/libglib.la ++slist_test_DEPENDENCIES = $(top_builddir)/libglib12.la + slist_test_LDFLAGS = + string_test_SOURCES = string-test.c + string_test_OBJECTS = string-test.o +-string_test_DEPENDENCIES = $(top_builddir)/libglib.la ++string_test_DEPENDENCIES = $(top_builddir)/libglib12.la + string_test_LDFLAGS = + strfunc_test_SOURCES = strfunc-test.c + strfunc_test_OBJECTS = strfunc-test.o +-strfunc_test_DEPENDENCIES = $(top_builddir)/libglib.la ++strfunc_test_DEPENDENCIES = $(top_builddir)/libglib12.la + strfunc_test_LDFLAGS = + tree_test_SOURCES = tree-test.c + tree_test_OBJECTS = tree-test.o +-tree_test_DEPENDENCIES = $(top_builddir)/libglib.la ++tree_test_DEPENDENCIES = $(top_builddir)/libglib12.la + tree_test_LDFLAGS = + type_test_SOURCES = type-test.c + type_test_OBJECTS = type-test.o +-type_test_DEPENDENCIES = $(top_builddir)/libglib.la ++type_test_DEPENDENCIES = $(top_builddir)/libglib12.la + type_test_LDFLAGS = + CFLAGS = @CFLAGS@ + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae index fcb74bc9edae..32343d705d05 100644 --- a/devel/glib20/files/patch-ae +++ b/devel/glib20/files/patch-ae @@ -9,7 +9,17 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo "configure:3765: checking for $ac_func" >&5 -@@ -5302,11 +5302,13 @@ +@@ -4610,6 +4610,9 @@ + linux*) + G_MODULE_LDFLAGS='-rdynamic' + ;; ++ freebsd*) ++ G_MODULE_LDFLAGS='-Wl,-E' ++ ;; + esac + LIBS_orig="$LIBS" + LDFLAGS_orig="$LDFLAGS" +@@ -5302,11 +5305,13 @@ G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads" fi ;; @@ -23,180 +33,12 @@ + G_THREAD_CFLAGS="-D_THREAD_SAFE -pthread" + have_poll=no + else -+ G_THREAD_CFLAGS="-D_THREAD_SAFE" ++ G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS" + fi ;; esac -@@ -5315,7 +5317,7 @@ - old_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $G_THREAD_CFLAGS" - cat > conftest.$ac_ext <<EOF --#line 5319 "configure" -+#line 5321 "configure" - #include "confdefs.h" - #include <time.h> - EOF -@@ -5332,7 +5334,7 @@ - CPPFLAGS=$old_CPPFLAGS - - echo $ac_n "checking necessary compiler options""... $ac_c" 1>&6 --echo "configure:5336: checking necessary compiler options" >&5 -+echo "configure:5338: checking necessary compiler options" >&5 - - echo "$ac_t""$G_THREAD_CFLAGS" 1>&6 - else -@@ -5350,12 +5352,12 @@ - for ac_func in localtime_r rand_r - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5354: checking for $ac_func" >&5 -+echo "configure:5356: checking for $ac_func" >&5 - 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 --#line 5359 "configure" -+#line 5361 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -5378,7 +5380,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:5382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -5404,7 +5406,7 @@ - - if test "$ac_cv_header_pwd_h" = "yes"; then - echo $ac_n "checking for getpwuid_r""... $ac_c" 1>&6 --echo "configure:5408: checking for getpwuid_r" >&5 -+echo "configure:5410: checking for getpwuid_r" >&5 - if eval "test \"`echo '$''{'ac_cv_func_getpwuid_r'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5412,7 +5414,7 @@ - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <<EOF --#line 5416 "configure" -+#line 5418 "configure" - #include "confdefs.h" - #include <errno.h> - int main () { char buffer[10000], *pointer; -@@ -5423,7 +5425,7 @@ - sizeof (buffer), &pointer); - return errno == ENOSYS;} - EOF --if { (eval echo configure:5427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:5429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_func_getpwuid_r=yes - else -@@ -5448,20 +5450,20 @@ - fi - if test "$ac_cv_func_getpwuid_r" = "yes"; then - echo $ac_n "checking whether getpwuid_r is posix like""... $ac_c" 1>&6 --echo "configure:5452: checking whether getpwuid_r is posix like" >&5 -+echo "configure:5454: checking whether getpwuid_r is posix like" >&5 - # getpwuid_r(0, NULL, NULL, 0) is the signature on - # solaris, if that is not found, the prog below won't - # compile, then the posix signature is assumed as - # the default. - cat > conftest.$ac_ext <<EOF --#line 5458 "configure" -+#line 5460 "configure" - #include "confdefs.h" - #include <pwd.h> - int main() { - getpwuid_r(0, NULL, NULL, 0); - ; return 0; } - EOF --if { (eval echo configure:5465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""no" 1>&6 - else -@@ -5479,17 +5481,17 @@ - fi - if test x"$have_threads" = xposix; then - echo $ac_n "checking whether pthread_getspecific is posix like""... $ac_c" 1>&6 --echo "configure:5483: checking whether pthread_getspecific is posix like" >&5 -+echo "configure:5485: checking whether pthread_getspecific is posix like" >&5 - # PCThreads has pthread_getspecific(pthread_key_t, void **); - cat > conftest.$ac_ext <<EOF --#line 5486 "configure" -+#line 5488 "configure" - #include "confdefs.h" - #include <pthread.h> - int main() { - pthread_getspecific(0,NULL); - ; return 0; } - EOF --if { (eval echo configure:5493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""no" 1>&6 - else -@@ -5530,7 +5532,7 @@ - case "$mutex_has_default" in - "yes") - echo $ac_n "checking size of $mutex_default_type""... $ac_c" 1>&6 --echo "configure:5534: checking size of $mutex_default_type" >&5 -+echo "configure:5536: checking size of $mutex_default_type" >&5 - if eval "test \"`echo '$''{'glib_cv_sizeof_gmutex'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5538,7 +5540,7 @@ - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <<EOF --#line 5542 "configure" -+#line 5544 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <$mutex_header_file> -@@ -5550,7 +5552,7 @@ - exit(0); - } - EOF --if { (eval echo configure:5554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:5556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - glib_cv_sizeof_gmutex=`cat conftestval` - else -@@ -5570,7 +5572,7 @@ - - - echo $ac_n "checking byte contents of $mutex_default_type""... $ac_c" 1>&6 --echo "configure:5574: checking byte contents of $mutex_default_type" >&5 -+echo "configure:5576: checking byte contents of $mutex_default_type" >&5 - if eval "test \"`echo '$''{'glib_cv_byte_contents_gmutex'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5578,7 +5580,7 @@ - glib_cv_byte_contents_gmutex=0 - else - cat > conftest.$ac_ext <<EOF --#line 5582 "configure" -+#line 5584 "configure" - #include "confdefs.h" - #include <stdio.h> - #include <$mutex_header_file> -@@ -5595,7 +5597,7 @@ - exit(0); - } - EOF --if { (eval echo configure:5599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:5601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - glib_cv_byte_contents_gmutex=`cat conftestval` - else -@@ -5623,6 +5625,63 @@ +@@ -5623,6 +5628,63 @@ @@ -204,12 +46,12 @@ + for ac_func in poll +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:5633: checking for $ac_func" >&5 ++echo "configure:5636: checking for $ac_func" >&5 +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 -+#line 5638 "configure" ++#line 5641 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ @@ -232,7 +74,7 @@ + +; return 0; } +EOF -+if { (eval echo configure:5661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else @@ -260,26 +102,3 @@ glib_sysdefso="glibconfig-sysdefs.h" glib_sysdef_msg=`echo POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32 | sed 's/:[^ ]*//g'` if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then -@@ -5631,7 +5690,7 @@ - glib_nl='\n' - fi - echo $ac_n "checking system definitions for $glib_sysdef_msg""... $ac_c" 1>&6 --echo "configure:5635: checking system definitions for $glib_sysdef_msg" >&5 -+echo "configure:5694: checking system definitions for $glib_sysdef_msg" >&5 - cat >confrun.c <<_______EOF - #include <stdio.h> - #include <sys/types.h> -@@ -5658,11 +5717,11 @@ - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <<EOF --#line 5662 "configure" -+#line 5721 "configure" - #include "confdefs.h" - `cat confrun.c` - EOF --if { (eval echo configure:5666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:5725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - echo "$ac_t""done" 1>&6 - else diff --git a/devel/glib20/pkg-descr b/devel/glib20/pkg-descr index 469154423427..65e7944cba86 100644 --- a/devel/glib20/pkg-descr +++ b/devel/glib20/pkg-descr @@ -1,10 +1,7 @@ -This is GLib version 1.1. GLib, is a library which includes support +This is GLib version 1.2. GLib, is a library which includes support routines for C such as lists, trees, hashes, memory allocation, and many other things. -Versions of GLib prior to 1.1.0 are distributed with GTK+ versions 1.1.0 -and earlier. - The official ftp site is: ftp://ftp.gtk.org/pub/gtk diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index a2c5ff7fd2f2..85ba872ce363 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -1,24 +1,24 @@ -bin/glib11d-config -include/glib11d/glib.h -include/glib11d/glibconfig.h -include/glib11d/gmodule.h +bin/glib12-config +include/glib12/glib.h +include/glib12/glibconfig.h +include/glib12/gmodule.h @unexec install-info --delete %D/info/glib.info %D/info/dir info/glib.info @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/glib.info %D/info/dir -lib/libglib11d.a -lib/libglib11d.la -lib/libglib11d.so -lib/libglib11d.so.2.1 -lib/libgmodule11d.a -lib/libgmodule11d.la -lib/libgmodule11d.so -lib/libgmodule11d.so.2.1 -lib/libgthread11d.a -lib/libgthread11d.la -lib/libgthread11d.so -lib/libgthread11d.so.2.1 +lib/libglib12.a +lib/libglib12.la +lib/libglib12.so +lib/libglib12.so.1 +lib/libgmodule12.a +lib/libgmodule12.la +lib/libgmodule12.so +lib/libgmodule12.so.1 +lib/libgthread12.a +lib/libgthread12.la +lib/libgthread12.so +lib/libgthread12.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/aclocal/glib.m4 -@dirrm include/glib11d +@dirrm include/glib12 diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index 5ec60bc94737..20c8a4d1930d 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -1,15 +1,15 @@ # New ports collection makefile for: libgtop -# Version required: 0.99.8 +# Version required: 1.0.1 # Date Created: 26 Sep 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.15 1999/02/18 18:56:34 vanilla Exp $ +# $Id: Makefile,v 1.16 1999/02/25 01:17:23 asami Exp $ # -DISTNAME= libgtop-0.99.8 +DISTNAME= libgtop-1.0.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= libgtop +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com @@ -17,13 +17,14 @@ LIB_DEPENDS= gnome.1:${PORTSDIR}/x11/gnomelibs \ guile.4:${PORTSDIR}/lang/guile # implicit dependencies: -# gettext, glib11-devel +# gettext, glib12 +USE_PERL5= yes +USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ + GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" -USE_GMAKE= yes post-install: @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo index 896262b866c9..b94d8e687186 100644 --- a/devel/libgtop/distinfo +++ b/devel/libgtop/distinfo @@ -1 +1 @@ -MD5 (libgtop-0.99.8.tar.gz) = 3cae59e8e94912483373561abf4937c4 +MD5 (libgtop-1.0.1.tar.gz) = f9b1c3c6f6eb178016a5213ab43a0219 diff --git a/devel/libgtop/files/patch-ab b/devel/libgtop/files/patch-ab index 54c2bf09c267..54222f5d5c89 100644 --- a/devel/libgtop/files/patch-ab +++ b/devel/libgtop/files/patch-ab @@ -1,99 +1,16 @@ --- lib/Makefile.in.orig Wed Jan 6 03:54:31 1999 -+++ lib/Makefile.in Thu Jan 7 21:47:02 1999 -@@ -129,7 +129,7 @@ - LT_CURRENT = @LT_CURRENT@ - LT_RELEASE = @LT_RELEASE@ - LT_REVISION = @LT_REVISION@ --LT_VERSION_INFO = @LT_VERSION_INFO@ -+LT_VERSION_INFO = -version-info 1:0:0 - MAKEINFO = @MAKEINFO@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - NM = @NM@ ---- sysdeps/common/Makefile.in.orig Wed Jan 6 03:53:49 1999 -+++ sysdeps/common/Makefile.in Thu Jan 7 21:47:02 1999 -@@ -129,7 +129,7 @@ - LT_CURRENT = @LT_CURRENT@ - LT_RELEASE = @LT_RELEASE@ - LT_REVISION = @LT_REVISION@ --LT_VERSION_INFO = @LT_VERSION_INFO@ -+LT_VERSION_INFO = -version-info 1:0:0 - MAKEINFO = @MAKEINFO@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - NM = @NM@ ---- sysdeps/freebsd/Makefile.in.orig Wed Jan 6 03:54:24 1999 -+++ sysdeps/freebsd/Makefile.in Thu Jan 7 21:47:02 1999 -@@ -129,7 +129,7 @@ - LT_CURRENT = @LT_CURRENT@ - LT_RELEASE = @LT_RELEASE@ - LT_REVISION = @LT_REVISION@ --LT_VERSION_INFO = @LT_VERSION_INFO@ -+LT_VERSION_INFO = -version-info 1:0:0 - MAKEINFO = @MAKEINFO@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - NM = @NM@ ---- sysdeps/names/Makefile.in.orig Wed Jan 6 03:54:09 1999 -+++ sysdeps/names/Makefile.in Thu Jan 7 21:47:02 1999 -@@ -129,7 +129,7 @@ - LT_CURRENT = @LT_CURRENT@ - LT_RELEASE = @LT_RELEASE@ - LT_REVISION = @LT_REVISION@ --LT_VERSION_INFO = @LT_VERSION_INFO@ -+LT_VERSION_INFO = -version-info 1:0:0 - MAKEINFO = @MAKEINFO@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - NM = @NM@ ---- sysdeps/guile/Makefile.in.orig Fri Jan 8 11:23:00 1999 -+++ sysdeps/guile/Makefile.in Fri Jan 8 11:26:57 1999 -@@ -126,9 +126,9 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - LT_AGE = @LT_AGE@ --LT_CURRENT = @LT_CURRENT@ --LT_RELEASE = @LT_RELEASE@ --LT_REVISION = @LT_REVISION@ -+LT_CURRENT = 1 -+LT_RELEASE = 0 -+LT_REVISION = 0 - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAKEINFO = @MAKEINFO@ - MKINSTALLDIRS = @MKINSTALLDIRS@ ---- sysdeps/guile/names/Makefile.in.orig Wed Jan 6 03:54:02 1999 -+++ sysdeps/guile/names/Makefile.in Fri Jan 8 11:27:22 1999 -@@ -126,9 +126,9 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - LT_AGE = @LT_AGE@ --LT_CURRENT = @LT_CURRENT@ --LT_RELEASE = @LT_RELEASE@ --LT_REVISION = @LT_REVISION@ -+LT_CURRENT = 1 -+LT_RELEASE = 0 -+LT_REVISION = 0 - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAKEINFO = @MAKEINFO@ - MKINSTALLDIRS = @MKINSTALLDIRS@ ---- po/Makefile.in.in.orig Wed Jan 6 03:50:44 1999 -+++ po/Makefile.in.in Thu Jan 7 21:47:02 1999 -@@ -18,7 +18,7 @@ +--- src/daemon/Makefile.in.orig Tue Mar 2 18:48:38 1999 ++++ src/daemon/Makefile.in Tue Mar 2 18:49:07 1999 +@@ -191,7 +191,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 ---- Makefile.in.orig Wed Feb 17 18:34:29 1999 -+++ Makefile.in Fri Feb 19 01:58:32 1999 -@@ -174,7 +174,7 @@ - - @BUILD_GNOME_SUPPORT_TRUE@support = support --SUBDIRS = po intl $(support) macros misc include sysdeps lib src $(examples_SUBDIRS) -+SUBDIRS = po intl macros misc include sysdeps lib src + libgtop_server_SOURCES = server.c slave.c io.c version.c daemon.h +-libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la $(top_builddir)/sysdeps/common/libgtop_suid_common.la @LIBSUPPORT@ ++libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la $(top_builddir)/sysdeps/common/libgtop_suid_common.la @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@ - include_HEADERS = glibtop.h + EXTRA_DIST = server_config.h.in server_config.pl +--- Makefile.in.orig Wed Feb 17 18:34:29 1999 ++++ Makefile.in Fri Feb 19 01:58:32 1999 @@ -182,7 +182,7 @@ EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt libgtopConf.sh.in LIBGTOP-VERSION features.def libgtop-config.in RELNOTES-0.25 RELNOTES-1.0 libgtop-sysdeps.m4 ANNOUNCE-0.25 ANNOUNCE-1.0 README NEWS.old libgtop-mirror.sh diff --git a/devel/libgtop/files/patch-ac b/devel/libgtop/files/patch-ac index aa98d434341a..4669680a3127 100644 --- a/devel/libgtop/files/patch-ac +++ b/devel/libgtop/files/patch-ac @@ -1,21 +1,24 @@ ---- configure.orig Tue Feb 16 22:50:48 1999 -+++ configure Fri Feb 19 02:02:47 1999 -@@ -2982,13 +2982,13 @@ - fi - - if test "$no_gnome_config" = "yes"; then -- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 --echo "configure:2987: checking for gnomeConf.sh file in $gnome_prefix" >&5 -- if test -f $gnome_prefix/gnomeConf.sh; then -+ echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6 -+echo "configure:2987: checking for gnomeConf.sh file in $prefix/share/gnome" >&5 -+ if test -f $prefix/share/gnome/gnomeConf.sh; then - echo "$ac_t""found" 1>&6 - echo "loading gnome configuration from" \ -- "$gnome_prefix/gnomeConf.sh" -- . $gnome_prefix/gnomeConf.sh -+ "$prefix/share/gnome/gnomeConf.sh" -+ . $prefix/share/gnome/gnomeConf.sh - gnome_found=yes - else - echo "$ac_t""not found" 1>&6 +--- configure.orig Sun Feb 28 13:10:54 1999 ++++ configure Tue Mar 2 18:33:43 1999 +@@ -965,9 +965,9 @@ + + # libtool versioning + LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION +-LT_CURRENT=`expr $LIBGTOP_MICRO_VERSION - $LIBGTOP_INTERFACE_AGE` +-LT_REVISION=$LIBGTOP_INTERFACE_AGE +-LT_AGE=`expr $LIBGTOP_BINARY_AGE - $LIBGTOP_INTERFACE_AGE` ++LT_CURRENT=1 ++LT_REVISION=0 ++LT_AGE=0 + LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}' + + +@@ -7698,7 +7698,7 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + CATOBJEXT=.mo +- DATADIRNAME=lib ++ DATADIRNAME=share + fi + rm -f conftest* + INSTOBJEXT=.mo diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index 5ec60bc94737..20c8a4d1930d 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -1,15 +1,15 @@ # New ports collection makefile for: libgtop -# Version required: 0.99.8 +# Version required: 1.0.1 # Date Created: 26 Sep 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.15 1999/02/18 18:56:34 vanilla Exp $ +# $Id: Makefile,v 1.16 1999/02/25 01:17:23 asami Exp $ # -DISTNAME= libgtop-0.99.8 +DISTNAME= libgtop-1.0.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= libgtop +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com @@ -17,13 +17,14 @@ LIB_DEPENDS= gnome.1:${PORTSDIR}/x11/gnomelibs \ guile.4:${PORTSDIR}/lang/guile # implicit dependencies: -# gettext, glib11-devel +# gettext, glib12 +USE_PERL5= yes +USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ + GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" -USE_GMAKE= yes post-install: @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo index 896262b866c9..b94d8e687186 100644 --- a/devel/libgtop2/distinfo +++ b/devel/libgtop2/distinfo @@ -1 +1 @@ -MD5 (libgtop-0.99.8.tar.gz) = 3cae59e8e94912483373561abf4937c4 +MD5 (libgtop-1.0.1.tar.gz) = f9b1c3c6f6eb178016a5213ab43a0219 diff --git a/devel/libgtop2/files/patch-ab b/devel/libgtop2/files/patch-ab index 54c2bf09c267..54222f5d5c89 100644 --- a/devel/libgtop2/files/patch-ab +++ b/devel/libgtop2/files/patch-ab @@ -1,99 +1,16 @@ --- lib/Makefile.in.orig Wed Jan 6 03:54:31 1999 -+++ lib/Makefile.in Thu Jan 7 21:47:02 1999 -@@ -129,7 +129,7 @@ - LT_CURRENT = @LT_CURRENT@ - LT_RELEASE = @LT_RELEASE@ - LT_REVISION = @LT_REVISION@ --LT_VERSION_INFO = @LT_VERSION_INFO@ -+LT_VERSION_INFO = -version-info 1:0:0 - MAKEINFO = @MAKEINFO@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - NM = @NM@ ---- sysdeps/common/Makefile.in.orig Wed Jan 6 03:53:49 1999 -+++ sysdeps/common/Makefile.in Thu Jan 7 21:47:02 1999 -@@ -129,7 +129,7 @@ - LT_CURRENT = @LT_CURRENT@ - LT_RELEASE = @LT_RELEASE@ - LT_REVISION = @LT_REVISION@ --LT_VERSION_INFO = @LT_VERSION_INFO@ -+LT_VERSION_INFO = -version-info 1:0:0 - MAKEINFO = @MAKEINFO@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - NM = @NM@ ---- sysdeps/freebsd/Makefile.in.orig Wed Jan 6 03:54:24 1999 -+++ sysdeps/freebsd/Makefile.in Thu Jan 7 21:47:02 1999 -@@ -129,7 +129,7 @@ - LT_CURRENT = @LT_CURRENT@ - LT_RELEASE = @LT_RELEASE@ - LT_REVISION = @LT_REVISION@ --LT_VERSION_INFO = @LT_VERSION_INFO@ -+LT_VERSION_INFO = -version-info 1:0:0 - MAKEINFO = @MAKEINFO@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - NM = @NM@ ---- sysdeps/names/Makefile.in.orig Wed Jan 6 03:54:09 1999 -+++ sysdeps/names/Makefile.in Thu Jan 7 21:47:02 1999 -@@ -129,7 +129,7 @@ - LT_CURRENT = @LT_CURRENT@ - LT_RELEASE = @LT_RELEASE@ - LT_REVISION = @LT_REVISION@ --LT_VERSION_INFO = @LT_VERSION_INFO@ -+LT_VERSION_INFO = -version-info 1:0:0 - MAKEINFO = @MAKEINFO@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - NM = @NM@ ---- sysdeps/guile/Makefile.in.orig Fri Jan 8 11:23:00 1999 -+++ sysdeps/guile/Makefile.in Fri Jan 8 11:26:57 1999 -@@ -126,9 +126,9 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - LT_AGE = @LT_AGE@ --LT_CURRENT = @LT_CURRENT@ --LT_RELEASE = @LT_RELEASE@ --LT_REVISION = @LT_REVISION@ -+LT_CURRENT = 1 -+LT_RELEASE = 0 -+LT_REVISION = 0 - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAKEINFO = @MAKEINFO@ - MKINSTALLDIRS = @MKINSTALLDIRS@ ---- sysdeps/guile/names/Makefile.in.orig Wed Jan 6 03:54:02 1999 -+++ sysdeps/guile/names/Makefile.in Fri Jan 8 11:27:22 1999 -@@ -126,9 +126,9 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - LT_AGE = @LT_AGE@ --LT_CURRENT = @LT_CURRENT@ --LT_RELEASE = @LT_RELEASE@ --LT_REVISION = @LT_REVISION@ -+LT_CURRENT = 1 -+LT_RELEASE = 0 -+LT_REVISION = 0 - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAKEINFO = @MAKEINFO@ - MKINSTALLDIRS = @MKINSTALLDIRS@ ---- po/Makefile.in.in.orig Wed Jan 6 03:50:44 1999 -+++ po/Makefile.in.in Thu Jan 7 21:47:02 1999 -@@ -18,7 +18,7 @@ +--- src/daemon/Makefile.in.orig Tue Mar 2 18:48:38 1999 ++++ src/daemon/Makefile.in Tue Mar 2 18:49:07 1999 +@@ -191,7 +191,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 ---- Makefile.in.orig Wed Feb 17 18:34:29 1999 -+++ Makefile.in Fri Feb 19 01:58:32 1999 -@@ -174,7 +174,7 @@ - - @BUILD_GNOME_SUPPORT_TRUE@support = support --SUBDIRS = po intl $(support) macros misc include sysdeps lib src $(examples_SUBDIRS) -+SUBDIRS = po intl macros misc include sysdeps lib src + libgtop_server_SOURCES = server.c slave.c io.c version.c daemon.h +-libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la $(top_builddir)/sysdeps/common/libgtop_suid_common.la @LIBSUPPORT@ ++libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la $(top_builddir)/sysdeps/common/libgtop_suid_common.la @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@ - include_HEADERS = glibtop.h + EXTRA_DIST = server_config.h.in server_config.pl +--- Makefile.in.orig Wed Feb 17 18:34:29 1999 ++++ Makefile.in Fri Feb 19 01:58:32 1999 @@ -182,7 +182,7 @@ EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt libgtopConf.sh.in LIBGTOP-VERSION features.def libgtop-config.in RELNOTES-0.25 RELNOTES-1.0 libgtop-sysdeps.m4 ANNOUNCE-0.25 ANNOUNCE-1.0 README NEWS.old libgtop-mirror.sh diff --git a/devel/libgtop2/files/patch-ac b/devel/libgtop2/files/patch-ac index aa98d434341a..4669680a3127 100644 --- a/devel/libgtop2/files/patch-ac +++ b/devel/libgtop2/files/patch-ac @@ -1,21 +1,24 @@ ---- configure.orig Tue Feb 16 22:50:48 1999 -+++ configure Fri Feb 19 02:02:47 1999 -@@ -2982,13 +2982,13 @@ - fi - - if test "$no_gnome_config" = "yes"; then -- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 --echo "configure:2987: checking for gnomeConf.sh file in $gnome_prefix" >&5 -- if test -f $gnome_prefix/gnomeConf.sh; then -+ echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6 -+echo "configure:2987: checking for gnomeConf.sh file in $prefix/share/gnome" >&5 -+ if test -f $prefix/share/gnome/gnomeConf.sh; then - echo "$ac_t""found" 1>&6 - echo "loading gnome configuration from" \ -- "$gnome_prefix/gnomeConf.sh" -- . $gnome_prefix/gnomeConf.sh -+ "$prefix/share/gnome/gnomeConf.sh" -+ . $prefix/share/gnome/gnomeConf.sh - gnome_found=yes - else - echo "$ac_t""not found" 1>&6 +--- configure.orig Sun Feb 28 13:10:54 1999 ++++ configure Tue Mar 2 18:33:43 1999 +@@ -965,9 +965,9 @@ + + # libtool versioning + LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION +-LT_CURRENT=`expr $LIBGTOP_MICRO_VERSION - $LIBGTOP_INTERFACE_AGE` +-LT_REVISION=$LIBGTOP_INTERFACE_AGE +-LT_AGE=`expr $LIBGTOP_BINARY_AGE - $LIBGTOP_INTERFACE_AGE` ++LT_CURRENT=1 ++LT_REVISION=0 ++LT_AGE=0 + LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}' + + +@@ -7698,7 +7698,7 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + CATOBJEXT=.mo +- DATADIRNAME=lib ++ DATADIRNAME=share + fi + rm -f conftest* + INSTOBJEXT=.mo diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index 6686ad0c71e5..3d41cefdec38 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: gnomegames -# Version required: 0.99.8 +# Version required: 1.0.1 # Date created: 03 July 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.12 1999/02/02 13:01:33 vanilla Exp $ +# $Id: Makefile,v 1.13 1999/02/24 22:09:22 vanilla Exp $ # -DISTNAME= gnome-games-0.99.8 -PKGNAME= gnomegames-0.99.8 +DISTNAME= gnome-games-1.0.1 +PKGNAME= gnomegames-1.0.1 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-games +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com @@ -24,7 +24,7 @@ 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/gtk11d-config" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo index 6fd23676236f..1aa47351f807 100644 --- a/games/gnome-games/distinfo +++ b/games/gnome-games/distinfo @@ -1 +1 @@ -MD5 (gnome-games-0.99.8.tar.gz) = c54271158b7b440539c8334793734f2e +MD5 (gnome-games-1.0.1.tar.gz) = 4bd48e4912eb8eb52226fcb713351de6 diff --git a/games/gnome-games/files/patch-ab b/games/gnome-games/files/patch-ab index 7dc73811102f..de972c331051 100644 --- a/games/gnome-games/files/patch-ab +++ b/games/gnome-games/files/patch-ab @@ -1,50 +1,78 @@ ---- aisleriot/Makefile.in.orig Mon Feb 15 13:57:56 1999 -+++ aisleriot/Makefile.in Fri Feb 19 13:24:41 1999 -@@ -130,7 +130,7 @@ +--- aisleriot/Makefile.in.orig Mon Mar 1 02:50:59 1999 ++++ aisleriot/Makefile.in Wed Mar 3 00:00:04 1999 +@@ -126,12 +126,12 @@ + scoredir = $(localstatedir)/games + cardimagedir = $(datadir)/pixmaps/cards + icondir = $(datadir)/pixmaps +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games + typesdir = $(datadir)/sol-games - SUBDIRS = docs pixmaps +-SUBDIRS = docs pixmaps ++SUBDIRS = pixmaps -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = sol ---- aisleriot/docs/Makefile.in.orig Mon Feb 15 13:58:07 1999 -+++ aisleriot/docs/Makefile.in Fri Feb 19 13:24:41 1999 -@@ -128,7 +128,7 @@ - XPM_LIBS = @XPM_LIBS@ +@@ -152,7 +152,7 @@ + EXTRA_DIST = TODO FIXME AUTHORS $(types_DATA) $(cardimage_DATA) $(icon_DATA) sol.desktop SCHEME_GAMES.h + + +-sysdir = $(datadir)/gnome/apps/Games ++sysdir = $(datadir)/apps/Games + sys_DATA = sol.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +--- aisleriot/docs/Makefile.in.orig Mon Mar 1 02:51:00 1999 ++++ aisleriot/docs/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -129,7 +129,7 @@ + ZVT_LIBS = @ZVT_LIBS@ l = @l@ -helpdir = $(datadir)/gnome/help/aisleriot/C +helpdir = $(datadir)/help/aisleriot/C - help_DATA = index.html intro.html glossary.html gpl.html camelot.html canfield.html clock.html doublets.html eagle-wing.html fortunes.html klondike.html pileon.html neighbor.html odessa.html osmosis.html spider.html yukon.html beleaguered-castle.html camelot-goal.gif clock-rules.gif docbook.css topic.dat + help_DATA = index.html intro.html glossary.html gpl.html camelot.html canfield.html clock.html doublets.html eagle-wing.html elevator.html fortunes.html klondike.html fourteen.html pileon.html auld-lang-syne.html hopscotch.html neighbor.html odessa.html osmosis.html spider.html yukon.html beleaguered-castle.html thirteen.html thieves.html freecell.html bristol.html camelot-goal.gif clock-rules.gif docbook.css topic.dat ---- freecell/src/Makefile.in.orig Mon Feb 15 13:57:16 1999 -+++ freecell/src/Makefile.in Fri Feb 19 13:24:41 1999 -@@ -124,7 +124,7 @@ +--- freecell/src/Makefile.in.orig Mon Mar 1 02:50:27 1999 ++++ freecell/src/Makefile.in Wed Mar 3 00:01:13 1999 +@@ -123,9 +123,9 @@ + ZVT_LIBS = @ZVT_LIBS@ + l = @l@ - Gamesdir = $(datadir)/apps/Games +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I$(srcdir)/../gdk-card-image +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I$(srcdir)/../gdk-card-image bin_PROGRAMS = freecell ---- gnibbles/Makefile.in.orig Sun Feb 21 03:28:13 1999 -+++ gnibbles/Makefile.in Sun Feb 21 03:28:33 1999 -@@ -128,7 +128,7 @@ +--- gnibbles/Makefile.in.orig Mon Mar 1 02:51:08 1999 ++++ gnibbles/Makefile.in Wed Mar 3 00:00:39 1999 +@@ -127,10 +127,10 @@ + configdir = $(datadir)/gnibbles + appicondir = $(datadir)/pixmaps soundlistdir = $(sysconfdir)/sound/events - Gamesdir = $(datadir)/apps/Games +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games + scoredir = $(localstatedir)/games -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = gnibbles ---- gnobots/Makefile.in.orig Mon Feb 15 13:57:38 1999 -+++ gnobots/Makefile.in Fri Feb 19 13:24:41 1999 -@@ -129,7 +129,7 @@ +--- gnobots/Makefile.in.orig Mon Mar 1 02:50:42 1999 ++++ gnobots/Makefile.in Wed Mar 3 00:00:54 1999 +@@ -126,11 +126,11 @@ + scoredir = $(localstatedir)/games + pixmapdir = $(datadir)/pixmaps/gnobots + appicondir = $(datadir)/pixmaps +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games SUBDIRS = help @@ -53,9 +81,9 @@ bin_PROGRAMS = gnobots ---- gnobots/help/C/Makefile.in.orig Mon Feb 15 13:57:40 1999 -+++ gnobots/help/C/Makefile.in Fri Feb 19 13:24:41 1999 -@@ -125,7 +125,7 @@ +--- gnobots/help/C/Makefile.in.orig Mon Mar 1 02:50:44 1999 ++++ gnobots/help/C/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -126,7 +126,7 @@ EXTRA_DIST = index.html topic.dat @@ -64,9 +92,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- gnobots/help/es/Makefile.in.orig Mon Feb 15 13:57:41 1999 -+++ gnobots/help/es/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -125,7 +125,7 @@ +--- gnobots/help/es/Makefile.in.orig Mon Mar 1 02:50:45 1999 ++++ gnobots/help/es/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -126,7 +126,7 @@ EXTRA_DIST = index.html topic.dat @@ -75,9 +103,14 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- gnobots2/Makefile.in.orig Mon Feb 15 13:57:43 1999 -+++ gnobots2/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -132,7 +132,7 @@ +--- gnobots2/Makefile.in.orig Mon Mar 1 02:50:46 1999 ++++ gnobots2/Makefile.in Wed Mar 3 00:00:36 1999 +@@ -129,11 +129,11 @@ + soundlistdir = $(sysconfdir)/sound/events + sounddir = $(datadir)/sounds/gnobots2 + appicondir = $(datadir)/pixmaps +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games SUBDIRS = help @@ -86,9 +119,9 @@ bin_PROGRAMS = gnobots2 ---- gnobots2/help/C/Makefile.in.orig Mon Feb 15 13:57:45 1999 -+++ gnobots2/help/C/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -125,7 +125,7 @@ +--- gnobots2/help/C/Makefile.in.orig Mon Mar 1 02:50:49 1999 ++++ gnobots2/help/C/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -126,7 +126,7 @@ EXTRA_DIST = index.html topic.dat @@ -97,9 +130,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- gnobots2/help/es/Makefile.in.orig Mon Feb 15 13:57:46 1999 -+++ gnobots2/help/es/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -125,7 +125,7 @@ +--- gnobots2/help/es/Makefile.in.orig Mon Mar 1 02:50:50 1999 ++++ gnobots2/help/es/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -126,7 +126,7 @@ EXTRA_DIST = index.html topic.dat @@ -108,9 +141,15 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- gnome-stones/Makefile.in.orig Mon Feb 15 13:57:53 1999 -+++ gnome-stones/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -129,7 +129,7 @@ +--- gnome-stones/Makefile.in.orig Mon Mar 1 02:50:55 1999 ++++ gnome-stones/Makefile.in Wed Mar 3 00:33:00 1999 +@@ -125,12 +125,12 @@ + + SUBDIRS = objects graphics + +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games + scoredir = $(localstatedir)/games Pixmapdir = $(datadir)/pixmaps Cavesdir = $(datadir)/gnome-stones @@ -119,9 +158,18 @@ bin_PROGRAMS = gnome-stones ---- gnome-stones/objects/Makefile.in.orig Mon Feb 15 13:57:54 1999 -+++ gnome-stones/objects/Makefile.in Sun Feb 21 04:22:07 1999 -@@ -124,9 +124,9 @@ +@@ -145,7 +145,7 @@ + Games_DATA = gnome-stones.desktop + Caves_DATA = default.caves tutorial.caves gnomekoban.caves + +-gtkrcdir = $(datadir) ++gtkrcdir = $(datadir)/gnome-stones + gtkrc_DATA = gnome-stonesrc gnome-stonesrc.ko + + EXTRA_DIST = $(Pixmap_DATA) $(Games_DATA) $(Caves_DATA) $(gtkrc_DATA) TODO README +--- gnome-stones/objects/Makefile.in.orig Mon Mar 1 02:50:56 1999 ++++ gnome-stones/objects/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -125,9 +125,9 @@ GSTONES_SRC_DIR = $(srcdir)/../ @@ -133,7 +181,7 @@ object_LTLIBRARIES = libgnome-stones.la libgnomekoban.la -@@ -141,10 +141,10 @@ +@@ -142,10 +142,10 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../.. LIBS = @LIBS@ @@ -146,32 +194,42 @@ libgnomekoban_la_LIBADD = libgnomekoban_la_OBJECTS = gnomekoban.lo COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ---- gnometris/Makefile.in.orig Mon Feb 15 13:58:10 1999 -+++ gnometris/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -126,7 +126,7 @@ +--- gnometris/Makefile.in.orig Mon Mar 1 02:51:03 1999 ++++ gnometris/Makefile.in Wed Mar 3 00:00:33 1999 +@@ -125,9 +125,9 @@ + + SUBDIRS = pix scoredir = $(localstatedir)/games - Gamesdir = $(datadir)/apps/Games +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) bin_PROGRAMS = gnometris ---- gnomine/Makefile.in.orig Mon Feb 15 13:57:17 1999 -+++ gnomine/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -125,7 +125,7 @@ +--- gnomine/Makefile.in.orig Mon Mar 1 02:50:28 1999 ++++ gnomine/Makefile.in Wed Mar 3 00:00:48 1999 +@@ -124,9 +124,9 @@ + l = @l@ + scoredir = $(localstatedir)/games - Gamesdir = $(datadir)/apps/Games +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = gnomine ---- gnothello/Makefile.in.orig Mon Feb 15 13:57:49 1999 -+++ gnothello/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -127,7 +127,7 @@ - Gamesdir = $(datadir)/apps/Games +--- gnothello/Makefile.in.orig Mon Mar 1 02:50:51 1999 ++++ gnothello/Makefile.in Wed Mar 3 00:00:29 1999 +@@ -125,10 +125,10 @@ + + scoredir = $(localstatedir)/games + pixmapdir = $(datadir)/pixmaps/iagno +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games appicondir = $(datadir)/pixmaps -INCLUDES = -DHAVE_ORBIT -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I. @@ -179,26 +237,31 @@ bin_PROGRAMS = iagno ---- gnotravex/Makefile.in.orig Mon Feb 15 13:57:51 1999 -+++ gnotravex/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -126,7 +126,7 @@ +--- gnotravex/Makefile.in.orig Mon Mar 1 02:50:54 1999 ++++ gnotravex/Makefile.in Wed Mar 3 00:00:45 1999 +@@ -125,9 +125,9 @@ + + scoredir = $(localstatedir)/games pixmapdir = $(datadir)/pixmaps/gnotravex - Gamesdir = $(datadir)/apps/Games +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = gnotravex ---- gturing/Makefile.in.orig Mon Feb 15 13:57:32 1999 -+++ gturing/Makefile.in Sun Feb 21 04:24:15 1999 -@@ -122,12 +122,10 @@ - XPM_LIBS = @XPM_LIBS@ +--- gturing/Makefile.in.orig Mon Mar 1 02:50:36 1999 ++++ gturing/Makefile.in Wed Mar 3 00:00:25 1999 +@@ -124,12 +124,12 @@ + ZVT_LIBS = @ZVT_LIBS@ l = @l@ -SUBDIRS = help -- - Gamesdir = $(datadir)/apps/Games ++# SUBDIRS = help + +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games examplesdir = $(datadir)/gturing/examples -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" -DGTURING_EXAMPLES_DIR=\""$(examplesdir)"\" @@ -206,9 +269,26 @@ bin_PROGRAMS = gturing ---- gyahtzee/Makefile.in.orig Mon Feb 15 13:57:35 1999 -+++ gyahtzee/Makefile.in Sun Feb 21 04:25:11 1999 -@@ -127,12 +127,12 @@ +--- gturing/help/C/Makefile.in.orig Mon Mar 1 02:50:38 1999 ++++ gturing/help/C/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -123,7 +123,7 @@ + ZVT_LIBS = @ZVT_LIBS@ + l = @l@ + +-gturing_helpdir = $(datadir)/gnome/help/gturing/C ++gturing_helpdir = $(datadir)/help/gturing/C + + gturing_help_DATA = index.html topic.dat + +--- gyahtzee/Makefile.in.orig Mon Mar 1 02:50:39 1999 ++++ gyahtzee/Makefile.in Wed Mar 3 00:00:42 1999 +@@ -123,17 +123,17 @@ + ZVT_LIBS = @ZVT_LIBS@ + l = @l@ + +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games + scoredir = $(localstatedir)/games SUBDIRS = pix @@ -223,10 +303,14 @@ gtali_SOURCES = gyahtzee.c gyahtzee.h clist.c yahtzee.h yahtzee.c computer.c setup.c ---- mahjongg/Makefile.in.orig Mon Feb 15 13:57:31 1999 -+++ mahjongg/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -127,7 +127,7 @@ - Gamesdir = $(datadir)/apps/Games +--- mahjongg/Makefile.in.orig Mon Mar 1 02:50:35 1999 ++++ mahjongg/Makefile.in Wed Mar 3 00:01:32 1999 +@@ -125,10 +125,10 @@ + + scoredir = $(localstatedir)/games + pixmapdir = $(datadir)/pixmaps/mahjongg +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games appicondir = $(datadir)/pixmaps -INCLUDES = -I.. -I$(srcdir)/.. -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -234,9 +318,18 @@ bin_PROGRAMS = mahjongg ---- metatris/Makefile.in.orig Mon Feb 15 13:58:13 1999 -+++ metatris/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -145,7 +145,7 @@ +--- metatris/Makefile.in.orig Mon Mar 1 02:51:06 1999 ++++ metatris/Makefile.in Wed Mar 3 00:01:34 1999 +@@ -128,7 +128,7 @@ + appicondir = $(datadir)/pixmaps + appicon_DATA = gnome-metatris.png + +-sysdir = $(datadir)/gnome/apps/Games ++sysdir = $(datadir)/apps/Games + sys_DATA = metatris.desktop + + mydatadir = $(datadir)/metatris/default-theme +@@ -146,7 +146,7 @@ metatris_LDFLAGS = $(GTK_LIBS) $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) @@ -245,9 +338,14 @@ scoredir = $(localstatedir)/games ---- same-gnome/Makefile.in.orig Mon Feb 15 13:57:18 1999 -+++ same-gnome/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -128,7 +128,7 @@ +--- same-gnome/Makefile.in.orig Mon Mar 1 02:50:30 1999 ++++ same-gnome/Makefile.in Wed Mar 3 00:01:52 1999 +@@ -125,11 +125,11 @@ + + scoredir = $(localstatedir)/games + pixmapdir = $(datadir)/pixmaps/same-gnome +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games SUBDIRS = help @@ -256,10 +354,10 @@ bin_PROGRAMS = same-gnome ---- same-gnome/help/C/Makefile.in.orig Sun Feb 21 04:26:30 1999 -+++ same-gnome/help/C/Makefile.in Sun Feb 21 04:26:40 1999 -@@ -122,7 +122,7 @@ - XPM_LIBS = @XPM_LIBS@ +--- same-gnome/help/C/Makefile.in.orig Mon Mar 1 02:50:32 1999 ++++ same-gnome/help/C/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -123,7 +123,7 @@ + ZVT_LIBS = @ZVT_LIBS@ l = @l@ -same_gnome_helpdir = $(datadir)/gnome/help/samegnome/C @@ -267,10 +365,10 @@ same_gnome_help_DATA = index.html topic.dat ---- scottfree/Makefile.in.orig Sun Feb 21 04:27:05 1999 -+++ scottfree/Makefile.in Sun Feb 21 04:27:17 1999 -@@ -122,7 +122,7 @@ - XPM_LIBS = @XPM_LIBS@ +--- scottfree/Makefile.in.orig Mon Mar 1 02:50:33 1999 ++++ scottfree/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -123,7 +123,7 @@ + ZVT_LIBS = @ZVT_LIBS@ l = @l@ -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -278,14 +376,3 @@ bin_PROGRAMS = GnomeScott ---- po/Makefile.in.in.orig Sun Feb 21 04:27:30 1999 -+++ po/Makefile.in.in Sun Feb 21 04:27:40 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/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist index 7a7ca05f6d25..fd19493b71e8 100644 --- a/games/gnome-games/pkg-plist +++ b/games/gnome-games/pkg-plist @@ -38,6 +38,14 @@ share/gnome/apps/Games/mahjongg.desktop share/gnome/apps/Games/metatris.desktop share/gnome/apps/Games/same-gnome.desktop share/gnome/apps/Games/sol.desktop +share/gnome/games/gnibbles.1.0.scores +share/gnome/games/gnibbles.1.1.scores +share/gnome/games/gnibbles.2.0.scores +share/gnome/games/gnibbles.2.1.scores +share/gnome/games/gnibbles.3.0.scores +share/gnome/games/gnibbles.3.1.scores +share/gnome/games/gnibbles.4.0.scores +share/gnome/games/gnibbles.4.1.scores share/gnome/games/gnobots.safe.scores share/gnome/games/gnobots.unsafe.scores share/gnome/games/gnobots2.classic_robots-safe.scores @@ -103,8 +111,9 @@ share/gnome/gnobots2/robots2.cfg share/gnome/gnobots2/robots2_easy.cfg share/gnome/gnobots2/robots_with_safe_teleport.cfg 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/tutorial.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 @@ -113,6 +122,7 @@ 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 share/gnome/gturing/examples/addbin.tur @@ -123,28 +133,6 @@ share/gnome/gturing/examples/bin2dec.tur share/gnome/gturing/examples/dashnumbers.tur share/gnome/gturing/examples/dec2bin.tur share/gnome/gturing/examples/subst.tur -share/gnome/help/aisleriot/C/beleaguered-castle.html -share/gnome/help/aisleriot/C/camelot-goal.gif -share/gnome/help/aisleriot/C/camelot.html -share/gnome/help/aisleriot/C/canfield.html -share/gnome/help/aisleriot/C/clock-rules.gif -share/gnome/help/aisleriot/C/clock.html -share/gnome/help/aisleriot/C/docbook.css -share/gnome/help/aisleriot/C/doublets.html -share/gnome/help/aisleriot/C/eagle-wing.html -share/gnome/help/aisleriot/C/fortunes.html -share/gnome/help/aisleriot/C/glossary.html -share/gnome/help/aisleriot/C/gpl.html -share/gnome/help/aisleriot/C/index.html -share/gnome/help/aisleriot/C/intro.html -share/gnome/help/aisleriot/C/klondike.html -share/gnome/help/aisleriot/C/neighbor.html -share/gnome/help/aisleriot/C/odessa.html -share/gnome/help/aisleriot/C/osmosis.html -share/gnome/help/aisleriot/C/pileon.html -share/gnome/help/aisleriot/C/spider.html -share/gnome/help/aisleriot/C/topic.dat -share/gnome/help/aisleriot/C/yukon.html share/gnome/help/gnobots/C/index.html share/gnome/help/gnobots/C/topic.dat share/gnome/help/gnobots/es/index.html @@ -241,6 +229,7 @@ share/gnome/pixmaps/cards/backs/beige.png share/gnome/pixmaps/cards/backs/face.png share/gnome/pixmaps/cards/backs/grey.png share/gnome/pixmaps/cards/backs/rods.png +share/gnome/pixmaps/cards/baize.png share/gnome/pixmaps/cards/honors/bonded.png share/gnome/pixmaps/cards/honors/xpat.png share/gnome/pixmaps/cards/jokers/gnome.png @@ -248,16 +237,25 @@ share/gnome/pixmaps/cards/ranks/bold-09x14.png share/gnome/pixmaps/cards/ranks/fine-07x12.png share/gnome/pixmaps/cards/slots/hand.png share/gnome/pixmaps/cards/slots/plain.png -share/gnome/pixmaps/cards/suits/knuth-09x10.png -share/gnome/pixmaps/cards/suits/knuth-15x19.png -share/gnome/pixmaps/cards/suits/knuth-18x21.png -share/gnome/pixmaps/cards/suits/knuth-21x25.png -share/gnome/pixmaps/cards/suits/xpat-11x11.png -share/gnome/pixmaps/cards/suits/xpat-15x15.png -share/gnome/pixmaps/cards/suits/xpat-21x21.png -share/gnome/pixmaps/cards/suits/xpat-41x41.png -share/gnome/pixmaps/cards/baize.png share/gnome/pixmaps/cards/splash.png +share/gnome/pixmaps/cards/suits_large/knuth-09x10.png +share/gnome/pixmaps/cards/suits_large/knuth-15x19.png +share/gnome/pixmaps/cards/suits_large/knuth-18x21.png +share/gnome/pixmaps/cards/suits_large/knuth-21x25.png +share/gnome/pixmaps/cards/suits_large/xpat-11x11.png +share/gnome/pixmaps/cards/suits_large/xpat-15x15.png +share/gnome/pixmaps/cards/suits_large/xpat-21x21.png +share/gnome/pixmaps/cards/suits_large/xpat-41x41.png +share/gnome/pixmaps/cards/suits_medium/knuth-09x10.png +share/gnome/pixmaps/cards/suits_medium/knuth-15x19.png +share/gnome/pixmaps/cards/suits_medium/knuth-18x21.png +share/gnome/pixmaps/cards/suits_medium/knuth-21x25.png +share/gnome/pixmaps/cards/suits_medium/xpat-11x11.png +share/gnome/pixmaps/cards/suits_medium/xpat-15x15.png +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/gnobots/aieee.png @@ -277,6 +275,14 @@ share/gnome/pixmaps/gnobots2/robots.png share/gnome/pixmaps/gnobots2/splat.png share/gnome/pixmaps/gnobots2/windows.png share/gnome/pixmaps/gnobots2/yahoo.png +share/gnome/pixmaps/gnome-aisleriot.png +share/gnome/pixmaps/gnome-gnobots.png +share/gnome/pixmaps/gnome-gnobots2.png +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/amoeba.png share/gnome/pixmaps/gnome-stones/boulder.png share/gnome/pixmaps/gnome-stones/butterfly.png @@ -291,10 +297,18 @@ 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/gnometris/5blocks-tig.png share/gnome/pixmaps/gnometris/5blocks-tim.png share/gnome/pixmaps/gnometris/5blocks.png share/gnome/pixmaps/gnometris/7blocks.png +share/gnome/pixmaps/gnometris/bg/fishy-bg.png +share/gnome/pixmaps/gnometris/bg/greyprint-bg.png +share/gnome/pixmaps/gnometris/bg/leaves-bg.png +share/gnome/pixmaps/gnometris/bg/sweet-bg.png +share/gnome/pixmaps/gnometris/bg/watery-bg.png +share/gnome/pixmaps/gnometris/bg/weirdo-bg.png share/gnome/pixmaps/gnotravex/gnotravex.png +share/gnome/pixmaps/iagno.png share/gnome/pixmaps/iagno/blend.png share/gnome/pixmaps/iagno/classic.png share/gnome/pixmaps/iagno/flipblend.png @@ -309,37 +323,48 @@ share/gnome/pixmaps/same-gnome/marbles.png share/gnome/pixmaps/same-gnome/planets.png share/gnome/pixmaps/same-gnome/rotate.png share/gnome/pixmaps/same-gnome/stones.png -share/gnome/pixmaps/gnome-aisleriot.png -share/gnome/pixmaps/gnome-gnobots.png -share/gnome/pixmaps/gnome-gnobots2.png -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/iagno.png +share/gnome/sol-games/auld_lang_syne.scm share/gnome/sol-games/beleaguered_castle.scm +share/gnome/sol-games/bristol.scm share/gnome/sol-games/camelot.scm share/gnome/sol-games/canfield.scm share/gnome/sol-games/clock.scm share/gnome/sol-games/doublets.scm share/gnome/sol-games/eagle_wing.scm +share/gnome/sol-games/elevator.scm share/gnome/sol-games/fortunes.scm +share/gnome/sol-games/fourteen.scm share/gnome/sol-games/freecell.scm +share/gnome/sol-games/hopscotch.scm share/gnome/sol-games/klondike.scm share/gnome/sol-games/neighbor.scm share/gnome/sol-games/odessa.scm share/gnome/sol-games/osmosis.scm share/gnome/sol-games/pileon.scm +share/gnome/sol-games/plait.scm share/gnome/sol-games/sol.scm share/gnome/sol-games/spider.scm +share/gnome/sol-games/thieves.scm +share/gnome/sol-games/thirteen.scm share/gnome/sol-games/yukon.scm +share/gnome/sounds/gnibbles/appear.wav +share/gnome/sounds/gnibbles/bonus.wav +share/gnome/sounds/gnibbles/crash.wav +share/gnome/sounds/gnibbles/gobble.wav +share/gnome/sounds/gnibbles/laughter.wav +share/gnome/sounds/gnibbles/life.wav +share/gnome/sounds/gnibbles/pop.wav +share/gnome/sounds/gnibbles/reverse.wav +share/gnome/sounds/gnibbles/start.wav +share/gnome/sounds/gnibbles/teleport.wav share/gnome/sounds/gnobots2/bad.wav share/gnome/sounds/gnobots2/die.wav share/gnome/sounds/gnobots2/splat.wav share/gnome/sounds/gnobots2/teleport.wav share/gnome/sounds/gnobots2/victory.wav share/gnome/sounds/gnobots2/yahoo.wav +share/gnome/sounds/iagno/flip-piece.wav +share/gnome/sounds/iagno/gameover.wav share/locale/cs/LC_MESSAGES/gnome-games.mo share/locale/da/LC_MESSAGES/gnome-games.mo share/locale/de/LC_MESSAGES/gnome-games.mo @@ -353,41 +378,43 @@ share/locale/ko/LC_MESSAGES/gnome-games.mo share/locale/no/LC_MESSAGES/gnome-games.mo share/locale/pl/LC_MESSAGES/gnome-games.mo share/locale/pt/LC_MESSAGES/gnome-games.mo -share/locale/ru/LC_MESSAGES/gnome-games.mo -@dirrm include/gdkcardimage -@dirrm share/gnome/gnibbles -@dirrm share/gnome/gnobots2 -@dirrm share/gnome/gturing/examples -@dirrm share/gnome/gturing -@dirrm share/gnome/help/aisleriot/C -@dirrm share/gnome/help/aisleriot -@dirrm share/gnome/help/gnobots/C -@dirrm share/gnome/help/gnobots/es -@dirrm share/gnome/help/gnobots -@dirrm share/gnome/help/gnobots2/C -@dirrm share/gnome/help/gnobots2/es -@dirrm share/gnome/help/gnobots2 -@dirrm share/gnome/help/samegnome/C -@dirrm share/gnome/help/samegnome -@dirrm share/gnome/metatris/default-theme -@dirrm share/gnome/metatris -@dirrm share/gnome/pixmaps/cards/backs -@dirrm share/gnome/pixmaps/cards/honors -@dirrm share/gnome/pixmaps/cards/jokers -@dirrm share/gnome/pixmaps/cards/ranks +@dirrm share/gnome/sounds/iagno +@dirrm share/gnome/sounds/gnobots2 +@dirrm share/gnome/sounds/gnibbles +@dirrm share/gnome/sol-games +@dirrm share/gnome/pixmaps/same-gnome +@dirrm share/gnome/pixmaps/mahjongg +@dirrm share/gnome/pixmaps/iagno +@dirrm share/gnome/pixmaps/gnotravex +@dirrm share/gnome/pixmaps/gnometris/bg +@dirrm share/gnome/pixmaps/gnometris +@dirrm share/gnome/pixmaps/gnome-stones +@dirrm share/gnome/pixmaps/gnobots2 +@dirrm share/gnome/pixmaps/gnobots +@dirrm share/gnome/pixmaps/gnibbles +@dirrm share/gnome/pixmaps/cards/suits_small +@dirrm share/gnome/pixmaps/cards/suits_medium +@dirrm share/gnome/pixmaps/cards/suits_large @dirrm share/gnome/pixmaps/cards/slots -@dirrm share/gnome/pixmaps/cards/suits +@dirrm share/gnome/pixmaps/cards/ranks +@dirrm share/gnome/pixmaps/cards/jokers +@dirrm share/gnome/pixmaps/cards/honors +@dirrm share/gnome/pixmaps/cards/backs @dirrm share/gnome/pixmaps/cards -@dirrm share/gnome/pixmaps/gnibbles -@dirrm share/gnome/pixmaps/gnobots -@dirrm share/gnome/pixmaps/gnobots2 -@dirrm share/gnome/pixmaps/gnome-stones -@dirrm share/gnome/pixmaps/gnometris -@dirrm share/gnome/pixmaps/gnotravex -@dirrm share/gnome/pixmaps/iagno -@dirrm share/gnome/pixmaps/mahjongg -@dirrm share/gnome/pixmaps/same-gnome -@dirrm share/gnome/sol-games -@dirrm share/gnome/sounds/gnobots2 +@dirrm share/gnome/metatris/default-theme +@dirrm share/gnome/metatris +@dirrm share/gnome/help/samegnome/C +@dirrm share/gnome/help/samegnome +@dirrm share/gnome/help/gnobots2/es +@dirrm share/gnome/help/gnobots2/C +@dirrm share/gnome/help/gnobots2 +@dirrm share/gnome/help/gnobots/es +@dirrm share/gnome/help/gnobots/C +@dirrm share/gnome/help/gnobots +@dirrm share/gnome/gturing/examples +@dirrm share/gnome/gturing @dirrm share/gnome/gnome-stones/objects @dirrm share/gnome/gnome-stones +@dirrm share/gnome/gnobots2 +@dirrm share/gnome/gnibbles +@dirrm include/gdkcardimage diff --git a/games/gnomegames/Makefile b/games/gnomegames/Makefile index 6686ad0c71e5..3d41cefdec38 100644 --- a/games/gnomegames/Makefile +++ b/games/gnomegames/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: gnomegames -# Version required: 0.99.8 +# Version required: 1.0.1 # Date created: 03 July 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.12 1999/02/02 13:01:33 vanilla Exp $ +# $Id: Makefile,v 1.13 1999/02/24 22:09:22 vanilla Exp $ # -DISTNAME= gnome-games-0.99.8 -PKGNAME= gnomegames-0.99.8 +DISTNAME= gnome-games-1.0.1 +PKGNAME= gnomegames-1.0.1 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-games +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com @@ -24,7 +24,7 @@ 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/gtk11d-config" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: diff --git a/games/gnomegames/distinfo b/games/gnomegames/distinfo index 6fd23676236f..1aa47351f807 100644 --- a/games/gnomegames/distinfo +++ b/games/gnomegames/distinfo @@ -1 +1 @@ -MD5 (gnome-games-0.99.8.tar.gz) = c54271158b7b440539c8334793734f2e +MD5 (gnome-games-1.0.1.tar.gz) = 4bd48e4912eb8eb52226fcb713351de6 diff --git a/games/gnomegames/files/patch-ab b/games/gnomegames/files/patch-ab index 7dc73811102f..de972c331051 100644 --- a/games/gnomegames/files/patch-ab +++ b/games/gnomegames/files/patch-ab @@ -1,50 +1,78 @@ ---- aisleriot/Makefile.in.orig Mon Feb 15 13:57:56 1999 -+++ aisleriot/Makefile.in Fri Feb 19 13:24:41 1999 -@@ -130,7 +130,7 @@ +--- aisleriot/Makefile.in.orig Mon Mar 1 02:50:59 1999 ++++ aisleriot/Makefile.in Wed Mar 3 00:00:04 1999 +@@ -126,12 +126,12 @@ + scoredir = $(localstatedir)/games + cardimagedir = $(datadir)/pixmaps/cards + icondir = $(datadir)/pixmaps +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games + typesdir = $(datadir)/sol-games - SUBDIRS = docs pixmaps +-SUBDIRS = docs pixmaps ++SUBDIRS = pixmaps -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = sol ---- aisleriot/docs/Makefile.in.orig Mon Feb 15 13:58:07 1999 -+++ aisleriot/docs/Makefile.in Fri Feb 19 13:24:41 1999 -@@ -128,7 +128,7 @@ - XPM_LIBS = @XPM_LIBS@ +@@ -152,7 +152,7 @@ + EXTRA_DIST = TODO FIXME AUTHORS $(types_DATA) $(cardimage_DATA) $(icon_DATA) sol.desktop SCHEME_GAMES.h + + +-sysdir = $(datadir)/gnome/apps/Games ++sysdir = $(datadir)/apps/Games + sys_DATA = sol.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +--- aisleriot/docs/Makefile.in.orig Mon Mar 1 02:51:00 1999 ++++ aisleriot/docs/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -129,7 +129,7 @@ + ZVT_LIBS = @ZVT_LIBS@ l = @l@ -helpdir = $(datadir)/gnome/help/aisleriot/C +helpdir = $(datadir)/help/aisleriot/C - help_DATA = index.html intro.html glossary.html gpl.html camelot.html canfield.html clock.html doublets.html eagle-wing.html fortunes.html klondike.html pileon.html neighbor.html odessa.html osmosis.html spider.html yukon.html beleaguered-castle.html camelot-goal.gif clock-rules.gif docbook.css topic.dat + help_DATA = index.html intro.html glossary.html gpl.html camelot.html canfield.html clock.html doublets.html eagle-wing.html elevator.html fortunes.html klondike.html fourteen.html pileon.html auld-lang-syne.html hopscotch.html neighbor.html odessa.html osmosis.html spider.html yukon.html beleaguered-castle.html thirteen.html thieves.html freecell.html bristol.html camelot-goal.gif clock-rules.gif docbook.css topic.dat ---- freecell/src/Makefile.in.orig Mon Feb 15 13:57:16 1999 -+++ freecell/src/Makefile.in Fri Feb 19 13:24:41 1999 -@@ -124,7 +124,7 @@ +--- freecell/src/Makefile.in.orig Mon Mar 1 02:50:27 1999 ++++ freecell/src/Makefile.in Wed Mar 3 00:01:13 1999 +@@ -123,9 +123,9 @@ + ZVT_LIBS = @ZVT_LIBS@ + l = @l@ - Gamesdir = $(datadir)/apps/Games +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I$(srcdir)/../gdk-card-image +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I$(srcdir)/../gdk-card-image bin_PROGRAMS = freecell ---- gnibbles/Makefile.in.orig Sun Feb 21 03:28:13 1999 -+++ gnibbles/Makefile.in Sun Feb 21 03:28:33 1999 -@@ -128,7 +128,7 @@ +--- gnibbles/Makefile.in.orig Mon Mar 1 02:51:08 1999 ++++ gnibbles/Makefile.in Wed Mar 3 00:00:39 1999 +@@ -127,10 +127,10 @@ + configdir = $(datadir)/gnibbles + appicondir = $(datadir)/pixmaps soundlistdir = $(sysconfdir)/sound/events - Gamesdir = $(datadir)/apps/Games +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games + scoredir = $(localstatedir)/games -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = gnibbles ---- gnobots/Makefile.in.orig Mon Feb 15 13:57:38 1999 -+++ gnobots/Makefile.in Fri Feb 19 13:24:41 1999 -@@ -129,7 +129,7 @@ +--- gnobots/Makefile.in.orig Mon Mar 1 02:50:42 1999 ++++ gnobots/Makefile.in Wed Mar 3 00:00:54 1999 +@@ -126,11 +126,11 @@ + scoredir = $(localstatedir)/games + pixmapdir = $(datadir)/pixmaps/gnobots + appicondir = $(datadir)/pixmaps +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games SUBDIRS = help @@ -53,9 +81,9 @@ bin_PROGRAMS = gnobots ---- gnobots/help/C/Makefile.in.orig Mon Feb 15 13:57:40 1999 -+++ gnobots/help/C/Makefile.in Fri Feb 19 13:24:41 1999 -@@ -125,7 +125,7 @@ +--- gnobots/help/C/Makefile.in.orig Mon Mar 1 02:50:44 1999 ++++ gnobots/help/C/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -126,7 +126,7 @@ EXTRA_DIST = index.html topic.dat @@ -64,9 +92,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- gnobots/help/es/Makefile.in.orig Mon Feb 15 13:57:41 1999 -+++ gnobots/help/es/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -125,7 +125,7 @@ +--- gnobots/help/es/Makefile.in.orig Mon Mar 1 02:50:45 1999 ++++ gnobots/help/es/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -126,7 +126,7 @@ EXTRA_DIST = index.html topic.dat @@ -75,9 +103,14 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- gnobots2/Makefile.in.orig Mon Feb 15 13:57:43 1999 -+++ gnobots2/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -132,7 +132,7 @@ +--- gnobots2/Makefile.in.orig Mon Mar 1 02:50:46 1999 ++++ gnobots2/Makefile.in Wed Mar 3 00:00:36 1999 +@@ -129,11 +129,11 @@ + soundlistdir = $(sysconfdir)/sound/events + sounddir = $(datadir)/sounds/gnobots2 + appicondir = $(datadir)/pixmaps +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games SUBDIRS = help @@ -86,9 +119,9 @@ bin_PROGRAMS = gnobots2 ---- gnobots2/help/C/Makefile.in.orig Mon Feb 15 13:57:45 1999 -+++ gnobots2/help/C/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -125,7 +125,7 @@ +--- gnobots2/help/C/Makefile.in.orig Mon Mar 1 02:50:49 1999 ++++ gnobots2/help/C/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -126,7 +126,7 @@ EXTRA_DIST = index.html topic.dat @@ -97,9 +130,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- gnobots2/help/es/Makefile.in.orig Mon Feb 15 13:57:46 1999 -+++ gnobots2/help/es/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -125,7 +125,7 @@ +--- gnobots2/help/es/Makefile.in.orig Mon Mar 1 02:50:50 1999 ++++ gnobots2/help/es/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -126,7 +126,7 @@ EXTRA_DIST = index.html topic.dat @@ -108,9 +141,15 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- gnome-stones/Makefile.in.orig Mon Feb 15 13:57:53 1999 -+++ gnome-stones/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -129,7 +129,7 @@ +--- gnome-stones/Makefile.in.orig Mon Mar 1 02:50:55 1999 ++++ gnome-stones/Makefile.in Wed Mar 3 00:33:00 1999 +@@ -125,12 +125,12 @@ + + SUBDIRS = objects graphics + +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games + scoredir = $(localstatedir)/games Pixmapdir = $(datadir)/pixmaps Cavesdir = $(datadir)/gnome-stones @@ -119,9 +158,18 @@ bin_PROGRAMS = gnome-stones ---- gnome-stones/objects/Makefile.in.orig Mon Feb 15 13:57:54 1999 -+++ gnome-stones/objects/Makefile.in Sun Feb 21 04:22:07 1999 -@@ -124,9 +124,9 @@ +@@ -145,7 +145,7 @@ + Games_DATA = gnome-stones.desktop + Caves_DATA = default.caves tutorial.caves gnomekoban.caves + +-gtkrcdir = $(datadir) ++gtkrcdir = $(datadir)/gnome-stones + gtkrc_DATA = gnome-stonesrc gnome-stonesrc.ko + + EXTRA_DIST = $(Pixmap_DATA) $(Games_DATA) $(Caves_DATA) $(gtkrc_DATA) TODO README +--- gnome-stones/objects/Makefile.in.orig Mon Mar 1 02:50:56 1999 ++++ gnome-stones/objects/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -125,9 +125,9 @@ GSTONES_SRC_DIR = $(srcdir)/../ @@ -133,7 +181,7 @@ object_LTLIBRARIES = libgnome-stones.la libgnomekoban.la -@@ -141,10 +141,10 @@ +@@ -142,10 +142,10 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../.. LIBS = @LIBS@ @@ -146,32 +194,42 @@ libgnomekoban_la_LIBADD = libgnomekoban_la_OBJECTS = gnomekoban.lo COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ---- gnometris/Makefile.in.orig Mon Feb 15 13:58:10 1999 -+++ gnometris/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -126,7 +126,7 @@ +--- gnometris/Makefile.in.orig Mon Mar 1 02:51:03 1999 ++++ gnometris/Makefile.in Wed Mar 3 00:00:33 1999 +@@ -125,9 +125,9 @@ + + SUBDIRS = pix scoredir = $(localstatedir)/games - Gamesdir = $(datadir)/apps/Games +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) bin_PROGRAMS = gnometris ---- gnomine/Makefile.in.orig Mon Feb 15 13:57:17 1999 -+++ gnomine/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -125,7 +125,7 @@ +--- gnomine/Makefile.in.orig Mon Mar 1 02:50:28 1999 ++++ gnomine/Makefile.in Wed Mar 3 00:00:48 1999 +@@ -124,9 +124,9 @@ + l = @l@ + scoredir = $(localstatedir)/games - Gamesdir = $(datadir)/apps/Games +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = gnomine ---- gnothello/Makefile.in.orig Mon Feb 15 13:57:49 1999 -+++ gnothello/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -127,7 +127,7 @@ - Gamesdir = $(datadir)/apps/Games +--- gnothello/Makefile.in.orig Mon Mar 1 02:50:51 1999 ++++ gnothello/Makefile.in Wed Mar 3 00:00:29 1999 +@@ -125,10 +125,10 @@ + + scoredir = $(localstatedir)/games + pixmapdir = $(datadir)/pixmaps/iagno +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games appicondir = $(datadir)/pixmaps -INCLUDES = -DHAVE_ORBIT -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I. @@ -179,26 +237,31 @@ bin_PROGRAMS = iagno ---- gnotravex/Makefile.in.orig Mon Feb 15 13:57:51 1999 -+++ gnotravex/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -126,7 +126,7 @@ +--- gnotravex/Makefile.in.orig Mon Mar 1 02:50:54 1999 ++++ gnotravex/Makefile.in Wed Mar 3 00:00:45 1999 +@@ -125,9 +125,9 @@ + + scoredir = $(localstatedir)/games pixmapdir = $(datadir)/pixmaps/gnotravex - Gamesdir = $(datadir)/apps/Games +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = gnotravex ---- gturing/Makefile.in.orig Mon Feb 15 13:57:32 1999 -+++ gturing/Makefile.in Sun Feb 21 04:24:15 1999 -@@ -122,12 +122,10 @@ - XPM_LIBS = @XPM_LIBS@ +--- gturing/Makefile.in.orig Mon Mar 1 02:50:36 1999 ++++ gturing/Makefile.in Wed Mar 3 00:00:25 1999 +@@ -124,12 +124,12 @@ + ZVT_LIBS = @ZVT_LIBS@ l = @l@ -SUBDIRS = help -- - Gamesdir = $(datadir)/apps/Games ++# SUBDIRS = help + +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games examplesdir = $(datadir)/gturing/examples -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" -DGTURING_EXAMPLES_DIR=\""$(examplesdir)"\" @@ -206,9 +269,26 @@ bin_PROGRAMS = gturing ---- gyahtzee/Makefile.in.orig Mon Feb 15 13:57:35 1999 -+++ gyahtzee/Makefile.in Sun Feb 21 04:25:11 1999 -@@ -127,12 +127,12 @@ +--- gturing/help/C/Makefile.in.orig Mon Mar 1 02:50:38 1999 ++++ gturing/help/C/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -123,7 +123,7 @@ + ZVT_LIBS = @ZVT_LIBS@ + l = @l@ + +-gturing_helpdir = $(datadir)/gnome/help/gturing/C ++gturing_helpdir = $(datadir)/help/gturing/C + + gturing_help_DATA = index.html topic.dat + +--- gyahtzee/Makefile.in.orig Mon Mar 1 02:50:39 1999 ++++ gyahtzee/Makefile.in Wed Mar 3 00:00:42 1999 +@@ -123,17 +123,17 @@ + ZVT_LIBS = @ZVT_LIBS@ + l = @l@ + +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games + scoredir = $(localstatedir)/games SUBDIRS = pix @@ -223,10 +303,14 @@ gtali_SOURCES = gyahtzee.c gyahtzee.h clist.c yahtzee.h yahtzee.c computer.c setup.c ---- mahjongg/Makefile.in.orig Mon Feb 15 13:57:31 1999 -+++ mahjongg/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -127,7 +127,7 @@ - Gamesdir = $(datadir)/apps/Games +--- mahjongg/Makefile.in.orig Mon Mar 1 02:50:35 1999 ++++ mahjongg/Makefile.in Wed Mar 3 00:01:32 1999 +@@ -125,10 +125,10 @@ + + scoredir = $(localstatedir)/games + pixmapdir = $(datadir)/pixmaps/mahjongg +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games appicondir = $(datadir)/pixmaps -INCLUDES = -I.. -I$(srcdir)/.. -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -234,9 +318,18 @@ bin_PROGRAMS = mahjongg ---- metatris/Makefile.in.orig Mon Feb 15 13:58:13 1999 -+++ metatris/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -145,7 +145,7 @@ +--- metatris/Makefile.in.orig Mon Mar 1 02:51:06 1999 ++++ metatris/Makefile.in Wed Mar 3 00:01:34 1999 +@@ -128,7 +128,7 @@ + appicondir = $(datadir)/pixmaps + appicon_DATA = gnome-metatris.png + +-sysdir = $(datadir)/gnome/apps/Games ++sysdir = $(datadir)/apps/Games + sys_DATA = metatris.desktop + + mydatadir = $(datadir)/metatris/default-theme +@@ -146,7 +146,7 @@ metatris_LDFLAGS = $(GTK_LIBS) $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) @@ -245,9 +338,14 @@ scoredir = $(localstatedir)/games ---- same-gnome/Makefile.in.orig Mon Feb 15 13:57:18 1999 -+++ same-gnome/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -128,7 +128,7 @@ +--- same-gnome/Makefile.in.orig Mon Mar 1 02:50:30 1999 ++++ same-gnome/Makefile.in Wed Mar 3 00:01:52 1999 +@@ -125,11 +125,11 @@ + + scoredir = $(localstatedir)/games + pixmapdir = $(datadir)/pixmaps/same-gnome +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games SUBDIRS = help @@ -256,10 +354,10 @@ bin_PROGRAMS = same-gnome ---- same-gnome/help/C/Makefile.in.orig Sun Feb 21 04:26:30 1999 -+++ same-gnome/help/C/Makefile.in Sun Feb 21 04:26:40 1999 -@@ -122,7 +122,7 @@ - XPM_LIBS = @XPM_LIBS@ +--- same-gnome/help/C/Makefile.in.orig Mon Mar 1 02:50:32 1999 ++++ same-gnome/help/C/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -123,7 +123,7 @@ + ZVT_LIBS = @ZVT_LIBS@ l = @l@ -same_gnome_helpdir = $(datadir)/gnome/help/samegnome/C @@ -267,10 +365,10 @@ same_gnome_help_DATA = index.html topic.dat ---- scottfree/Makefile.in.orig Sun Feb 21 04:27:05 1999 -+++ scottfree/Makefile.in Sun Feb 21 04:27:17 1999 -@@ -122,7 +122,7 @@ - XPM_LIBS = @XPM_LIBS@ +--- scottfree/Makefile.in.orig Mon Mar 1 02:50:33 1999 ++++ scottfree/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -123,7 +123,7 @@ + ZVT_LIBS = @ZVT_LIBS@ l = @l@ -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -278,14 +376,3 @@ bin_PROGRAMS = GnomeScott ---- po/Makefile.in.in.orig Sun Feb 21 04:27:30 1999 -+++ po/Makefile.in.in Sun Feb 21 04:27:40 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/games/gnomegames/pkg-plist b/games/gnomegames/pkg-plist index 7a7ca05f6d25..fd19493b71e8 100644 --- a/games/gnomegames/pkg-plist +++ b/games/gnomegames/pkg-plist @@ -38,6 +38,14 @@ share/gnome/apps/Games/mahjongg.desktop share/gnome/apps/Games/metatris.desktop share/gnome/apps/Games/same-gnome.desktop share/gnome/apps/Games/sol.desktop +share/gnome/games/gnibbles.1.0.scores +share/gnome/games/gnibbles.1.1.scores +share/gnome/games/gnibbles.2.0.scores +share/gnome/games/gnibbles.2.1.scores +share/gnome/games/gnibbles.3.0.scores +share/gnome/games/gnibbles.3.1.scores +share/gnome/games/gnibbles.4.0.scores +share/gnome/games/gnibbles.4.1.scores share/gnome/games/gnobots.safe.scores share/gnome/games/gnobots.unsafe.scores share/gnome/games/gnobots2.classic_robots-safe.scores @@ -103,8 +111,9 @@ share/gnome/gnobots2/robots2.cfg share/gnome/gnobots2/robots2_easy.cfg share/gnome/gnobots2/robots_with_safe_teleport.cfg 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/tutorial.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 @@ -113,6 +122,7 @@ 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 share/gnome/gturing/examples/addbin.tur @@ -123,28 +133,6 @@ share/gnome/gturing/examples/bin2dec.tur share/gnome/gturing/examples/dashnumbers.tur share/gnome/gturing/examples/dec2bin.tur share/gnome/gturing/examples/subst.tur -share/gnome/help/aisleriot/C/beleaguered-castle.html -share/gnome/help/aisleriot/C/camelot-goal.gif -share/gnome/help/aisleriot/C/camelot.html -share/gnome/help/aisleriot/C/canfield.html -share/gnome/help/aisleriot/C/clock-rules.gif -share/gnome/help/aisleriot/C/clock.html -share/gnome/help/aisleriot/C/docbook.css -share/gnome/help/aisleriot/C/doublets.html -share/gnome/help/aisleriot/C/eagle-wing.html -share/gnome/help/aisleriot/C/fortunes.html -share/gnome/help/aisleriot/C/glossary.html -share/gnome/help/aisleriot/C/gpl.html -share/gnome/help/aisleriot/C/index.html -share/gnome/help/aisleriot/C/intro.html -share/gnome/help/aisleriot/C/klondike.html -share/gnome/help/aisleriot/C/neighbor.html -share/gnome/help/aisleriot/C/odessa.html -share/gnome/help/aisleriot/C/osmosis.html -share/gnome/help/aisleriot/C/pileon.html -share/gnome/help/aisleriot/C/spider.html -share/gnome/help/aisleriot/C/topic.dat -share/gnome/help/aisleriot/C/yukon.html share/gnome/help/gnobots/C/index.html share/gnome/help/gnobots/C/topic.dat share/gnome/help/gnobots/es/index.html @@ -241,6 +229,7 @@ share/gnome/pixmaps/cards/backs/beige.png share/gnome/pixmaps/cards/backs/face.png share/gnome/pixmaps/cards/backs/grey.png share/gnome/pixmaps/cards/backs/rods.png +share/gnome/pixmaps/cards/baize.png share/gnome/pixmaps/cards/honors/bonded.png share/gnome/pixmaps/cards/honors/xpat.png share/gnome/pixmaps/cards/jokers/gnome.png @@ -248,16 +237,25 @@ share/gnome/pixmaps/cards/ranks/bold-09x14.png share/gnome/pixmaps/cards/ranks/fine-07x12.png share/gnome/pixmaps/cards/slots/hand.png share/gnome/pixmaps/cards/slots/plain.png -share/gnome/pixmaps/cards/suits/knuth-09x10.png -share/gnome/pixmaps/cards/suits/knuth-15x19.png -share/gnome/pixmaps/cards/suits/knuth-18x21.png -share/gnome/pixmaps/cards/suits/knuth-21x25.png -share/gnome/pixmaps/cards/suits/xpat-11x11.png -share/gnome/pixmaps/cards/suits/xpat-15x15.png -share/gnome/pixmaps/cards/suits/xpat-21x21.png -share/gnome/pixmaps/cards/suits/xpat-41x41.png -share/gnome/pixmaps/cards/baize.png share/gnome/pixmaps/cards/splash.png +share/gnome/pixmaps/cards/suits_large/knuth-09x10.png +share/gnome/pixmaps/cards/suits_large/knuth-15x19.png +share/gnome/pixmaps/cards/suits_large/knuth-18x21.png +share/gnome/pixmaps/cards/suits_large/knuth-21x25.png +share/gnome/pixmaps/cards/suits_large/xpat-11x11.png +share/gnome/pixmaps/cards/suits_large/xpat-15x15.png +share/gnome/pixmaps/cards/suits_large/xpat-21x21.png +share/gnome/pixmaps/cards/suits_large/xpat-41x41.png +share/gnome/pixmaps/cards/suits_medium/knuth-09x10.png +share/gnome/pixmaps/cards/suits_medium/knuth-15x19.png +share/gnome/pixmaps/cards/suits_medium/knuth-18x21.png +share/gnome/pixmaps/cards/suits_medium/knuth-21x25.png +share/gnome/pixmaps/cards/suits_medium/xpat-11x11.png +share/gnome/pixmaps/cards/suits_medium/xpat-15x15.png +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/gnobots/aieee.png @@ -277,6 +275,14 @@ share/gnome/pixmaps/gnobots2/robots.png share/gnome/pixmaps/gnobots2/splat.png share/gnome/pixmaps/gnobots2/windows.png share/gnome/pixmaps/gnobots2/yahoo.png +share/gnome/pixmaps/gnome-aisleriot.png +share/gnome/pixmaps/gnome-gnobots.png +share/gnome/pixmaps/gnome-gnobots2.png +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/amoeba.png share/gnome/pixmaps/gnome-stones/boulder.png share/gnome/pixmaps/gnome-stones/butterfly.png @@ -291,10 +297,18 @@ 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/gnometris/5blocks-tig.png share/gnome/pixmaps/gnometris/5blocks-tim.png share/gnome/pixmaps/gnometris/5blocks.png share/gnome/pixmaps/gnometris/7blocks.png +share/gnome/pixmaps/gnometris/bg/fishy-bg.png +share/gnome/pixmaps/gnometris/bg/greyprint-bg.png +share/gnome/pixmaps/gnometris/bg/leaves-bg.png +share/gnome/pixmaps/gnometris/bg/sweet-bg.png +share/gnome/pixmaps/gnometris/bg/watery-bg.png +share/gnome/pixmaps/gnometris/bg/weirdo-bg.png share/gnome/pixmaps/gnotravex/gnotravex.png +share/gnome/pixmaps/iagno.png share/gnome/pixmaps/iagno/blend.png share/gnome/pixmaps/iagno/classic.png share/gnome/pixmaps/iagno/flipblend.png @@ -309,37 +323,48 @@ share/gnome/pixmaps/same-gnome/marbles.png share/gnome/pixmaps/same-gnome/planets.png share/gnome/pixmaps/same-gnome/rotate.png share/gnome/pixmaps/same-gnome/stones.png -share/gnome/pixmaps/gnome-aisleriot.png -share/gnome/pixmaps/gnome-gnobots.png -share/gnome/pixmaps/gnome-gnobots2.png -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/iagno.png +share/gnome/sol-games/auld_lang_syne.scm share/gnome/sol-games/beleaguered_castle.scm +share/gnome/sol-games/bristol.scm share/gnome/sol-games/camelot.scm share/gnome/sol-games/canfield.scm share/gnome/sol-games/clock.scm share/gnome/sol-games/doublets.scm share/gnome/sol-games/eagle_wing.scm +share/gnome/sol-games/elevator.scm share/gnome/sol-games/fortunes.scm +share/gnome/sol-games/fourteen.scm share/gnome/sol-games/freecell.scm +share/gnome/sol-games/hopscotch.scm share/gnome/sol-games/klondike.scm share/gnome/sol-games/neighbor.scm share/gnome/sol-games/odessa.scm share/gnome/sol-games/osmosis.scm share/gnome/sol-games/pileon.scm +share/gnome/sol-games/plait.scm share/gnome/sol-games/sol.scm share/gnome/sol-games/spider.scm +share/gnome/sol-games/thieves.scm +share/gnome/sol-games/thirteen.scm share/gnome/sol-games/yukon.scm +share/gnome/sounds/gnibbles/appear.wav +share/gnome/sounds/gnibbles/bonus.wav +share/gnome/sounds/gnibbles/crash.wav +share/gnome/sounds/gnibbles/gobble.wav +share/gnome/sounds/gnibbles/laughter.wav +share/gnome/sounds/gnibbles/life.wav +share/gnome/sounds/gnibbles/pop.wav +share/gnome/sounds/gnibbles/reverse.wav +share/gnome/sounds/gnibbles/start.wav +share/gnome/sounds/gnibbles/teleport.wav share/gnome/sounds/gnobots2/bad.wav share/gnome/sounds/gnobots2/die.wav share/gnome/sounds/gnobots2/splat.wav share/gnome/sounds/gnobots2/teleport.wav share/gnome/sounds/gnobots2/victory.wav share/gnome/sounds/gnobots2/yahoo.wav +share/gnome/sounds/iagno/flip-piece.wav +share/gnome/sounds/iagno/gameover.wav share/locale/cs/LC_MESSAGES/gnome-games.mo share/locale/da/LC_MESSAGES/gnome-games.mo share/locale/de/LC_MESSAGES/gnome-games.mo @@ -353,41 +378,43 @@ share/locale/ko/LC_MESSAGES/gnome-games.mo share/locale/no/LC_MESSAGES/gnome-games.mo share/locale/pl/LC_MESSAGES/gnome-games.mo share/locale/pt/LC_MESSAGES/gnome-games.mo -share/locale/ru/LC_MESSAGES/gnome-games.mo -@dirrm include/gdkcardimage -@dirrm share/gnome/gnibbles -@dirrm share/gnome/gnobots2 -@dirrm share/gnome/gturing/examples -@dirrm share/gnome/gturing -@dirrm share/gnome/help/aisleriot/C -@dirrm share/gnome/help/aisleriot -@dirrm share/gnome/help/gnobots/C -@dirrm share/gnome/help/gnobots/es -@dirrm share/gnome/help/gnobots -@dirrm share/gnome/help/gnobots2/C -@dirrm share/gnome/help/gnobots2/es -@dirrm share/gnome/help/gnobots2 -@dirrm share/gnome/help/samegnome/C -@dirrm share/gnome/help/samegnome -@dirrm share/gnome/metatris/default-theme -@dirrm share/gnome/metatris -@dirrm share/gnome/pixmaps/cards/backs -@dirrm share/gnome/pixmaps/cards/honors -@dirrm share/gnome/pixmaps/cards/jokers -@dirrm share/gnome/pixmaps/cards/ranks +@dirrm share/gnome/sounds/iagno +@dirrm share/gnome/sounds/gnobots2 +@dirrm share/gnome/sounds/gnibbles +@dirrm share/gnome/sol-games +@dirrm share/gnome/pixmaps/same-gnome +@dirrm share/gnome/pixmaps/mahjongg +@dirrm share/gnome/pixmaps/iagno +@dirrm share/gnome/pixmaps/gnotravex +@dirrm share/gnome/pixmaps/gnometris/bg +@dirrm share/gnome/pixmaps/gnometris +@dirrm share/gnome/pixmaps/gnome-stones +@dirrm share/gnome/pixmaps/gnobots2 +@dirrm share/gnome/pixmaps/gnobots +@dirrm share/gnome/pixmaps/gnibbles +@dirrm share/gnome/pixmaps/cards/suits_small +@dirrm share/gnome/pixmaps/cards/suits_medium +@dirrm share/gnome/pixmaps/cards/suits_large @dirrm share/gnome/pixmaps/cards/slots -@dirrm share/gnome/pixmaps/cards/suits +@dirrm share/gnome/pixmaps/cards/ranks +@dirrm share/gnome/pixmaps/cards/jokers +@dirrm share/gnome/pixmaps/cards/honors +@dirrm share/gnome/pixmaps/cards/backs @dirrm share/gnome/pixmaps/cards -@dirrm share/gnome/pixmaps/gnibbles -@dirrm share/gnome/pixmaps/gnobots -@dirrm share/gnome/pixmaps/gnobots2 -@dirrm share/gnome/pixmaps/gnome-stones -@dirrm share/gnome/pixmaps/gnometris -@dirrm share/gnome/pixmaps/gnotravex -@dirrm share/gnome/pixmaps/iagno -@dirrm share/gnome/pixmaps/mahjongg -@dirrm share/gnome/pixmaps/same-gnome -@dirrm share/gnome/sol-games -@dirrm share/gnome/sounds/gnobots2 +@dirrm share/gnome/metatris/default-theme +@dirrm share/gnome/metatris +@dirrm share/gnome/help/samegnome/C +@dirrm share/gnome/help/samegnome +@dirrm share/gnome/help/gnobots2/es +@dirrm share/gnome/help/gnobots2/C +@dirrm share/gnome/help/gnobots2 +@dirrm share/gnome/help/gnobots/es +@dirrm share/gnome/help/gnobots/C +@dirrm share/gnome/help/gnobots +@dirrm share/gnome/gturing/examples +@dirrm share/gnome/gturing @dirrm share/gnome/gnome-stones/objects @dirrm share/gnome/gnome-stones +@dirrm share/gnome/gnobots2 +@dirrm share/gnome/gnibbles +@dirrm include/gdkcardimage diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile index 6686ad0c71e5..3d41cefdec38 100644 --- a/games/gnomegames2/Makefile +++ b/games/gnomegames2/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: gnomegames -# Version required: 0.99.8 +# Version required: 1.0.1 # Date created: 03 July 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.12 1999/02/02 13:01:33 vanilla Exp $ +# $Id: Makefile,v 1.13 1999/02/24 22:09:22 vanilla Exp $ # -DISTNAME= gnome-games-0.99.8 -PKGNAME= gnomegames-0.99.8 +DISTNAME= gnome-games-1.0.1 +PKGNAME= gnomegames-1.0.1 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-games +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com @@ -24,7 +24,7 @@ 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/gtk11d-config" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: diff --git a/games/gnomegames2/distinfo b/games/gnomegames2/distinfo index 6fd23676236f..1aa47351f807 100644 --- a/games/gnomegames2/distinfo +++ b/games/gnomegames2/distinfo @@ -1 +1 @@ -MD5 (gnome-games-0.99.8.tar.gz) = c54271158b7b440539c8334793734f2e +MD5 (gnome-games-1.0.1.tar.gz) = 4bd48e4912eb8eb52226fcb713351de6 diff --git a/games/gnomegames2/files/patch-ab b/games/gnomegames2/files/patch-ab index 7dc73811102f..de972c331051 100644 --- a/games/gnomegames2/files/patch-ab +++ b/games/gnomegames2/files/patch-ab @@ -1,50 +1,78 @@ ---- aisleriot/Makefile.in.orig Mon Feb 15 13:57:56 1999 -+++ aisleriot/Makefile.in Fri Feb 19 13:24:41 1999 -@@ -130,7 +130,7 @@ +--- aisleriot/Makefile.in.orig Mon Mar 1 02:50:59 1999 ++++ aisleriot/Makefile.in Wed Mar 3 00:00:04 1999 +@@ -126,12 +126,12 @@ + scoredir = $(localstatedir)/games + cardimagedir = $(datadir)/pixmaps/cards + icondir = $(datadir)/pixmaps +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games + typesdir = $(datadir)/sol-games - SUBDIRS = docs pixmaps +-SUBDIRS = docs pixmaps ++SUBDIRS = pixmaps -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = sol ---- aisleriot/docs/Makefile.in.orig Mon Feb 15 13:58:07 1999 -+++ aisleriot/docs/Makefile.in Fri Feb 19 13:24:41 1999 -@@ -128,7 +128,7 @@ - XPM_LIBS = @XPM_LIBS@ +@@ -152,7 +152,7 @@ + EXTRA_DIST = TODO FIXME AUTHORS $(types_DATA) $(cardimage_DATA) $(icon_DATA) sol.desktop SCHEME_GAMES.h + + +-sysdir = $(datadir)/gnome/apps/Games ++sysdir = $(datadir)/apps/Games + sys_DATA = sol.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +--- aisleriot/docs/Makefile.in.orig Mon Mar 1 02:51:00 1999 ++++ aisleriot/docs/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -129,7 +129,7 @@ + ZVT_LIBS = @ZVT_LIBS@ l = @l@ -helpdir = $(datadir)/gnome/help/aisleriot/C +helpdir = $(datadir)/help/aisleriot/C - help_DATA = index.html intro.html glossary.html gpl.html camelot.html canfield.html clock.html doublets.html eagle-wing.html fortunes.html klondike.html pileon.html neighbor.html odessa.html osmosis.html spider.html yukon.html beleaguered-castle.html camelot-goal.gif clock-rules.gif docbook.css topic.dat + help_DATA = index.html intro.html glossary.html gpl.html camelot.html canfield.html clock.html doublets.html eagle-wing.html elevator.html fortunes.html klondike.html fourteen.html pileon.html auld-lang-syne.html hopscotch.html neighbor.html odessa.html osmosis.html spider.html yukon.html beleaguered-castle.html thirteen.html thieves.html freecell.html bristol.html camelot-goal.gif clock-rules.gif docbook.css topic.dat ---- freecell/src/Makefile.in.orig Mon Feb 15 13:57:16 1999 -+++ freecell/src/Makefile.in Fri Feb 19 13:24:41 1999 -@@ -124,7 +124,7 @@ +--- freecell/src/Makefile.in.orig Mon Mar 1 02:50:27 1999 ++++ freecell/src/Makefile.in Wed Mar 3 00:01:13 1999 +@@ -123,9 +123,9 @@ + ZVT_LIBS = @ZVT_LIBS@ + l = @l@ - Gamesdir = $(datadir)/apps/Games +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I$(srcdir)/../gdk-card-image +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I$(srcdir)/../gdk-card-image bin_PROGRAMS = freecell ---- gnibbles/Makefile.in.orig Sun Feb 21 03:28:13 1999 -+++ gnibbles/Makefile.in Sun Feb 21 03:28:33 1999 -@@ -128,7 +128,7 @@ +--- gnibbles/Makefile.in.orig Mon Mar 1 02:51:08 1999 ++++ gnibbles/Makefile.in Wed Mar 3 00:00:39 1999 +@@ -127,10 +127,10 @@ + configdir = $(datadir)/gnibbles + appicondir = $(datadir)/pixmaps soundlistdir = $(sysconfdir)/sound/events - Gamesdir = $(datadir)/apps/Games +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games + scoredir = $(localstatedir)/games -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = gnibbles ---- gnobots/Makefile.in.orig Mon Feb 15 13:57:38 1999 -+++ gnobots/Makefile.in Fri Feb 19 13:24:41 1999 -@@ -129,7 +129,7 @@ +--- gnobots/Makefile.in.orig Mon Mar 1 02:50:42 1999 ++++ gnobots/Makefile.in Wed Mar 3 00:00:54 1999 +@@ -126,11 +126,11 @@ + scoredir = $(localstatedir)/games + pixmapdir = $(datadir)/pixmaps/gnobots + appicondir = $(datadir)/pixmaps +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games SUBDIRS = help @@ -53,9 +81,9 @@ bin_PROGRAMS = gnobots ---- gnobots/help/C/Makefile.in.orig Mon Feb 15 13:57:40 1999 -+++ gnobots/help/C/Makefile.in Fri Feb 19 13:24:41 1999 -@@ -125,7 +125,7 @@ +--- gnobots/help/C/Makefile.in.orig Mon Mar 1 02:50:44 1999 ++++ gnobots/help/C/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -126,7 +126,7 @@ EXTRA_DIST = index.html topic.dat @@ -64,9 +92,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- gnobots/help/es/Makefile.in.orig Mon Feb 15 13:57:41 1999 -+++ gnobots/help/es/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -125,7 +125,7 @@ +--- gnobots/help/es/Makefile.in.orig Mon Mar 1 02:50:45 1999 ++++ gnobots/help/es/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -126,7 +126,7 @@ EXTRA_DIST = index.html topic.dat @@ -75,9 +103,14 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- gnobots2/Makefile.in.orig Mon Feb 15 13:57:43 1999 -+++ gnobots2/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -132,7 +132,7 @@ +--- gnobots2/Makefile.in.orig Mon Mar 1 02:50:46 1999 ++++ gnobots2/Makefile.in Wed Mar 3 00:00:36 1999 +@@ -129,11 +129,11 @@ + soundlistdir = $(sysconfdir)/sound/events + sounddir = $(datadir)/sounds/gnobots2 + appicondir = $(datadir)/pixmaps +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games SUBDIRS = help @@ -86,9 +119,9 @@ bin_PROGRAMS = gnobots2 ---- gnobots2/help/C/Makefile.in.orig Mon Feb 15 13:57:45 1999 -+++ gnobots2/help/C/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -125,7 +125,7 @@ +--- gnobots2/help/C/Makefile.in.orig Mon Mar 1 02:50:49 1999 ++++ gnobots2/help/C/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -126,7 +126,7 @@ EXTRA_DIST = index.html topic.dat @@ -97,9 +130,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- gnobots2/help/es/Makefile.in.orig Mon Feb 15 13:57:46 1999 -+++ gnobots2/help/es/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -125,7 +125,7 @@ +--- gnobots2/help/es/Makefile.in.orig Mon Mar 1 02:50:50 1999 ++++ gnobots2/help/es/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -126,7 +126,7 @@ EXTRA_DIST = index.html topic.dat @@ -108,9 +141,15 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- gnome-stones/Makefile.in.orig Mon Feb 15 13:57:53 1999 -+++ gnome-stones/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -129,7 +129,7 @@ +--- gnome-stones/Makefile.in.orig Mon Mar 1 02:50:55 1999 ++++ gnome-stones/Makefile.in Wed Mar 3 00:33:00 1999 +@@ -125,12 +125,12 @@ + + SUBDIRS = objects graphics + +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games + scoredir = $(localstatedir)/games Pixmapdir = $(datadir)/pixmaps Cavesdir = $(datadir)/gnome-stones @@ -119,9 +158,18 @@ bin_PROGRAMS = gnome-stones ---- gnome-stones/objects/Makefile.in.orig Mon Feb 15 13:57:54 1999 -+++ gnome-stones/objects/Makefile.in Sun Feb 21 04:22:07 1999 -@@ -124,9 +124,9 @@ +@@ -145,7 +145,7 @@ + Games_DATA = gnome-stones.desktop + Caves_DATA = default.caves tutorial.caves gnomekoban.caves + +-gtkrcdir = $(datadir) ++gtkrcdir = $(datadir)/gnome-stones + gtkrc_DATA = gnome-stonesrc gnome-stonesrc.ko + + EXTRA_DIST = $(Pixmap_DATA) $(Games_DATA) $(Caves_DATA) $(gtkrc_DATA) TODO README +--- gnome-stones/objects/Makefile.in.orig Mon Mar 1 02:50:56 1999 ++++ gnome-stones/objects/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -125,9 +125,9 @@ GSTONES_SRC_DIR = $(srcdir)/../ @@ -133,7 +181,7 @@ object_LTLIBRARIES = libgnome-stones.la libgnomekoban.la -@@ -141,10 +141,10 @@ +@@ -142,10 +142,10 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../.. LIBS = @LIBS@ @@ -146,32 +194,42 @@ libgnomekoban_la_LIBADD = libgnomekoban_la_OBJECTS = gnomekoban.lo COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ---- gnometris/Makefile.in.orig Mon Feb 15 13:58:10 1999 -+++ gnometris/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -126,7 +126,7 @@ +--- gnometris/Makefile.in.orig Mon Mar 1 02:51:03 1999 ++++ gnometris/Makefile.in Wed Mar 3 00:00:33 1999 +@@ -125,9 +125,9 @@ + + SUBDIRS = pix scoredir = $(localstatedir)/games - Gamesdir = $(datadir)/apps/Games +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) bin_PROGRAMS = gnometris ---- gnomine/Makefile.in.orig Mon Feb 15 13:57:17 1999 -+++ gnomine/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -125,7 +125,7 @@ +--- gnomine/Makefile.in.orig Mon Mar 1 02:50:28 1999 ++++ gnomine/Makefile.in Wed Mar 3 00:00:48 1999 +@@ -124,9 +124,9 @@ + l = @l@ + scoredir = $(localstatedir)/games - Gamesdir = $(datadir)/apps/Games +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = gnomine ---- gnothello/Makefile.in.orig Mon Feb 15 13:57:49 1999 -+++ gnothello/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -127,7 +127,7 @@ - Gamesdir = $(datadir)/apps/Games +--- gnothello/Makefile.in.orig Mon Mar 1 02:50:51 1999 ++++ gnothello/Makefile.in Wed Mar 3 00:00:29 1999 +@@ -125,10 +125,10 @@ + + scoredir = $(localstatedir)/games + pixmapdir = $(datadir)/pixmaps/iagno +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games appicondir = $(datadir)/pixmaps -INCLUDES = -DHAVE_ORBIT -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I. @@ -179,26 +237,31 @@ bin_PROGRAMS = iagno ---- gnotravex/Makefile.in.orig Mon Feb 15 13:57:51 1999 -+++ gnotravex/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -126,7 +126,7 @@ +--- gnotravex/Makefile.in.orig Mon Mar 1 02:50:54 1999 ++++ gnotravex/Makefile.in Wed Mar 3 00:00:45 1999 +@@ -125,9 +125,9 @@ + + scoredir = $(localstatedir)/games pixmapdir = $(datadir)/pixmaps/gnotravex - Gamesdir = $(datadir)/apps/Games +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = gnotravex ---- gturing/Makefile.in.orig Mon Feb 15 13:57:32 1999 -+++ gturing/Makefile.in Sun Feb 21 04:24:15 1999 -@@ -122,12 +122,10 @@ - XPM_LIBS = @XPM_LIBS@ +--- gturing/Makefile.in.orig Mon Mar 1 02:50:36 1999 ++++ gturing/Makefile.in Wed Mar 3 00:00:25 1999 +@@ -124,12 +124,12 @@ + ZVT_LIBS = @ZVT_LIBS@ l = @l@ -SUBDIRS = help -- - Gamesdir = $(datadir)/apps/Games ++# SUBDIRS = help + +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games examplesdir = $(datadir)/gturing/examples -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" -DGTURING_EXAMPLES_DIR=\""$(examplesdir)"\" @@ -206,9 +269,26 @@ bin_PROGRAMS = gturing ---- gyahtzee/Makefile.in.orig Mon Feb 15 13:57:35 1999 -+++ gyahtzee/Makefile.in Sun Feb 21 04:25:11 1999 -@@ -127,12 +127,12 @@ +--- gturing/help/C/Makefile.in.orig Mon Mar 1 02:50:38 1999 ++++ gturing/help/C/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -123,7 +123,7 @@ + ZVT_LIBS = @ZVT_LIBS@ + l = @l@ + +-gturing_helpdir = $(datadir)/gnome/help/gturing/C ++gturing_helpdir = $(datadir)/help/gturing/C + + gturing_help_DATA = index.html topic.dat + +--- gyahtzee/Makefile.in.orig Mon Mar 1 02:50:39 1999 ++++ gyahtzee/Makefile.in Wed Mar 3 00:00:42 1999 +@@ -123,17 +123,17 @@ + ZVT_LIBS = @ZVT_LIBS@ + l = @l@ + +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games + scoredir = $(localstatedir)/games SUBDIRS = pix @@ -223,10 +303,14 @@ gtali_SOURCES = gyahtzee.c gyahtzee.h clist.c yahtzee.h yahtzee.c computer.c setup.c ---- mahjongg/Makefile.in.orig Mon Feb 15 13:57:31 1999 -+++ mahjongg/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -127,7 +127,7 @@ - Gamesdir = $(datadir)/apps/Games +--- mahjongg/Makefile.in.orig Mon Mar 1 02:50:35 1999 ++++ mahjongg/Makefile.in Wed Mar 3 00:01:32 1999 +@@ -125,10 +125,10 @@ + + scoredir = $(localstatedir)/games + pixmapdir = $(datadir)/pixmaps/mahjongg +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games appicondir = $(datadir)/pixmaps -INCLUDES = -I.. -I$(srcdir)/.. -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -234,9 +318,18 @@ bin_PROGRAMS = mahjongg ---- metatris/Makefile.in.orig Mon Feb 15 13:58:13 1999 -+++ metatris/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -145,7 +145,7 @@ +--- metatris/Makefile.in.orig Mon Mar 1 02:51:06 1999 ++++ metatris/Makefile.in Wed Mar 3 00:01:34 1999 +@@ -128,7 +128,7 @@ + appicondir = $(datadir)/pixmaps + appicon_DATA = gnome-metatris.png + +-sysdir = $(datadir)/gnome/apps/Games ++sysdir = $(datadir)/apps/Games + sys_DATA = metatris.desktop + + mydatadir = $(datadir)/metatris/default-theme +@@ -146,7 +146,7 @@ metatris_LDFLAGS = $(GTK_LIBS) $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) @@ -245,9 +338,14 @@ scoredir = $(localstatedir)/games ---- same-gnome/Makefile.in.orig Mon Feb 15 13:57:18 1999 -+++ same-gnome/Makefile.in Fri Feb 19 13:24:42 1999 -@@ -128,7 +128,7 @@ +--- same-gnome/Makefile.in.orig Mon Mar 1 02:50:30 1999 ++++ same-gnome/Makefile.in Wed Mar 3 00:01:52 1999 +@@ -125,11 +125,11 @@ + + scoredir = $(localstatedir)/games + pixmapdir = $(datadir)/pixmaps/same-gnome +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games SUBDIRS = help @@ -256,10 +354,10 @@ bin_PROGRAMS = same-gnome ---- same-gnome/help/C/Makefile.in.orig Sun Feb 21 04:26:30 1999 -+++ same-gnome/help/C/Makefile.in Sun Feb 21 04:26:40 1999 -@@ -122,7 +122,7 @@ - XPM_LIBS = @XPM_LIBS@ +--- same-gnome/help/C/Makefile.in.orig Mon Mar 1 02:50:32 1999 ++++ same-gnome/help/C/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -123,7 +123,7 @@ + ZVT_LIBS = @ZVT_LIBS@ l = @l@ -same_gnome_helpdir = $(datadir)/gnome/help/samegnome/C @@ -267,10 +365,10 @@ same_gnome_help_DATA = index.html topic.dat ---- scottfree/Makefile.in.orig Sun Feb 21 04:27:05 1999 -+++ scottfree/Makefile.in Sun Feb 21 04:27:17 1999 -@@ -122,7 +122,7 @@ - XPM_LIBS = @XPM_LIBS@ +--- scottfree/Makefile.in.orig Mon Mar 1 02:50:33 1999 ++++ scottfree/Makefile.in Tue Mar 2 23:58:05 1999 +@@ -123,7 +123,7 @@ + ZVT_LIBS = @ZVT_LIBS@ l = @l@ -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -278,14 +376,3 @@ bin_PROGRAMS = GnomeScott ---- po/Makefile.in.in.orig Sun Feb 21 04:27:30 1999 -+++ po/Makefile.in.in Sun Feb 21 04:27:40 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/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist index 7a7ca05f6d25..fd19493b71e8 100644 --- a/games/gnomegames2/pkg-plist +++ b/games/gnomegames2/pkg-plist @@ -38,6 +38,14 @@ share/gnome/apps/Games/mahjongg.desktop share/gnome/apps/Games/metatris.desktop share/gnome/apps/Games/same-gnome.desktop share/gnome/apps/Games/sol.desktop +share/gnome/games/gnibbles.1.0.scores +share/gnome/games/gnibbles.1.1.scores +share/gnome/games/gnibbles.2.0.scores +share/gnome/games/gnibbles.2.1.scores +share/gnome/games/gnibbles.3.0.scores +share/gnome/games/gnibbles.3.1.scores +share/gnome/games/gnibbles.4.0.scores +share/gnome/games/gnibbles.4.1.scores share/gnome/games/gnobots.safe.scores share/gnome/games/gnobots.unsafe.scores share/gnome/games/gnobots2.classic_robots-safe.scores @@ -103,8 +111,9 @@ share/gnome/gnobots2/robots2.cfg share/gnome/gnobots2/robots2_easy.cfg share/gnome/gnobots2/robots_with_safe_teleport.cfg 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/tutorial.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 @@ -113,6 +122,7 @@ 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 share/gnome/gturing/examples/addbin.tur @@ -123,28 +133,6 @@ share/gnome/gturing/examples/bin2dec.tur share/gnome/gturing/examples/dashnumbers.tur share/gnome/gturing/examples/dec2bin.tur share/gnome/gturing/examples/subst.tur -share/gnome/help/aisleriot/C/beleaguered-castle.html -share/gnome/help/aisleriot/C/camelot-goal.gif -share/gnome/help/aisleriot/C/camelot.html -share/gnome/help/aisleriot/C/canfield.html -share/gnome/help/aisleriot/C/clock-rules.gif -share/gnome/help/aisleriot/C/clock.html -share/gnome/help/aisleriot/C/docbook.css -share/gnome/help/aisleriot/C/doublets.html -share/gnome/help/aisleriot/C/eagle-wing.html -share/gnome/help/aisleriot/C/fortunes.html -share/gnome/help/aisleriot/C/glossary.html -share/gnome/help/aisleriot/C/gpl.html -share/gnome/help/aisleriot/C/index.html -share/gnome/help/aisleriot/C/intro.html -share/gnome/help/aisleriot/C/klondike.html -share/gnome/help/aisleriot/C/neighbor.html -share/gnome/help/aisleriot/C/odessa.html -share/gnome/help/aisleriot/C/osmosis.html -share/gnome/help/aisleriot/C/pileon.html -share/gnome/help/aisleriot/C/spider.html -share/gnome/help/aisleriot/C/topic.dat -share/gnome/help/aisleriot/C/yukon.html share/gnome/help/gnobots/C/index.html share/gnome/help/gnobots/C/topic.dat share/gnome/help/gnobots/es/index.html @@ -241,6 +229,7 @@ share/gnome/pixmaps/cards/backs/beige.png share/gnome/pixmaps/cards/backs/face.png share/gnome/pixmaps/cards/backs/grey.png share/gnome/pixmaps/cards/backs/rods.png +share/gnome/pixmaps/cards/baize.png share/gnome/pixmaps/cards/honors/bonded.png share/gnome/pixmaps/cards/honors/xpat.png share/gnome/pixmaps/cards/jokers/gnome.png @@ -248,16 +237,25 @@ share/gnome/pixmaps/cards/ranks/bold-09x14.png share/gnome/pixmaps/cards/ranks/fine-07x12.png share/gnome/pixmaps/cards/slots/hand.png share/gnome/pixmaps/cards/slots/plain.png -share/gnome/pixmaps/cards/suits/knuth-09x10.png -share/gnome/pixmaps/cards/suits/knuth-15x19.png -share/gnome/pixmaps/cards/suits/knuth-18x21.png -share/gnome/pixmaps/cards/suits/knuth-21x25.png -share/gnome/pixmaps/cards/suits/xpat-11x11.png -share/gnome/pixmaps/cards/suits/xpat-15x15.png -share/gnome/pixmaps/cards/suits/xpat-21x21.png -share/gnome/pixmaps/cards/suits/xpat-41x41.png -share/gnome/pixmaps/cards/baize.png share/gnome/pixmaps/cards/splash.png +share/gnome/pixmaps/cards/suits_large/knuth-09x10.png +share/gnome/pixmaps/cards/suits_large/knuth-15x19.png +share/gnome/pixmaps/cards/suits_large/knuth-18x21.png +share/gnome/pixmaps/cards/suits_large/knuth-21x25.png +share/gnome/pixmaps/cards/suits_large/xpat-11x11.png +share/gnome/pixmaps/cards/suits_large/xpat-15x15.png +share/gnome/pixmaps/cards/suits_large/xpat-21x21.png +share/gnome/pixmaps/cards/suits_large/xpat-41x41.png +share/gnome/pixmaps/cards/suits_medium/knuth-09x10.png +share/gnome/pixmaps/cards/suits_medium/knuth-15x19.png +share/gnome/pixmaps/cards/suits_medium/knuth-18x21.png +share/gnome/pixmaps/cards/suits_medium/knuth-21x25.png +share/gnome/pixmaps/cards/suits_medium/xpat-11x11.png +share/gnome/pixmaps/cards/suits_medium/xpat-15x15.png +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/gnobots/aieee.png @@ -277,6 +275,14 @@ share/gnome/pixmaps/gnobots2/robots.png share/gnome/pixmaps/gnobots2/splat.png share/gnome/pixmaps/gnobots2/windows.png share/gnome/pixmaps/gnobots2/yahoo.png +share/gnome/pixmaps/gnome-aisleriot.png +share/gnome/pixmaps/gnome-gnobots.png +share/gnome/pixmaps/gnome-gnobots2.png +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/amoeba.png share/gnome/pixmaps/gnome-stones/boulder.png share/gnome/pixmaps/gnome-stones/butterfly.png @@ -291,10 +297,18 @@ 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/gnometris/5blocks-tig.png share/gnome/pixmaps/gnometris/5blocks-tim.png share/gnome/pixmaps/gnometris/5blocks.png share/gnome/pixmaps/gnometris/7blocks.png +share/gnome/pixmaps/gnometris/bg/fishy-bg.png +share/gnome/pixmaps/gnometris/bg/greyprint-bg.png +share/gnome/pixmaps/gnometris/bg/leaves-bg.png +share/gnome/pixmaps/gnometris/bg/sweet-bg.png +share/gnome/pixmaps/gnometris/bg/watery-bg.png +share/gnome/pixmaps/gnometris/bg/weirdo-bg.png share/gnome/pixmaps/gnotravex/gnotravex.png +share/gnome/pixmaps/iagno.png share/gnome/pixmaps/iagno/blend.png share/gnome/pixmaps/iagno/classic.png share/gnome/pixmaps/iagno/flipblend.png @@ -309,37 +323,48 @@ share/gnome/pixmaps/same-gnome/marbles.png share/gnome/pixmaps/same-gnome/planets.png share/gnome/pixmaps/same-gnome/rotate.png share/gnome/pixmaps/same-gnome/stones.png -share/gnome/pixmaps/gnome-aisleriot.png -share/gnome/pixmaps/gnome-gnobots.png -share/gnome/pixmaps/gnome-gnobots2.png -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/iagno.png +share/gnome/sol-games/auld_lang_syne.scm share/gnome/sol-games/beleaguered_castle.scm +share/gnome/sol-games/bristol.scm share/gnome/sol-games/camelot.scm share/gnome/sol-games/canfield.scm share/gnome/sol-games/clock.scm share/gnome/sol-games/doublets.scm share/gnome/sol-games/eagle_wing.scm +share/gnome/sol-games/elevator.scm share/gnome/sol-games/fortunes.scm +share/gnome/sol-games/fourteen.scm share/gnome/sol-games/freecell.scm +share/gnome/sol-games/hopscotch.scm share/gnome/sol-games/klondike.scm share/gnome/sol-games/neighbor.scm share/gnome/sol-games/odessa.scm share/gnome/sol-games/osmosis.scm share/gnome/sol-games/pileon.scm +share/gnome/sol-games/plait.scm share/gnome/sol-games/sol.scm share/gnome/sol-games/spider.scm +share/gnome/sol-games/thieves.scm +share/gnome/sol-games/thirteen.scm share/gnome/sol-games/yukon.scm +share/gnome/sounds/gnibbles/appear.wav +share/gnome/sounds/gnibbles/bonus.wav +share/gnome/sounds/gnibbles/crash.wav +share/gnome/sounds/gnibbles/gobble.wav +share/gnome/sounds/gnibbles/laughter.wav +share/gnome/sounds/gnibbles/life.wav +share/gnome/sounds/gnibbles/pop.wav +share/gnome/sounds/gnibbles/reverse.wav +share/gnome/sounds/gnibbles/start.wav +share/gnome/sounds/gnibbles/teleport.wav share/gnome/sounds/gnobots2/bad.wav share/gnome/sounds/gnobots2/die.wav share/gnome/sounds/gnobots2/splat.wav share/gnome/sounds/gnobots2/teleport.wav share/gnome/sounds/gnobots2/victory.wav share/gnome/sounds/gnobots2/yahoo.wav +share/gnome/sounds/iagno/flip-piece.wav +share/gnome/sounds/iagno/gameover.wav share/locale/cs/LC_MESSAGES/gnome-games.mo share/locale/da/LC_MESSAGES/gnome-games.mo share/locale/de/LC_MESSAGES/gnome-games.mo @@ -353,41 +378,43 @@ share/locale/ko/LC_MESSAGES/gnome-games.mo share/locale/no/LC_MESSAGES/gnome-games.mo share/locale/pl/LC_MESSAGES/gnome-games.mo share/locale/pt/LC_MESSAGES/gnome-games.mo -share/locale/ru/LC_MESSAGES/gnome-games.mo -@dirrm include/gdkcardimage -@dirrm share/gnome/gnibbles -@dirrm share/gnome/gnobots2 -@dirrm share/gnome/gturing/examples -@dirrm share/gnome/gturing -@dirrm share/gnome/help/aisleriot/C -@dirrm share/gnome/help/aisleriot -@dirrm share/gnome/help/gnobots/C -@dirrm share/gnome/help/gnobots/es -@dirrm share/gnome/help/gnobots -@dirrm share/gnome/help/gnobots2/C -@dirrm share/gnome/help/gnobots2/es -@dirrm share/gnome/help/gnobots2 -@dirrm share/gnome/help/samegnome/C -@dirrm share/gnome/help/samegnome -@dirrm share/gnome/metatris/default-theme -@dirrm share/gnome/metatris -@dirrm share/gnome/pixmaps/cards/backs -@dirrm share/gnome/pixmaps/cards/honors -@dirrm share/gnome/pixmaps/cards/jokers -@dirrm share/gnome/pixmaps/cards/ranks +@dirrm share/gnome/sounds/iagno +@dirrm share/gnome/sounds/gnobots2 +@dirrm share/gnome/sounds/gnibbles +@dirrm share/gnome/sol-games +@dirrm share/gnome/pixmaps/same-gnome +@dirrm share/gnome/pixmaps/mahjongg +@dirrm share/gnome/pixmaps/iagno +@dirrm share/gnome/pixmaps/gnotravex +@dirrm share/gnome/pixmaps/gnometris/bg +@dirrm share/gnome/pixmaps/gnometris +@dirrm share/gnome/pixmaps/gnome-stones +@dirrm share/gnome/pixmaps/gnobots2 +@dirrm share/gnome/pixmaps/gnobots +@dirrm share/gnome/pixmaps/gnibbles +@dirrm share/gnome/pixmaps/cards/suits_small +@dirrm share/gnome/pixmaps/cards/suits_medium +@dirrm share/gnome/pixmaps/cards/suits_large @dirrm share/gnome/pixmaps/cards/slots -@dirrm share/gnome/pixmaps/cards/suits +@dirrm share/gnome/pixmaps/cards/ranks +@dirrm share/gnome/pixmaps/cards/jokers +@dirrm share/gnome/pixmaps/cards/honors +@dirrm share/gnome/pixmaps/cards/backs @dirrm share/gnome/pixmaps/cards -@dirrm share/gnome/pixmaps/gnibbles -@dirrm share/gnome/pixmaps/gnobots -@dirrm share/gnome/pixmaps/gnobots2 -@dirrm share/gnome/pixmaps/gnome-stones -@dirrm share/gnome/pixmaps/gnometris -@dirrm share/gnome/pixmaps/gnotravex -@dirrm share/gnome/pixmaps/iagno -@dirrm share/gnome/pixmaps/mahjongg -@dirrm share/gnome/pixmaps/same-gnome -@dirrm share/gnome/sol-games -@dirrm share/gnome/sounds/gnobots2 +@dirrm share/gnome/metatris/default-theme +@dirrm share/gnome/metatris +@dirrm share/gnome/help/samegnome/C +@dirrm share/gnome/help/samegnome +@dirrm share/gnome/help/gnobots2/es +@dirrm share/gnome/help/gnobots2/C +@dirrm share/gnome/help/gnobots2 +@dirrm share/gnome/help/gnobots/es +@dirrm share/gnome/help/gnobots/C +@dirrm share/gnome/help/gnobots +@dirrm share/gnome/gturing/examples +@dirrm share/gnome/gturing @dirrm share/gnome/gnome-stones/objects @dirrm share/gnome/gnome-stones +@dirrm share/gnome/gnobots2 +@dirrm share/gnome/gnibbles +@dirrm include/gdkcardimage diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile index 02b4c011e6f6..ba5b6688ecb0 100644 --- a/graphics/electriceyes/Makefile +++ b/graphics/electriceyes/Makefile @@ -3,14 +3,14 @@ # Date created: 21 August 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.10 1999/01/31 20:52:33 vanilla Exp $ +# $Id: Makefile,v 1.11 1999/02/24 22:04:23 vanilla Exp $ # DISTNAME= ee-0.3.8 PKGNAME= electriceyes-0.3.8 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= ee +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com @@ -23,7 +23,7 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ --with-gnome=${X11BASE} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: diff --git a/graphics/electriceyes/files/patch-aa b/graphics/electriceyes/files/patch-aa index 06a4aa19d6d1..8cec444ff988 100644 --- a/graphics/electriceyes/files/patch-aa +++ b/graphics/electriceyes/files/patch-aa @@ -1,24 +1,5 @@ ---- configure.orig Wed Feb 24 05:54:38 1999 -+++ configure Wed Feb 24 05:55:40 1999 -@@ -1113,13 +1113,13 @@ - fi - - if test "$no_gnome_config" = "yes"; then -- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 --echo "configure:1118: checking for gnomeConf.sh file in $gnome_prefix" >&5 -- if test -f $gnome_prefix/gnomeConf.sh; then -+ echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6 -+echo "configure:1118: checking for gnomeConf.sh file in $prefix/share/gnome" >&5 -+ if test -f $prefix/share/gnome/gnomeConf.sh; then - echo "$ac_t""found" 1>&6 - echo "loading gnome configuration from" \ -- "$gnome_prefix/gnomeConf.sh" -- . $gnome_prefix/gnomeConf.sh -+ "$prefix/share/gnome/gnomeConf.sh" -+ . $prefix/share/gnome/gnomeConf.sh - - else - echo "$ac_t""not found" 1>&6 +--- configure.orig Fri Feb 12 23:04:17 1999 ++++ configure Sat Mar 6 22:27:13 1999 @@ -4378,7 +4378,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* @@ -28,12 +9,25 @@ fi rm -f conftest* INSTOBJEXT=.mo -@@ -4640,7 +4640,7 @@ - USE_INCLUDED_LIBINTL=yes - CATOBJEXT=.cat - INSTOBJEXT=.cat -- DATADIRNAME=lib -+ DATADIRNAME=share - INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` +@@ -4766,15 +4766,15 @@ + fi + + +- USE_INCLUDED_LIBINTL=yes ++# USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.gmo + INSTOBJEXT=.mo + DATADIRNAME=share +- INTLDEPS='$(top_builddir)/intl/libintl.a' +- INTLLIBS=$INTLDEPS +- LIBS=`echo $LIBS | sed -e 's/-lintl//'` +- nls_cv_header_intl=intl/libintl.h +- nls_cv_header_libgt=intl/libgettext.h ++# INTLDEPS='$(top_builddir)/intl/libintl.a' ++# INTLLIBS=$INTLDEPS ++# LIBS=`echo $LIBS | sed -e 's/-lintl//'` ++# nls_cv_header_intl=intl/libintl.h ++# nls_cv_header_libgt=intl/libgettext.h + fi + + if test "$XGETTEXT" != ":"; then diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 6fb2f6d4a3a0..3d7cdf3afe80 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,15 +1,15 @@ # New ports collection makefile for: imlib -# Version required: 1.9.3 +# Version required: 1.9.4 # Date created: 10 June 1997 # Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp> # -# $Id: Makefile,v 1.43 1999/01/23 07:05:26 vanilla Exp $ +# $Id: Makefile,v 1.44 1999/02/18 04:55:07 vanilla Exp $ # -DISTNAME= imlib-1.9.3 +DISTNAME= imlib-1.9.4 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= imlib +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= vanilla@FreeBSD.ORG @@ -17,17 +17,25 @@ LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff34 \ gif.3:${PORTSDIR}/graphics/giflib \ - gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel + gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 USE_GMAKE= yes USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ +CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ + -I${LOCALBASE}/include/giflib" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib" post-install: @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib - ${CAT} ${PKGDIR}/MESSAGE + @${ECHO} '************************************************************' + @${ECHO} '* *' + @${ECHO} '* If you want to use autoconf with imlib, *' + @${ECHO} '* Please copy imlib.m4 to /usr/local/share/aclocal *' + @${ECHO} '* by yourself, thanks. *' + @${ECHO} '* *' + @${ECHO} '************************************************************' .include <bsd.port.mk> diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo index 378d40d12dc4..b82d90eab08c 100644 --- a/graphics/imlib/distinfo +++ b/graphics/imlib/distinfo @@ -1 +1 @@ -MD5 (imlib-1.9.3.tar.gz) = 52e09ec343d2123609a7e1bcd72a76f9 +MD5 (imlib-1.9.4.tar.gz) = 8d0e50e28a5b203ff76f114bb38627c7 diff --git a/graphics/imlib/files/patch-aa b/graphics/imlib/files/patch-aa index cb282fe13003..1d43b872d636 100644 --- a/graphics/imlib/files/patch-aa +++ b/graphics/imlib/files/patch-aa @@ -1,13 +1,13 @@ ---- configure.orig Fri Feb 12 14:06:46 1999 -+++ configure Thu Feb 18 00:47:01 1999 +--- configure.orig Thu Feb 25 01:44:38 1999 ++++ configure Mon Mar 1 20:30:08 1999 @@ -2304,8 +2304,8 @@ echo "configure:2305: checking If dynamic linking works on this system" >&5 oLIBS="$LIBS" oCFLAGS="$CFLAGS" - LIBS="$LIBS `glib-config --libs gmodule`" - CFLAGS="$CFLAGS `glib-config --cflags gmodule`" -+ LIBS="$LIBS `glib11d-config --libs gmodule`" -+ CFLAGS="$CFLAGS `glib11d-config --cflags gmodule`" ++ LIBS="$LIBS `glib12-config --libs gmodule`" ++ CFLAGS="$CFLAGS `glib12-config --cflags gmodule`" if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else @@ -17,8 +17,8 @@ - GMODULE_LIBS="`glib-config --libs gmodule`" - GMODULE_FLAGS="`glib-config --cflags gmodule`" -+ GMODULE_LIBS="`glib11d-config --libs gmodule`" -+ GMODULE_FLAGS="`glib11d-config --cflags gmodule`" ++ GMODULE_LIBS="`glib12-config --libs gmodule`" ++ GMODULE_FLAGS="`glib12-config --cflags gmodule`" echo "$ac_t""yes" 1>&6 @@ -40,24 +40,3 @@ cat > conftest.$ac_ext <<EOF #line 4494 "configure" #include "confdefs.h" -@@ -4715,16 +4715,16 @@ - - - --ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 --echo "configure:4721: checking for gif_lib.h" >&5 -+ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6 -+echo "configure:4721: checking for giflib/gif_lib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF - #line 4726 "configure" - #include "confdefs.h" --#include <gif_lib.h> -+#include <giflib/gif_lib.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:4731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } diff --git a/graphics/imlib/files/patch-ab b/graphics/imlib/files/patch-ab deleted file mode 100644 index 3af5b0f15868..000000000000 --- a/graphics/imlib/files/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ ---- Imlib/Imlib_private.h.orig Wed Dec 16 11:13:56 1998 -+++ Imlib/Imlib_private.h Thu Dec 24 06:01:57 1998 -@@ -56,7 +56,7 @@ - #include <tiffio.h> - #endif - #ifdef HAVE_LIBGIF --#include <gif_lib.h> -+#include <giflib/gif_lib.h> - #endif - - #define BYTE_ORD_24_RGB 0 ---- gdk_imlib/io-gif.c.orig Wed Jan 13 05:56:51 1999 -+++ gdk_imlib/io-gif.c Thu Jan 14 18:12:05 1999 -@@ -8,7 +8,7 @@ - return NULL; - } - #else --#include <gif_lib.h> -+#include <giflib/gif_lib.h> - - unsigned char * - loader_gif(FILE *f, int *w, int *h, int *t) diff --git a/graphics/imlib/files/patch-ac b/graphics/imlib/files/patch-ac index 1d81083ae0f3..457515765db9 100644 --- a/graphics/imlib/files/patch-ac +++ b/graphics/imlib/files/patch-ac @@ -1,44 +1,22 @@ ---- config/Makefile.in.orig Fri Feb 12 14:29:22 1999 -+++ config/Makefile.in Wed Feb 17 22:12:52 1999 -@@ -23,7 +23,7 @@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ --sysconfdir = @sysconfdir@ -+sysconfdir = @sysconfdir@/imlib - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ ---- Imlib/Makefile.in.orig Fri Feb 12 14:29:20 1999 -+++ Imlib/Makefile.in Wed Feb 17 22:13:37 1999 -@@ -123,11 +123,11 @@ +--- Imlib/Makefile.in.orig Thu Feb 25 02:17:45 1999 ++++ Imlib/Makefile.in Mon Mar 1 19:55:08 1999 +@@ -123,7 +123,7 @@ libImlib_la_SOURCES = cache.c colors.c load.c misc.c rend.c utils.c save.c snprintf.c --libImlib_la_LDFLAGS = -version-info 10:3:9 +-libImlib_la_LDFLAGS = -version-info 10:4:9 +libImlib_la_LDFLAGS = -version-info 2:1:0 #libImlib_la_LDDADD = $(SUPPORT_LIBS) libImlib_la_LIBADD = $(SUPPORT_LIBS) --DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\" -DCJPEG_PROG=\"@CJPEG_PROG@\" -DCONVERT_PATH=\"@CONVERT_PATH@\" -DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imrc\" -+DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\" -DCJPEG_PROG=\"@CJPEG_PROG@\" -DCONVERT_PATH=\"@CONVERT_PATH@\" -DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imlib/imrc\" - - - INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. $(X_CFLAGS) ---- gdk_imlib/Makefile.in.orig Fri Feb 12 14:29:16 1999 -+++ gdk_imlib/Makefile.in Wed Feb 17 22:14:09 1999 -@@ -157,12 +157,12 @@ +--- gdk_imlib/Makefile.in.orig Thu Feb 25 02:17:39 1999 ++++ gdk_imlib/Makefile.in Mon Mar 1 19:56:18 1999 +@@ -157,7 +157,7 @@ libgdk_imlib_la_SOURCES = cache.c colors.c globals.c load.c misc.c rend.c utils.c save.c modules.c --libgdk_imlib_la_LDFLAGS = -version-info 10:3:9 +-libgdk_imlib_la_LDFLAGS = -version-info 10:4:9 +libgdk_imlib_la_LDFLAGS = -version-info 2:1:0 libgdk_imlib_la_LIBADD = $(GMODULE_LIBS) include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h - --DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\" -DCJPEG_PROG=\"@CJPEG_PROG@\" -DCONVERT_PATH=\"@CONVERT_PATH@\" -DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imrc\" -DIMLIB_LIB=\""$(libdir)"\" -+DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\" -DCJPEG_PROG=\"@CJPEG_PROG@\" -DCONVERT_PATH=\"@CONVERT_PATH@\" -DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imlib/imrc\" -DIMLIB_LIB=\""$(libdir)"\" - - - INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. $(GTK_CFLAGS) $(X_CFLAGS) $(GMODULE_FLAGS) diff --git a/graphics/imlib/pkg-plist b/graphics/imlib/pkg-plist index 782906f0873f..5fcdb7dd3c00 100644 --- a/graphics/imlib/pkg-plist +++ b/graphics/imlib/pkg-plist @@ -1,5 +1,5 @@ -bin/imlib_config bin/imlib-config +bin/imlib_config etc/imlib/im_palette.pal etc/imlib/imrc include/Imlib.h @@ -16,6 +16,38 @@ lib/libgdk_imlib.a lib/libgdk_imlib.la lib/libgdk_imlib.so lib/libgdk_imlib.so.2.1 +lib/libimlib-bmp.a +lib/libimlib-bmp.la +lib/libimlib-bmp.so +lib/libimlib-bmp.so.0 +lib/libimlib-gif.a +lib/libimlib-gif.la +lib/libimlib-gif.so +lib/libimlib-gif.so.0 +lib/libimlib-jpeg.a +lib/libimlib-jpeg.la +lib/libimlib-jpeg.so +lib/libimlib-jpeg.so.0 +lib/libimlib-png.a +lib/libimlib-png.la +lib/libimlib-png.so +lib/libimlib-png.so.0 +lib/libimlib-ppm.a +lib/libimlib-ppm.la +lib/libimlib-ppm.so +lib/libimlib-ppm.so.0 +lib/libimlib-ps.a +lib/libimlib-ps.la +lib/libimlib-ps.so +lib/libimlib-ps.so.0 +lib/libimlib-tiff.a +lib/libimlib-tiff.la +lib/libimlib-tiff.so +lib/libimlib-tiff.so.0 +lib/libimlib-xpm.a +lib/libimlib-xpm.la +lib/libimlib-xpm.so +lib/libimlib-xpm.so.0 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @dirrm etc/imlib diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile index 6fb2f6d4a3a0..3d7cdf3afe80 100644 --- a/graphics/imlib2-tmp/Makefile +++ b/graphics/imlib2-tmp/Makefile @@ -1,15 +1,15 @@ # New ports collection makefile for: imlib -# Version required: 1.9.3 +# Version required: 1.9.4 # Date created: 10 June 1997 # Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp> # -# $Id: Makefile,v 1.43 1999/01/23 07:05:26 vanilla Exp $ +# $Id: Makefile,v 1.44 1999/02/18 04:55:07 vanilla Exp $ # -DISTNAME= imlib-1.9.3 +DISTNAME= imlib-1.9.4 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= imlib +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= vanilla@FreeBSD.ORG @@ -17,17 +17,25 @@ LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff34 \ gif.3:${PORTSDIR}/graphics/giflib \ - gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel + gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 USE_GMAKE= yes USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ +CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ + -I${LOCALBASE}/include/giflib" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib" post-install: @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib - ${CAT} ${PKGDIR}/MESSAGE + @${ECHO} '************************************************************' + @${ECHO} '* *' + @${ECHO} '* If you want to use autoconf with imlib, *' + @${ECHO} '* Please copy imlib.m4 to /usr/local/share/aclocal *' + @${ECHO} '* by yourself, thanks. *' + @${ECHO} '* *' + @${ECHO} '************************************************************' .include <bsd.port.mk> diff --git a/graphics/imlib2-tmp/distinfo b/graphics/imlib2-tmp/distinfo index 378d40d12dc4..b82d90eab08c 100644 --- a/graphics/imlib2-tmp/distinfo +++ b/graphics/imlib2-tmp/distinfo @@ -1 +1 @@ -MD5 (imlib-1.9.3.tar.gz) = 52e09ec343d2123609a7e1bcd72a76f9 +MD5 (imlib-1.9.4.tar.gz) = 8d0e50e28a5b203ff76f114bb38627c7 diff --git a/graphics/imlib2-tmp/files/patch-aa b/graphics/imlib2-tmp/files/patch-aa index cb282fe13003..1d43b872d636 100644 --- a/graphics/imlib2-tmp/files/patch-aa +++ b/graphics/imlib2-tmp/files/patch-aa @@ -1,13 +1,13 @@ ---- configure.orig Fri Feb 12 14:06:46 1999 -+++ configure Thu Feb 18 00:47:01 1999 +--- configure.orig Thu Feb 25 01:44:38 1999 ++++ configure Mon Mar 1 20:30:08 1999 @@ -2304,8 +2304,8 @@ echo "configure:2305: checking If dynamic linking works on this system" >&5 oLIBS="$LIBS" oCFLAGS="$CFLAGS" - LIBS="$LIBS `glib-config --libs gmodule`" - CFLAGS="$CFLAGS `glib-config --cflags gmodule`" -+ LIBS="$LIBS `glib11d-config --libs gmodule`" -+ CFLAGS="$CFLAGS `glib11d-config --cflags gmodule`" ++ LIBS="$LIBS `glib12-config --libs gmodule`" ++ CFLAGS="$CFLAGS `glib12-config --cflags gmodule`" if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else @@ -17,8 +17,8 @@ - GMODULE_LIBS="`glib-config --libs gmodule`" - GMODULE_FLAGS="`glib-config --cflags gmodule`" -+ GMODULE_LIBS="`glib11d-config --libs gmodule`" -+ GMODULE_FLAGS="`glib11d-config --cflags gmodule`" ++ GMODULE_LIBS="`glib12-config --libs gmodule`" ++ GMODULE_FLAGS="`glib12-config --cflags gmodule`" echo "$ac_t""yes" 1>&6 @@ -40,24 +40,3 @@ cat > conftest.$ac_ext <<EOF #line 4494 "configure" #include "confdefs.h" -@@ -4715,16 +4715,16 @@ - - - --ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 --echo "configure:4721: checking for gif_lib.h" >&5 -+ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6 -+echo "configure:4721: checking for giflib/gif_lib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF - #line 4726 "configure" - #include "confdefs.h" --#include <gif_lib.h> -+#include <giflib/gif_lib.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:4731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } diff --git a/graphics/imlib2-tmp/pkg-plist b/graphics/imlib2-tmp/pkg-plist index 782906f0873f..5fcdb7dd3c00 100644 --- a/graphics/imlib2-tmp/pkg-plist +++ b/graphics/imlib2-tmp/pkg-plist @@ -1,5 +1,5 @@ -bin/imlib_config bin/imlib-config +bin/imlib_config etc/imlib/im_palette.pal etc/imlib/imrc include/Imlib.h @@ -16,6 +16,38 @@ lib/libgdk_imlib.a lib/libgdk_imlib.la lib/libgdk_imlib.so lib/libgdk_imlib.so.2.1 +lib/libimlib-bmp.a +lib/libimlib-bmp.la +lib/libimlib-bmp.so +lib/libimlib-bmp.so.0 +lib/libimlib-gif.a +lib/libimlib-gif.la +lib/libimlib-gif.so +lib/libimlib-gif.so.0 +lib/libimlib-jpeg.a +lib/libimlib-jpeg.la +lib/libimlib-jpeg.so +lib/libimlib-jpeg.so.0 +lib/libimlib-png.a +lib/libimlib-png.la +lib/libimlib-png.so +lib/libimlib-png.so.0 +lib/libimlib-ppm.a +lib/libimlib-ppm.la +lib/libimlib-ppm.so +lib/libimlib-ppm.so.0 +lib/libimlib-ps.a +lib/libimlib-ps.la +lib/libimlib-ps.so +lib/libimlib-ps.so.0 +lib/libimlib-tiff.a +lib/libimlib-tiff.la +lib/libimlib-tiff.so +lib/libimlib-tiff.so.0 +lib/libimlib-xpm.a +lib/libimlib-xpm.la +lib/libimlib-xpm.so +lib/libimlib-xpm.so.0 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @dirrm etc/imlib diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index 6fb2f6d4a3a0..3d7cdf3afe80 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -1,15 +1,15 @@ # New ports collection makefile for: imlib -# Version required: 1.9.3 +# Version required: 1.9.4 # Date created: 10 June 1997 # Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp> # -# $Id: Makefile,v 1.43 1999/01/23 07:05:26 vanilla Exp $ +# $Id: Makefile,v 1.44 1999/02/18 04:55:07 vanilla Exp $ # -DISTNAME= imlib-1.9.3 +DISTNAME= imlib-1.9.4 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= imlib +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= vanilla@FreeBSD.ORG @@ -17,17 +17,25 @@ LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff34 \ gif.3:${PORTSDIR}/graphics/giflib \ - gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel + gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 USE_GMAKE= yes USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ +CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ + -I${LOCALBASE}/include/giflib" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib" post-install: @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib - ${CAT} ${PKGDIR}/MESSAGE + @${ECHO} '************************************************************' + @${ECHO} '* *' + @${ECHO} '* If you want to use autoconf with imlib, *' + @${ECHO} '* Please copy imlib.m4 to /usr/local/share/aclocal *' + @${ECHO} '* by yourself, thanks. *' + @${ECHO} '* *' + @${ECHO} '************************************************************' .include <bsd.port.mk> diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo index 378d40d12dc4..b82d90eab08c 100644 --- a/graphics/imlib2/distinfo +++ b/graphics/imlib2/distinfo @@ -1 +1 @@ -MD5 (imlib-1.9.3.tar.gz) = 52e09ec343d2123609a7e1bcd72a76f9 +MD5 (imlib-1.9.4.tar.gz) = 8d0e50e28a5b203ff76f114bb38627c7 diff --git a/graphics/imlib2/files/patch-aa b/graphics/imlib2/files/patch-aa index cb282fe13003..1d43b872d636 100644 --- a/graphics/imlib2/files/patch-aa +++ b/graphics/imlib2/files/patch-aa @@ -1,13 +1,13 @@ ---- configure.orig Fri Feb 12 14:06:46 1999 -+++ configure Thu Feb 18 00:47:01 1999 +--- configure.orig Thu Feb 25 01:44:38 1999 ++++ configure Mon Mar 1 20:30:08 1999 @@ -2304,8 +2304,8 @@ echo "configure:2305: checking If dynamic linking works on this system" >&5 oLIBS="$LIBS" oCFLAGS="$CFLAGS" - LIBS="$LIBS `glib-config --libs gmodule`" - CFLAGS="$CFLAGS `glib-config --cflags gmodule`" -+ LIBS="$LIBS `glib11d-config --libs gmodule`" -+ CFLAGS="$CFLAGS `glib11d-config --cflags gmodule`" ++ LIBS="$LIBS `glib12-config --libs gmodule`" ++ CFLAGS="$CFLAGS `glib12-config --cflags gmodule`" if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else @@ -17,8 +17,8 @@ - GMODULE_LIBS="`glib-config --libs gmodule`" - GMODULE_FLAGS="`glib-config --cflags gmodule`" -+ GMODULE_LIBS="`glib11d-config --libs gmodule`" -+ GMODULE_FLAGS="`glib11d-config --cflags gmodule`" ++ GMODULE_LIBS="`glib12-config --libs gmodule`" ++ GMODULE_FLAGS="`glib12-config --cflags gmodule`" echo "$ac_t""yes" 1>&6 @@ -40,24 +40,3 @@ cat > conftest.$ac_ext <<EOF #line 4494 "configure" #include "confdefs.h" -@@ -4715,16 +4715,16 @@ - - - --ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 --echo "configure:4721: checking for gif_lib.h" >&5 -+ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6 -+echo "configure:4721: checking for giflib/gif_lib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF - #line 4726 "configure" - #include "confdefs.h" --#include <gif_lib.h> -+#include <giflib/gif_lib.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:4731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist index 782906f0873f..5fcdb7dd3c00 100644 --- a/graphics/imlib2/pkg-plist +++ b/graphics/imlib2/pkg-plist @@ -1,5 +1,5 @@ -bin/imlib_config bin/imlib-config +bin/imlib_config etc/imlib/im_palette.pal etc/imlib/imrc include/Imlib.h @@ -16,6 +16,38 @@ lib/libgdk_imlib.a lib/libgdk_imlib.la lib/libgdk_imlib.so lib/libgdk_imlib.so.2.1 +lib/libimlib-bmp.a +lib/libimlib-bmp.la +lib/libimlib-bmp.so +lib/libimlib-bmp.so.0 +lib/libimlib-gif.a +lib/libimlib-gif.la +lib/libimlib-gif.so +lib/libimlib-gif.so.0 +lib/libimlib-jpeg.a +lib/libimlib-jpeg.la +lib/libimlib-jpeg.so +lib/libimlib-jpeg.so.0 +lib/libimlib-png.a +lib/libimlib-png.la +lib/libimlib-png.so +lib/libimlib-png.so.0 +lib/libimlib-ppm.a +lib/libimlib-ppm.la +lib/libimlib-ppm.so +lib/libimlib-ppm.so.0 +lib/libimlib-ps.a +lib/libimlib-ps.la +lib/libimlib-ps.so +lib/libimlib-ps.so.0 +lib/libimlib-tiff.a +lib/libimlib-tiff.la +lib/libimlib-tiff.so +lib/libimlib-tiff.so.0 +lib/libimlib-xpm.a +lib/libimlib-xpm.la +lib/libimlib-xpm.so +lib/libimlib-xpm.so.0 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @dirrm etc/imlib diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 2ae3475b4854..7a585b282742 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -1,32 +1,35 @@ # New ports collection makefile for: gnumeric -# Version required: 0.6 +# Version required: 0.15 # Date created: 08 October 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.6 1999/01/14 20:58:40 vanilla Exp $ +# $Id: Makefile,v 1.7 1999/01/27 08:31:51 fenner Exp $ # -DISTNAME= gnumeric-0.6 -CATEGORIES= math +DISTNAME= gnumeric-0.15 +CATEGORIES= math gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnumeric +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -LIB_DEPENDS= xml.0:${PORTSDIR}/textproc/libxml \ - gnome.1:${PORTSDIR}/x11/gnomelibs \ - guile.4:${PORTSDIR}/lang/guile +BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ + python:${PORTSDIR}/lang/python +RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ + python:${PORTSDIR}/lang/python +LIB_DEPENDS= xml.0:${PORTSDIR}/textproc/libxml + +# implicit dependencies: +# gettext, xpm, gtk12, guile, gnomelibs USE_X_PREFIX= yes +USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ - --with-gnome=${X11BASE} -CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \ - -I${X11BASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ + --with-gnome=${X11BASE} --with-guile +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: diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo index 0b5453e9d40c..2be32608a144 100644 --- a/math/gnumeric/distinfo +++ b/math/gnumeric/distinfo @@ -1 +1 @@ -MD5 (gnumeric-0.6.tar.gz) = 269b2cf9d07c7ff53ef2cd789c05184f +MD5 (gnumeric-0.15.tar.gz) = e9f51ca42004b5ce0a91cca16b5ab7ee diff --git a/math/gnumeric/files/patch-aa b/math/gnumeric/files/patch-aa index 19da91d790de..1c57a9bcda2d 100644 --- a/math/gnumeric/files/patch-aa +++ b/math/gnumeric/files/patch-aa @@ -1,34 +1,15 @@ ---- configure.orig Tue Jan 5 08:57:49 1999 -+++ configure Fri Jan 15 04:19:33 1999 -@@ -1085,13 +1085,13 @@ - fi - - if test "$no_gnome_config" = "yes"; then -- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 --echo "configure:1090: checking for gnomeConf.sh file in $gnome_prefix" >&5 -- if test -f $gnome_prefix/gnomeConf.sh; then -+ echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6 -+echo "configure:1090: checking for gnomeConf.sh file in $prefix/share/gnome" >&5 -+ if test -f $prefix/share/gnome/gnomeConf.sh; then - echo "$ac_t""found" 1>&6 - echo "loading gnome configuration from" \ -- "$gnome_prefix/gnomeConf.sh" -- . $gnome_prefix/gnomeConf.sh -+ "$prefix/share/gnome/gnomeConf.sh" -+ . $prefix/share/gnome/gnomeConf.sh - - else - echo "$ac_t""not found" 1>&6 -@@ -2583,7 +2583,7 @@ +--- configure.orig Wed Feb 24 03:49:18 1999 ++++ configure Wed Feb 24 18:46:00 1999 +@@ -3309,7 +3309,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lxml `gnome-config --libs xml` $LIBS" -+LIBS="-lxml -lz $LIBS" ++LIBS="`xml-config --libs` $LIBS" cat > conftest.$ac_ext <<EOF - #line 2589 "configure" + #line 3315 "configure" #include "confdefs.h" -@@ -2614,7 +2614,7 @@ +@@ -3340,7 +3340,7 @@ @@ -37,3 +18,25 @@ else echo "$ac_t""no" 1>&6 +@@ -5557,15 +5557,15 @@ + fi + + +- USE_INCLUDED_LIBINTL=yes ++# USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.gmo + INSTOBJEXT=.mo + DATADIRNAME=share +- INTLDEPS='$(top_builddir)/intl/libintl.a' +- INTLLIBS=$INTLDEPS +- LIBS=`echo $LIBS | sed -e 's/-lintl//'` +- nls_cv_header_intl=intl/libintl.h +- nls_cv_header_libgt=intl/libgettext.h ++# INTLDEPS='$(top_builddir)/intl/libintl.a' ++# INTLLIBS=$INTLDEPS ++# LIBS=`echo $LIBS | sed -e 's/-lintl//'` ++# nls_cv_header_intl=intl/libintl.h ++# nls_cv_header_libgt=intl/libgettext.h + fi + + if test "$XGETTEXT" != ":"; then diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist index 8f095f2dff65..cbaca5a75b5c 100644 --- a/math/gnumeric/pkg-plist +++ b/math/gnumeric/pkg-plist @@ -2,16 +2,24 @@ bin/gnumeric bin/gnumeric-corba share/gnome/apps/Applications/gnumeric.desktop share/gnome/gnumeric/guile/gnumeric_startup.scm +share/gnome/gnumeric/perl/startup.pl share/gnome/gnumeric/plugins/libgnumguile.a share/gnome/gnumeric/plugins/libgnumguile.la share/gnome/gnumeric/plugins/libgnumguile.so share/gnome/gnumeric/plugins/libgnumguile.so.0 +share/gnome/gnumeric/plugins/libpython.a +share/gnome/gnumeric/plugins/libpython.la +share/gnome/gnumeric/plugins/libpython.so +share/gnome/gnumeric/plugins/libpython.so.0 share/gnome/gnumeric/plugins/libstat.a share/gnome/gnumeric/plugins/libstat.la share/gnome/gnumeric/plugins/libstat.so share/gnome/gnumeric/plugins/libstat.so.0 +share/gnome/gnumeric/python/gnumeric_startup.py +share/gnome/mc/templates/gnumeric.desktop share/gnome/mime-info/gnumeric.keys share/gnome/mime-info/gnumeric.mime +share/gnome/pixmaps/gnome-gnumeric-xl.png share/gnome/pixmaps/gnome-gnumeric.png share/locale/cs/LC_MESSAGES/gnumeric.mo share/locale/de/LC_MESSAGES/gnumeric.mo @@ -29,8 +37,11 @@ share/locale/it/LC_MESSAGES/gnumeric.mo share/locale/ja/LC_MESSAGES/gnumeric.mo share/locale/ko/LC_MESSAGES/gnumeric.mo share/locale/no/LC_MESSAGES/gnumeric.mo -share/locale/no_NO/LC_MESSAGES/gnumeric.mo +share/locale/pl/LC_MESSAGES/gnumeric.mo share/locale/pt/LC_MESSAGES/gnumeric.mo -@dirrm share/gnome/gnumeric/guile +share/locale/ru/LC_MESSAGES/gnumeric.mo +@dirrm share/gnome/gnumeric/python @dirrm share/gnome/gnumeric/plugins +@dirrm share/gnome/gnumeric/perl +@dirrm share/gnome/gnumeric/guile @dirrm share/gnome/gnumeric diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile index 2ae3475b4854..7a585b282742 100644 --- a/math/gnumeric2/Makefile +++ b/math/gnumeric2/Makefile @@ -1,32 +1,35 @@ # New ports collection makefile for: gnumeric -# Version required: 0.6 +# Version required: 0.15 # Date created: 08 October 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.6 1999/01/14 20:58:40 vanilla Exp $ +# $Id: Makefile,v 1.7 1999/01/27 08:31:51 fenner Exp $ # -DISTNAME= gnumeric-0.6 -CATEGORIES= math +DISTNAME= gnumeric-0.15 +CATEGORIES= math gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnumeric +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -LIB_DEPENDS= xml.0:${PORTSDIR}/textproc/libxml \ - gnome.1:${PORTSDIR}/x11/gnomelibs \ - guile.4:${PORTSDIR}/lang/guile +BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ + python:${PORTSDIR}/lang/python +RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ + python:${PORTSDIR}/lang/python +LIB_DEPENDS= xml.0:${PORTSDIR}/textproc/libxml + +# implicit dependencies: +# gettext, xpm, gtk12, guile, gnomelibs USE_X_PREFIX= yes +USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ - --with-gnome=${X11BASE} -CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \ - -I${X11BASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ + --with-gnome=${X11BASE} --with-guile +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: diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo index 0b5453e9d40c..2be32608a144 100644 --- a/math/gnumeric2/distinfo +++ b/math/gnumeric2/distinfo @@ -1 +1 @@ -MD5 (gnumeric-0.6.tar.gz) = 269b2cf9d07c7ff53ef2cd789c05184f +MD5 (gnumeric-0.15.tar.gz) = e9f51ca42004b5ce0a91cca16b5ab7ee diff --git a/math/gnumeric2/files/patch-aa b/math/gnumeric2/files/patch-aa index 19da91d790de..1c57a9bcda2d 100644 --- a/math/gnumeric2/files/patch-aa +++ b/math/gnumeric2/files/patch-aa @@ -1,34 +1,15 @@ ---- configure.orig Tue Jan 5 08:57:49 1999 -+++ configure Fri Jan 15 04:19:33 1999 -@@ -1085,13 +1085,13 @@ - fi - - if test "$no_gnome_config" = "yes"; then -- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 --echo "configure:1090: checking for gnomeConf.sh file in $gnome_prefix" >&5 -- if test -f $gnome_prefix/gnomeConf.sh; then -+ echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6 -+echo "configure:1090: checking for gnomeConf.sh file in $prefix/share/gnome" >&5 -+ if test -f $prefix/share/gnome/gnomeConf.sh; then - echo "$ac_t""found" 1>&6 - echo "loading gnome configuration from" \ -- "$gnome_prefix/gnomeConf.sh" -- . $gnome_prefix/gnomeConf.sh -+ "$prefix/share/gnome/gnomeConf.sh" -+ . $prefix/share/gnome/gnomeConf.sh - - else - echo "$ac_t""not found" 1>&6 -@@ -2583,7 +2583,7 @@ +--- configure.orig Wed Feb 24 03:49:18 1999 ++++ configure Wed Feb 24 18:46:00 1999 +@@ -3309,7 +3309,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lxml `gnome-config --libs xml` $LIBS" -+LIBS="-lxml -lz $LIBS" ++LIBS="`xml-config --libs` $LIBS" cat > conftest.$ac_ext <<EOF - #line 2589 "configure" + #line 3315 "configure" #include "confdefs.h" -@@ -2614,7 +2614,7 @@ +@@ -3340,7 +3340,7 @@ @@ -37,3 +18,25 @@ else echo "$ac_t""no" 1>&6 +@@ -5557,15 +5557,15 @@ + fi + + +- USE_INCLUDED_LIBINTL=yes ++# USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.gmo + INSTOBJEXT=.mo + DATADIRNAME=share +- INTLDEPS='$(top_builddir)/intl/libintl.a' +- INTLLIBS=$INTLDEPS +- LIBS=`echo $LIBS | sed -e 's/-lintl//'` +- nls_cv_header_intl=intl/libintl.h +- nls_cv_header_libgt=intl/libgettext.h ++# INTLDEPS='$(top_builddir)/intl/libintl.a' ++# INTLLIBS=$INTLDEPS ++# LIBS=`echo $LIBS | sed -e 's/-lintl//'` ++# nls_cv_header_intl=intl/libintl.h ++# nls_cv_header_libgt=intl/libgettext.h + fi + + if test "$XGETTEXT" != ":"; then diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist index 8f095f2dff65..cbaca5a75b5c 100644 --- a/math/gnumeric2/pkg-plist +++ b/math/gnumeric2/pkg-plist @@ -2,16 +2,24 @@ bin/gnumeric bin/gnumeric-corba share/gnome/apps/Applications/gnumeric.desktop share/gnome/gnumeric/guile/gnumeric_startup.scm +share/gnome/gnumeric/perl/startup.pl share/gnome/gnumeric/plugins/libgnumguile.a share/gnome/gnumeric/plugins/libgnumguile.la share/gnome/gnumeric/plugins/libgnumguile.so share/gnome/gnumeric/plugins/libgnumguile.so.0 +share/gnome/gnumeric/plugins/libpython.a +share/gnome/gnumeric/plugins/libpython.la +share/gnome/gnumeric/plugins/libpython.so +share/gnome/gnumeric/plugins/libpython.so.0 share/gnome/gnumeric/plugins/libstat.a share/gnome/gnumeric/plugins/libstat.la share/gnome/gnumeric/plugins/libstat.so share/gnome/gnumeric/plugins/libstat.so.0 +share/gnome/gnumeric/python/gnumeric_startup.py +share/gnome/mc/templates/gnumeric.desktop share/gnome/mime-info/gnumeric.keys share/gnome/mime-info/gnumeric.mime +share/gnome/pixmaps/gnome-gnumeric-xl.png share/gnome/pixmaps/gnome-gnumeric.png share/locale/cs/LC_MESSAGES/gnumeric.mo share/locale/de/LC_MESSAGES/gnumeric.mo @@ -29,8 +37,11 @@ share/locale/it/LC_MESSAGES/gnumeric.mo share/locale/ja/LC_MESSAGES/gnumeric.mo share/locale/ko/LC_MESSAGES/gnumeric.mo share/locale/no/LC_MESSAGES/gnumeric.mo -share/locale/no_NO/LC_MESSAGES/gnumeric.mo +share/locale/pl/LC_MESSAGES/gnumeric.mo share/locale/pt/LC_MESSAGES/gnumeric.mo -@dirrm share/gnome/gnumeric/guile +share/locale/ru/LC_MESSAGES/gnumeric.mo +@dirrm share/gnome/gnumeric/python @dirrm share/gnome/gnumeric/plugins +@dirrm share/gnome/gnumeric/perl +@dirrm share/gnome/gnumeric/guile @dirrm share/gnome/gnumeric diff --git a/misc/gnomeutils/Makefile b/misc/gnomeutils/Makefile index afa832d7eb62..638052b77150 100644 --- a/misc/gnomeutils/Makefile +++ b/misc/gnomeutils/Makefile @@ -1,21 +1,22 @@ # New ports collection makefile for: gnomeutils -# Version required: 0.99.5 +# Version required: 1.0.1 # Date created: 03 July 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.5 1999/01/27 08:31:51 fenner Exp $ +# $Id: Makefile,v 1.6 1999/02/02 09:56:05 vanilla Exp $ # -DISTNAME= gnome-utils-0.99.5 -PKGNAME= gnomeutils-0.99.5 -CATEGORIES= misc +DISTNAME= gnome-utils-1.0.1 +PKGNAME= gnomeutils-1.0.1 +CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-utils +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= obgnome.1:${PORTSDIR}/lang/gnomeobjc USE_X_PREFIX= yes USE_GMAKE= yes @@ -24,7 +25,7 @@ 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/gtk11d-config" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" MAN1= gtt.1 diff --git a/misc/gnomeutils/distinfo b/misc/gnomeutils/distinfo index 32cec07ed8c2..b35b2a17cd4c 100644 --- a/misc/gnomeutils/distinfo +++ b/misc/gnomeutils/distinfo @@ -1 +1 @@ -MD5 (gnome-utils-0.99.5.tar.gz) = 9eac5326842d1027edf2b959cbb23583 +MD5 (gnome-utils-1.0.1.tar.gz) = c267d32ddf310b3e9f70a2d915cccf5a diff --git a/misc/gnomeutils/files/patch-aa b/misc/gnomeutils/files/patch-aa index 7d8da8ddc7e7..2e73d96fd7b0 100644 --- a/misc/gnomeutils/files/patch-aa +++ b/misc/gnomeutils/files/patch-aa @@ -1,36 +1,20 @@ ---- configure.orig Tue Feb 2 09:42:09 1999 -+++ configure Tue Feb 2 09:43:37 1999 -@@ -1108,13 +1108,13 @@ - fi - - if test "$no_gnome_config" = "yes"; then -- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 --echo "configure:1113: checking for gnomeConf.sh file in $gnome_prefix" >&5 -- if test -f $gnome_prefix/gnomeConf.sh; then -+ echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6 -+echo "configure:1113: checking for gnomeConf.sh file in $prefix/share/gnome" >&5 -+ if test -f $prefix/share/gnome/gnomeConf.sh; then - echo "$ac_t""found" 1>&6 - echo "loading gnome configuration from" \ -- "$gnome_prefix/gnomeConf.sh" -- . $gnome_prefix/gnomeConf.sh -+ "$prefix/share/gnome/gnomeConf.sh" -+ . $prefix/share/gnome/gnomeConf.sh - - else - echo "$ac_t""not found" 1>&6 -@@ -3121,10 +3121,10 @@ - - if test $OBJECTIVE_C = yes; then +--- configure.orig Tue Mar 2 00:23:40 1999 ++++ configure Sat Mar 6 23:55:23 1999 +@@ -3143,7 +3143,7 @@ -- echo $ac_n "checking for obGnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 --echo "configure:3126: checking for obGnomeConf.sh file in $gnome_prefix" >&5 -- if test -f $gnome_prefix/obGnomeConf.sh; then -- . $gnome_prefix/obGnomeConf.sh -+ echo $ac_n "checking for obGnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6 -+echo "configure:3126: checking for obGnomeConf.sh file in $prefix/share/gnome" >&5 -+ if test -f $prefix/share/gnome/obGnomeConf.sh; then -+ . $prefix/share/gnome/obGnomeConf.sh - echo "$ac_t""found" 1>&6 - else - echo "$ac_t""not found" 1>&6 + echo $ac_n "checking for an obGnomeConf.sh""... $ac_c" 1>&6 + echo "configure:3146: checking for an obGnomeConf.sh" >&5 +- my_gnome_libdir=`$GNOME_CONFIG --libdir` ++ my_gnome_libdir=`$GNOME_CONFIG --sysconfdir` + if test -f $my_gnome_libdir/obGnomeConf.sh; then + . $my_gnome_libdir/obGnomeConf.sh + echo "$ac_t""found $my_gnome_libdir" 1>&6 +@@ -5389,7 +5389,7 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + CATOBJEXT=.mo +- DATADIRNAME=lib ++ DATADIRNAME=share + fi + rm -f conftest* + INSTOBJEXT=.mo diff --git a/misc/gnomeutils/pkg-plist b/misc/gnomeutils/pkg-plist index 61b605449a7b..43750e5c635e 100644 --- a/misc/gnomeutils/pkg-plist +++ b/misc/gnomeutils/pkg-plist @@ -15,10 +15,11 @@ bin/gw bin/splac bin/splash share/gnome/apps/Applications/ghex.desktop -share/gnome/apps/Productivity/gtt.desktop -share/gnome/apps/System/gshutdown.desktop +share/gnome/apps/Applications/gtt.desktop +share/gnome/apps/Settings/gshutdown.desktop share/gnome/apps/Utilities/gcalc.desktop share/gnome/apps/Utilities/gcolorsel.desktop +share/gnome/apps/Utilities/gdiskfree.desktop share/gnome/apps/Utilities/gfontsel.desktop share/gnome/apps/Utilities/gless.desktop share/gnome/apps/Utilities/gsearchtool.desktop @@ -39,6 +40,10 @@ share/gnome/help/gstripchart/C/index.html share/gnome/help/gstripchart/C/topic.dat share/gnome/help/gtt/C/index.html share/gnome/help/gtt/C/topic.dat +share/gnome/help/gtt/de/index.html +share/gnome/help/gtt/de/topic.dat +share/gnome/help/gtt/es/index.html +share/gnome/help/gtt/es/topic.dat share/gnome/pixmaps/gnome-ghex.png share/locale/cs/LC_MESSAGES/gnome-utils.mo share/locale/de/LC_MESSAGES/gnome-utils.mo @@ -46,20 +51,24 @@ share/locale/es/LC_MESSAGES/gnome-utils.mo share/locale/fi/LC_MESSAGES/gnome-utils.mo share/locale/fr/LC_MESSAGES/gnome-utils.mo share/locale/ga/LC_MESSAGES/gnome-utils.mo +share/locale/hu/LC_MESSAGES/gnome-utils.mo share/locale/it/LC_MESSAGES/gnome-utils.mo share/locale/ja/LC_MESSAGES/gnome-utils.mo share/locale/ko/LC_MESSAGES/gnome-utils.mo share/locale/no/LC_MESSAGES/gnome-utils.mo share/locale/pt/LC_MESSAGES/gnome-utils.mo +share/locale/ru/LC_MESSAGES/gnome-utils.mo share/locale/sv/LC_MESSAGES/gnome-utils.mo -@dirrm share/gnome/gstripchart -@dirrm share/gnome/help/ghex/C -@dirrm share/gnome/help/ghex/es -@dirrm share/gnome/help/ghex -@dirrm share/gnome/help/gshutdown/C -@dirrm share/gnome/help/gshutdown/es -@dirrm share/gnome/help/gshutdown -@dirrm share/gnome/help/gstripchart/C -@dirrm share/gnome/help/gstripchart +@dirrm share/gnome/help/gtt/es +@dirrm share/gnome/help/gtt/de @dirrm share/gnome/help/gtt/C @dirrm share/gnome/help/gtt +@dirrm share/gnome/help/gstripchart/C +@dirrm share/gnome/help/gstripchart +@dirrm share/gnome/help/gshutdown/es +@dirrm share/gnome/help/gshutdown/C +@dirrm share/gnome/help/gshutdown +@dirrm share/gnome/help/ghex/es +@dirrm share/gnome/help/ghex/C +@dirrm share/gnome/help/ghex +@dirrm share/gnome/gstripchart diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile index afa832d7eb62..638052b77150 100644 --- a/misc/gnomeutils2/Makefile +++ b/misc/gnomeutils2/Makefile @@ -1,21 +1,22 @@ # New ports collection makefile for: gnomeutils -# Version required: 0.99.5 +# Version required: 1.0.1 # Date created: 03 July 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.5 1999/01/27 08:31:51 fenner Exp $ +# $Id: Makefile,v 1.6 1999/02/02 09:56:05 vanilla Exp $ # -DISTNAME= gnome-utils-0.99.5 -PKGNAME= gnomeutils-0.99.5 -CATEGORIES= misc +DISTNAME= gnome-utils-1.0.1 +PKGNAME= gnomeutils-1.0.1 +CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-utils +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= obgnome.1:${PORTSDIR}/lang/gnomeobjc USE_X_PREFIX= yes USE_GMAKE= yes @@ -24,7 +25,7 @@ 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/gtk11d-config" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" MAN1= gtt.1 diff --git a/misc/gnomeutils2/distinfo b/misc/gnomeutils2/distinfo index 32cec07ed8c2..b35b2a17cd4c 100644 --- a/misc/gnomeutils2/distinfo +++ b/misc/gnomeutils2/distinfo @@ -1 +1 @@ -MD5 (gnome-utils-0.99.5.tar.gz) = 9eac5326842d1027edf2b959cbb23583 +MD5 (gnome-utils-1.0.1.tar.gz) = c267d32ddf310b3e9f70a2d915cccf5a diff --git a/misc/gnomeutils2/files/patch-aa b/misc/gnomeutils2/files/patch-aa index 7d8da8ddc7e7..2e73d96fd7b0 100644 --- a/misc/gnomeutils2/files/patch-aa +++ b/misc/gnomeutils2/files/patch-aa @@ -1,36 +1,20 @@ ---- configure.orig Tue Feb 2 09:42:09 1999 -+++ configure Tue Feb 2 09:43:37 1999 -@@ -1108,13 +1108,13 @@ - fi - - if test "$no_gnome_config" = "yes"; then -- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 --echo "configure:1113: checking for gnomeConf.sh file in $gnome_prefix" >&5 -- if test -f $gnome_prefix/gnomeConf.sh; then -+ echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6 -+echo "configure:1113: checking for gnomeConf.sh file in $prefix/share/gnome" >&5 -+ if test -f $prefix/share/gnome/gnomeConf.sh; then - echo "$ac_t""found" 1>&6 - echo "loading gnome configuration from" \ -- "$gnome_prefix/gnomeConf.sh" -- . $gnome_prefix/gnomeConf.sh -+ "$prefix/share/gnome/gnomeConf.sh" -+ . $prefix/share/gnome/gnomeConf.sh - - else - echo "$ac_t""not found" 1>&6 -@@ -3121,10 +3121,10 @@ - - if test $OBJECTIVE_C = yes; then +--- configure.orig Tue Mar 2 00:23:40 1999 ++++ configure Sat Mar 6 23:55:23 1999 +@@ -3143,7 +3143,7 @@ -- echo $ac_n "checking for obGnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 --echo "configure:3126: checking for obGnomeConf.sh file in $gnome_prefix" >&5 -- if test -f $gnome_prefix/obGnomeConf.sh; then -- . $gnome_prefix/obGnomeConf.sh -+ echo $ac_n "checking for obGnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6 -+echo "configure:3126: checking for obGnomeConf.sh file in $prefix/share/gnome" >&5 -+ if test -f $prefix/share/gnome/obGnomeConf.sh; then -+ . $prefix/share/gnome/obGnomeConf.sh - echo "$ac_t""found" 1>&6 - else - echo "$ac_t""not found" 1>&6 + echo $ac_n "checking for an obGnomeConf.sh""... $ac_c" 1>&6 + echo "configure:3146: checking for an obGnomeConf.sh" >&5 +- my_gnome_libdir=`$GNOME_CONFIG --libdir` ++ my_gnome_libdir=`$GNOME_CONFIG --sysconfdir` + if test -f $my_gnome_libdir/obGnomeConf.sh; then + . $my_gnome_libdir/obGnomeConf.sh + echo "$ac_t""found $my_gnome_libdir" 1>&6 +@@ -5389,7 +5389,7 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + CATOBJEXT=.mo +- DATADIRNAME=lib ++ DATADIRNAME=share + fi + rm -f conftest* + INSTOBJEXT=.mo diff --git a/misc/gnomeutils2/pkg-plist b/misc/gnomeutils2/pkg-plist index 61b605449a7b..43750e5c635e 100644 --- a/misc/gnomeutils2/pkg-plist +++ b/misc/gnomeutils2/pkg-plist @@ -15,10 +15,11 @@ bin/gw bin/splac bin/splash share/gnome/apps/Applications/ghex.desktop -share/gnome/apps/Productivity/gtt.desktop -share/gnome/apps/System/gshutdown.desktop +share/gnome/apps/Applications/gtt.desktop +share/gnome/apps/Settings/gshutdown.desktop share/gnome/apps/Utilities/gcalc.desktop share/gnome/apps/Utilities/gcolorsel.desktop +share/gnome/apps/Utilities/gdiskfree.desktop share/gnome/apps/Utilities/gfontsel.desktop share/gnome/apps/Utilities/gless.desktop share/gnome/apps/Utilities/gsearchtool.desktop @@ -39,6 +40,10 @@ share/gnome/help/gstripchart/C/index.html share/gnome/help/gstripchart/C/topic.dat share/gnome/help/gtt/C/index.html share/gnome/help/gtt/C/topic.dat +share/gnome/help/gtt/de/index.html +share/gnome/help/gtt/de/topic.dat +share/gnome/help/gtt/es/index.html +share/gnome/help/gtt/es/topic.dat share/gnome/pixmaps/gnome-ghex.png share/locale/cs/LC_MESSAGES/gnome-utils.mo share/locale/de/LC_MESSAGES/gnome-utils.mo @@ -46,20 +51,24 @@ share/locale/es/LC_MESSAGES/gnome-utils.mo share/locale/fi/LC_MESSAGES/gnome-utils.mo share/locale/fr/LC_MESSAGES/gnome-utils.mo share/locale/ga/LC_MESSAGES/gnome-utils.mo +share/locale/hu/LC_MESSAGES/gnome-utils.mo share/locale/it/LC_MESSAGES/gnome-utils.mo share/locale/ja/LC_MESSAGES/gnome-utils.mo share/locale/ko/LC_MESSAGES/gnome-utils.mo share/locale/no/LC_MESSAGES/gnome-utils.mo share/locale/pt/LC_MESSAGES/gnome-utils.mo +share/locale/ru/LC_MESSAGES/gnome-utils.mo share/locale/sv/LC_MESSAGES/gnome-utils.mo -@dirrm share/gnome/gstripchart -@dirrm share/gnome/help/ghex/C -@dirrm share/gnome/help/ghex/es -@dirrm share/gnome/help/ghex -@dirrm share/gnome/help/gshutdown/C -@dirrm share/gnome/help/gshutdown/es -@dirrm share/gnome/help/gshutdown -@dirrm share/gnome/help/gstripchart/C -@dirrm share/gnome/help/gstripchart +@dirrm share/gnome/help/gtt/es +@dirrm share/gnome/help/gtt/de @dirrm share/gnome/help/gtt/C @dirrm share/gnome/help/gtt +@dirrm share/gnome/help/gstripchart/C +@dirrm share/gnome/help/gstripchart +@dirrm share/gnome/help/gshutdown/es +@dirrm share/gnome/help/gshutdown/C +@dirrm share/gnome/help/gshutdown +@dirrm share/gnome/help/ghex/es +@dirrm share/gnome/help/ghex/C +@dirrm share/gnome/help/ghex +@dirrm share/gnome/gstripchart diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 7c9fdbdb2c9d..5ad347088d19 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: control-center -# Version required: 0.99.3.1 +# Version required: 1.0.1 # Date created: 29 Dec 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.4 1999/01/27 08:31:52 fenner Exp $ +# $Id: Makefile,v 1.5 1999/01/31 20:48:01 vanilla Exp $ # -DISTNAME= control-center-0.99.3.1 -PKGNAME= gnomecontrolcenter-0.99.3.1 +DISTNAME= control-center-1.0.1 +PKGNAME= gnomecontrolcenter-1.0.1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= control-center +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= vanilla@FreeBSD.ORG @@ -24,7 +24,7 @@ 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/gtk11d-config" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo index cdf113f00764..a3cdd5cebb34 100644 --- a/sysutils/gnome-control-center/distinfo +++ b/sysutils/gnome-control-center/distinfo @@ -1 +1 @@ -MD5 (control-center-0.99.3.1.tar.gz) = 38cba87ac9c5e7c2936029c33bdfdd74 +MD5 (control-center-1.0.1.tar.gz) = 8a95c168ed351ae2f14c18a0256e2ffb diff --git a/sysutils/gnome-control-center/files/patch-ad b/sysutils/gnome-control-center/files/patch-ad new file mode 100644 index 000000000000..c27189a35ee9 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-ad @@ -0,0 +1,11 @@ +--- capplets/wm-properties/wm-list.c.orig Tue Mar 2 22:53:29 1999 ++++ capplets/wm-properties/wm-list.c Tue Mar 2 22:53:52 1999 +@@ -210,7 +210,7 @@ + gchar *tempdir; + gchar *name; + +- tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/"); ++ tempdir = gnome_unconditional_datadir_file ("wm-properties/"); + wm_list_read_dir (tempdir, FALSE); + g_free (tempdir); + diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index d2038f5a2148..fe491fb06b90 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -1,24 +1,40 @@ bin/background-properties-capplet bin/bell-properties-capplet -bin/e-conf +bin/gnome-edit-properties-capplet bin/gnomecc bin/keyboard-properties bin/mouse-properties-capplet bin/screensaver-properties-capplet +bin/session-properties-capplet bin/sound-properties bin/theme-selector-capplet bin/ui-properties bin/url-properties +bin/wm-properties-capplet etc/CORBA/servers/gnomecc.gnorba +etc/cappletConf.sh include/capplet-widget.h lib/libcapplet.a lib/libcapplet.la lib/libcapplet.so -lib/libcapplet.so.0.99 +lib/libcapplet.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -share/gnome/cappletConf.sh -share/gnome/apps/System/gnomecc.desktop +share/gnome/apps/Settings/application.desktop +share/gnome/apps/Settings/background-properties.desktop +share/gnome/apps/Settings/bell-properties.desktop +share/gnome/apps/Settings/dialogs.desktop +share/gnome/apps/Settings/gnome-edit-properties.desktop +share/gnome/apps/Settings/gnomecc.desktop +share/gnome/apps/Settings/keyboard-properties.desktop +share/gnome/apps/Settings/mdi.desktop +share/gnome/apps/Settings/mouse-properties.desktop +share/gnome/apps/Settings/screensaver-properties.desktop +share/gnome/apps/Settings/session-properties.desktop +share/gnome/apps/Settings/sound-properties.desktop +share/gnome/apps/Settings/theme-selector.desktop +share/gnome/apps/Settings/url-properties.desktop +share/gnome/apps/Settings/wm-properties.desktop share/gnome/control-center/.data/Ant.desktop share/gnome/control-center/.data/Attraction.desktop share/gnome/control-center/.data/Blitspin.desktop @@ -90,33 +106,62 @@ share/gnome/control-center/.data/Xjack.desktop share/gnome/control-center/.data/Xlyap.desktop share/gnome/control-center/.data/Xroger.desktop share/gnome/control-center/.data/ant.png +share/gnome/control-center/.data/attraction.png +share/gnome/control-center/.data/blitspin.png share/gnome/control-center/.data/bouboule.png +share/gnome/control-center/.data/braid.png +share/gnome/control-center/.data/bsod.png +share/gnome/control-center/.data/bubbles.png +share/gnome/control-center/.data/coral.png +share/gnome/control-center/.data/crystal.png +share/gnome/control-center/.data/cynosure.png +share/gnome/control-center/.data/decayscreen.png share/gnome/control-center/.data/deco.png +share/gnome/control-center/.data/discrete.png +share/gnome/control-center/.data/drift.png +share/gnome/control-center/.data/epicycle.png +share/gnome/control-center/.data/flag.png +share/gnome/control-center/.data/flame.png +share/gnome/control-center/.data/forest.png +share/gnome/control-center/.data/goop.png +share/gnome/control-center/.data/grav.png +share/gnome/control-center/.data/greynetic.png +share/gnome/control-center/.data/halo.png +share/gnome/control-center/.data/helix.png +share/gnome/control-center/.data/hopalong.png +share/gnome/control-center/.data/hypercube.png +share/gnome/control-center/.data/ifs.png +share/gnome/control-center/.data/julia.png +share/gnome/control-center/.data/kaleidescope.png share/gnome/control-center/.data/laser.png +share/gnome/control-center/.data/lightning.png +share/gnome/control-center/.data/lisa.png share/gnome/control-center/.data/qix.png share/gnome/control-center/.data/starfish.png share/gnome/control-center/.directory -share/gnome/control-center/Appearances/.directory -share/gnome/control-center/Appearances/theme-selector.desktop -share/gnome/control-center/Appearances/ui-properties/.directory -share/gnome/control-center/Appearances/ui-properties/application.desktop -share/gnome/control-center/Appearances/ui-properties/dialogs.desktop -share/gnome/control-center/Appearances/ui-properties/mdi.desktop -share/gnome/control-center/Inputdevs/.directory -share/gnome/control-center/Inputdevs/bell-properties.desktop -share/gnome/control-center/Inputdevs/keyboard-properties.desktop -share/gnome/control-center/Inputdevs/mouse-properties.desktop +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 share/gnome/control-center/Multimedia/.directory +share/gnome/control-center/Multimedia/bell-properties.desktop share/gnome/control-center/Multimedia/sound-properties.desktop -share/gnome/control-center/WindowManager/.directory -share/gnome/control-center/Workspace/.directory -share/gnome/control-center/Workspace/Enlightenment.desktop -share/gnome/control-center/Workspace/background-properties.desktop -share/gnome/control-center/Workspace/screensaver-properties.desktop -share/gnome/control-center/Workspace/url-properties.desktop +share/gnome/control-center/Peripherals/.directory +share/gnome/control-center/Peripherals/keyboard-properties.desktop +share/gnome/control-center/Peripherals/mouse-properties.desktop +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 +share/gnome/control-center/gnome-edit-properties.desktop +share/gnome/control-center/session-properties.desktop +share/gnome/control-center/url-properties.desktop share/gnome/idl/control-center.idl share/gnome/pixmaps/control-center.png -share/locale/ca/LC_MESSAGES/control-center.mo +share/gnome/wm-properties/Enlightenment.desktop +share/gnome/wm-properties/IceWM.desktop +share/gnome/wm-properties/WindowMaker.desktop share/locale/cs/LC_MESSAGES/control-center.mo share/locale/da/LC_MESSAGES/control-center.mo share/locale/de/LC_MESSAGES/control-center.mo @@ -133,11 +178,10 @@ 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/control-center/.data -@dirrm share/gnome/control-center/Appearances/ui-properties -@dirrm share/gnome/control-center/Appearances -@dirrm share/gnome/control-center/Inputdevs +@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/WindowManager -@dirrm share/gnome/control-center/Workspace +@dirrm share/gnome/control-center/Desktop +@dirrm share/gnome/control-center/.data @dirrm share/gnome/control-center diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile index 7c9fdbdb2c9d..5ad347088d19 100644 --- a/sysutils/gnome-control-center1/Makefile +++ b/sysutils/gnome-control-center1/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: control-center -# Version required: 0.99.3.1 +# Version required: 1.0.1 # Date created: 29 Dec 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.4 1999/01/27 08:31:52 fenner Exp $ +# $Id: Makefile,v 1.5 1999/01/31 20:48:01 vanilla Exp $ # -DISTNAME= control-center-0.99.3.1 -PKGNAME= gnomecontrolcenter-0.99.3.1 +DISTNAME= control-center-1.0.1 +PKGNAME= gnomecontrolcenter-1.0.1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= control-center +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= vanilla@FreeBSD.ORG @@ -24,7 +24,7 @@ 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/gtk11d-config" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: diff --git a/sysutils/gnome-control-center1/distinfo b/sysutils/gnome-control-center1/distinfo index cdf113f00764..a3cdd5cebb34 100644 --- a/sysutils/gnome-control-center1/distinfo +++ b/sysutils/gnome-control-center1/distinfo @@ -1 +1 @@ -MD5 (control-center-0.99.3.1.tar.gz) = 38cba87ac9c5e7c2936029c33bdfdd74 +MD5 (control-center-1.0.1.tar.gz) = 8a95c168ed351ae2f14c18a0256e2ffb diff --git a/sysutils/gnome-control-center1/files/patch-ad b/sysutils/gnome-control-center1/files/patch-ad new file mode 100644 index 000000000000..c27189a35ee9 --- /dev/null +++ b/sysutils/gnome-control-center1/files/patch-ad @@ -0,0 +1,11 @@ +--- capplets/wm-properties/wm-list.c.orig Tue Mar 2 22:53:29 1999 ++++ capplets/wm-properties/wm-list.c Tue Mar 2 22:53:52 1999 +@@ -210,7 +210,7 @@ + gchar *tempdir; + gchar *name; + +- tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/"); ++ tempdir = gnome_unconditional_datadir_file ("wm-properties/"); + wm_list_read_dir (tempdir, FALSE); + g_free (tempdir); + diff --git a/sysutils/gnome-control-center1/pkg-plist b/sysutils/gnome-control-center1/pkg-plist index d2038f5a2148..fe491fb06b90 100644 --- a/sysutils/gnome-control-center1/pkg-plist +++ b/sysutils/gnome-control-center1/pkg-plist @@ -1,24 +1,40 @@ bin/background-properties-capplet bin/bell-properties-capplet -bin/e-conf +bin/gnome-edit-properties-capplet bin/gnomecc bin/keyboard-properties bin/mouse-properties-capplet bin/screensaver-properties-capplet +bin/session-properties-capplet bin/sound-properties bin/theme-selector-capplet bin/ui-properties bin/url-properties +bin/wm-properties-capplet etc/CORBA/servers/gnomecc.gnorba +etc/cappletConf.sh include/capplet-widget.h lib/libcapplet.a lib/libcapplet.la lib/libcapplet.so -lib/libcapplet.so.0.99 +lib/libcapplet.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -share/gnome/cappletConf.sh -share/gnome/apps/System/gnomecc.desktop +share/gnome/apps/Settings/application.desktop +share/gnome/apps/Settings/background-properties.desktop +share/gnome/apps/Settings/bell-properties.desktop +share/gnome/apps/Settings/dialogs.desktop +share/gnome/apps/Settings/gnome-edit-properties.desktop +share/gnome/apps/Settings/gnomecc.desktop +share/gnome/apps/Settings/keyboard-properties.desktop +share/gnome/apps/Settings/mdi.desktop +share/gnome/apps/Settings/mouse-properties.desktop +share/gnome/apps/Settings/screensaver-properties.desktop +share/gnome/apps/Settings/session-properties.desktop +share/gnome/apps/Settings/sound-properties.desktop +share/gnome/apps/Settings/theme-selector.desktop +share/gnome/apps/Settings/url-properties.desktop +share/gnome/apps/Settings/wm-properties.desktop share/gnome/control-center/.data/Ant.desktop share/gnome/control-center/.data/Attraction.desktop share/gnome/control-center/.data/Blitspin.desktop @@ -90,33 +106,62 @@ share/gnome/control-center/.data/Xjack.desktop share/gnome/control-center/.data/Xlyap.desktop share/gnome/control-center/.data/Xroger.desktop share/gnome/control-center/.data/ant.png +share/gnome/control-center/.data/attraction.png +share/gnome/control-center/.data/blitspin.png share/gnome/control-center/.data/bouboule.png +share/gnome/control-center/.data/braid.png +share/gnome/control-center/.data/bsod.png +share/gnome/control-center/.data/bubbles.png +share/gnome/control-center/.data/coral.png +share/gnome/control-center/.data/crystal.png +share/gnome/control-center/.data/cynosure.png +share/gnome/control-center/.data/decayscreen.png share/gnome/control-center/.data/deco.png +share/gnome/control-center/.data/discrete.png +share/gnome/control-center/.data/drift.png +share/gnome/control-center/.data/epicycle.png +share/gnome/control-center/.data/flag.png +share/gnome/control-center/.data/flame.png +share/gnome/control-center/.data/forest.png +share/gnome/control-center/.data/goop.png +share/gnome/control-center/.data/grav.png +share/gnome/control-center/.data/greynetic.png +share/gnome/control-center/.data/halo.png +share/gnome/control-center/.data/helix.png +share/gnome/control-center/.data/hopalong.png +share/gnome/control-center/.data/hypercube.png +share/gnome/control-center/.data/ifs.png +share/gnome/control-center/.data/julia.png +share/gnome/control-center/.data/kaleidescope.png share/gnome/control-center/.data/laser.png +share/gnome/control-center/.data/lightning.png +share/gnome/control-center/.data/lisa.png share/gnome/control-center/.data/qix.png share/gnome/control-center/.data/starfish.png share/gnome/control-center/.directory -share/gnome/control-center/Appearances/.directory -share/gnome/control-center/Appearances/theme-selector.desktop -share/gnome/control-center/Appearances/ui-properties/.directory -share/gnome/control-center/Appearances/ui-properties/application.desktop -share/gnome/control-center/Appearances/ui-properties/dialogs.desktop -share/gnome/control-center/Appearances/ui-properties/mdi.desktop -share/gnome/control-center/Inputdevs/.directory -share/gnome/control-center/Inputdevs/bell-properties.desktop -share/gnome/control-center/Inputdevs/keyboard-properties.desktop -share/gnome/control-center/Inputdevs/mouse-properties.desktop +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 share/gnome/control-center/Multimedia/.directory +share/gnome/control-center/Multimedia/bell-properties.desktop share/gnome/control-center/Multimedia/sound-properties.desktop -share/gnome/control-center/WindowManager/.directory -share/gnome/control-center/Workspace/.directory -share/gnome/control-center/Workspace/Enlightenment.desktop -share/gnome/control-center/Workspace/background-properties.desktop -share/gnome/control-center/Workspace/screensaver-properties.desktop -share/gnome/control-center/Workspace/url-properties.desktop +share/gnome/control-center/Peripherals/.directory +share/gnome/control-center/Peripherals/keyboard-properties.desktop +share/gnome/control-center/Peripherals/mouse-properties.desktop +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 +share/gnome/control-center/gnome-edit-properties.desktop +share/gnome/control-center/session-properties.desktop +share/gnome/control-center/url-properties.desktop share/gnome/idl/control-center.idl share/gnome/pixmaps/control-center.png -share/locale/ca/LC_MESSAGES/control-center.mo +share/gnome/wm-properties/Enlightenment.desktop +share/gnome/wm-properties/IceWM.desktop +share/gnome/wm-properties/WindowMaker.desktop share/locale/cs/LC_MESSAGES/control-center.mo share/locale/da/LC_MESSAGES/control-center.mo share/locale/de/LC_MESSAGES/control-center.mo @@ -133,11 +178,10 @@ 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/control-center/.data -@dirrm share/gnome/control-center/Appearances/ui-properties -@dirrm share/gnome/control-center/Appearances -@dirrm share/gnome/control-center/Inputdevs +@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/WindowManager -@dirrm share/gnome/control-center/Workspace +@dirrm share/gnome/control-center/Desktop +@dirrm share/gnome/control-center/.data @dirrm share/gnome/control-center diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index 1794d6caf874..1915b37f6850 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -1,16 +1,15 @@ # New ports collection makefile for: gtop -# Version required: 0.99.2 +# Version required: 1.0.1 # Date created: 28 September 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.6 1999/01/27 08:31:52 fenner Exp $ +# $Id: Makefile,v 1.7 1999/02/02 14:19:19 vanilla Exp $ # -DISTNAME= gtop-0.99.2 +DISTNAME= gtop-1.0.1 CATEGORIES= sysutils gnome -MASTER_SITES= ${MASTER_SITE_GNOME} \ - ftp://ftp.home-of-linux.org/pub/gtop/0.99.2/ -MASTER_SITE_SUBDIR= gtop +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com @@ -23,11 +22,7 @@ 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/gtk11d-config" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" -post-install: - chown root.kmem ${PREFIX}/bin/gtop - chmod 2555 ${PREFIX}/bin/gtop - .include <bsd.port.mk> diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo index a17a749f8909..c3a5606cd3e6 100644 --- a/sysutils/gnome-system-monitor/distinfo +++ b/sysutils/gnome-system-monitor/distinfo @@ -1 +1 @@ -MD5 (gtop-0.99.2.tar.gz) = fc0c5e0a39e9ecc9ec5c1bd91d7f5be0 +MD5 (gtop-1.0.1.tar.gz) = 20677ff8e3bb3f658ab0860969140cc2 diff --git a/sysutils/gnomecontrolcenter/Makefile b/sysutils/gnomecontrolcenter/Makefile index 7c9fdbdb2c9d..5ad347088d19 100644 --- a/sysutils/gnomecontrolcenter/Makefile +++ b/sysutils/gnomecontrolcenter/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: control-center -# Version required: 0.99.3.1 +# Version required: 1.0.1 # Date created: 29 Dec 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.4 1999/01/27 08:31:52 fenner Exp $ +# $Id: Makefile,v 1.5 1999/01/31 20:48:01 vanilla Exp $ # -DISTNAME= control-center-0.99.3.1 -PKGNAME= gnomecontrolcenter-0.99.3.1 +DISTNAME= control-center-1.0.1 +PKGNAME= gnomecontrolcenter-1.0.1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= control-center +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= vanilla@FreeBSD.ORG @@ -24,7 +24,7 @@ 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/gtk11d-config" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: diff --git a/sysutils/gnomecontrolcenter/distinfo b/sysutils/gnomecontrolcenter/distinfo index cdf113f00764..a3cdd5cebb34 100644 --- a/sysutils/gnomecontrolcenter/distinfo +++ b/sysutils/gnomecontrolcenter/distinfo @@ -1 +1 @@ -MD5 (control-center-0.99.3.1.tar.gz) = 38cba87ac9c5e7c2936029c33bdfdd74 +MD5 (control-center-1.0.1.tar.gz) = 8a95c168ed351ae2f14c18a0256e2ffb diff --git a/sysutils/gnomecontrolcenter/files/patch-ad b/sysutils/gnomecontrolcenter/files/patch-ad new file mode 100644 index 000000000000..c27189a35ee9 --- /dev/null +++ b/sysutils/gnomecontrolcenter/files/patch-ad @@ -0,0 +1,11 @@ +--- capplets/wm-properties/wm-list.c.orig Tue Mar 2 22:53:29 1999 ++++ capplets/wm-properties/wm-list.c Tue Mar 2 22:53:52 1999 +@@ -210,7 +210,7 @@ + gchar *tempdir; + gchar *name; + +- tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/"); ++ tempdir = gnome_unconditional_datadir_file ("wm-properties/"); + wm_list_read_dir (tempdir, FALSE); + g_free (tempdir); + diff --git a/sysutils/gnomecontrolcenter/pkg-plist b/sysutils/gnomecontrolcenter/pkg-plist index d2038f5a2148..fe491fb06b90 100644 --- a/sysutils/gnomecontrolcenter/pkg-plist +++ b/sysutils/gnomecontrolcenter/pkg-plist @@ -1,24 +1,40 @@ bin/background-properties-capplet bin/bell-properties-capplet -bin/e-conf +bin/gnome-edit-properties-capplet bin/gnomecc bin/keyboard-properties bin/mouse-properties-capplet bin/screensaver-properties-capplet +bin/session-properties-capplet bin/sound-properties bin/theme-selector-capplet bin/ui-properties bin/url-properties +bin/wm-properties-capplet etc/CORBA/servers/gnomecc.gnorba +etc/cappletConf.sh include/capplet-widget.h lib/libcapplet.a lib/libcapplet.la lib/libcapplet.so -lib/libcapplet.so.0.99 +lib/libcapplet.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -share/gnome/cappletConf.sh -share/gnome/apps/System/gnomecc.desktop +share/gnome/apps/Settings/application.desktop +share/gnome/apps/Settings/background-properties.desktop +share/gnome/apps/Settings/bell-properties.desktop +share/gnome/apps/Settings/dialogs.desktop +share/gnome/apps/Settings/gnome-edit-properties.desktop +share/gnome/apps/Settings/gnomecc.desktop +share/gnome/apps/Settings/keyboard-properties.desktop +share/gnome/apps/Settings/mdi.desktop +share/gnome/apps/Settings/mouse-properties.desktop +share/gnome/apps/Settings/screensaver-properties.desktop +share/gnome/apps/Settings/session-properties.desktop +share/gnome/apps/Settings/sound-properties.desktop +share/gnome/apps/Settings/theme-selector.desktop +share/gnome/apps/Settings/url-properties.desktop +share/gnome/apps/Settings/wm-properties.desktop share/gnome/control-center/.data/Ant.desktop share/gnome/control-center/.data/Attraction.desktop share/gnome/control-center/.data/Blitspin.desktop @@ -90,33 +106,62 @@ share/gnome/control-center/.data/Xjack.desktop share/gnome/control-center/.data/Xlyap.desktop share/gnome/control-center/.data/Xroger.desktop share/gnome/control-center/.data/ant.png +share/gnome/control-center/.data/attraction.png +share/gnome/control-center/.data/blitspin.png share/gnome/control-center/.data/bouboule.png +share/gnome/control-center/.data/braid.png +share/gnome/control-center/.data/bsod.png +share/gnome/control-center/.data/bubbles.png +share/gnome/control-center/.data/coral.png +share/gnome/control-center/.data/crystal.png +share/gnome/control-center/.data/cynosure.png +share/gnome/control-center/.data/decayscreen.png share/gnome/control-center/.data/deco.png +share/gnome/control-center/.data/discrete.png +share/gnome/control-center/.data/drift.png +share/gnome/control-center/.data/epicycle.png +share/gnome/control-center/.data/flag.png +share/gnome/control-center/.data/flame.png +share/gnome/control-center/.data/forest.png +share/gnome/control-center/.data/goop.png +share/gnome/control-center/.data/grav.png +share/gnome/control-center/.data/greynetic.png +share/gnome/control-center/.data/halo.png +share/gnome/control-center/.data/helix.png +share/gnome/control-center/.data/hopalong.png +share/gnome/control-center/.data/hypercube.png +share/gnome/control-center/.data/ifs.png +share/gnome/control-center/.data/julia.png +share/gnome/control-center/.data/kaleidescope.png share/gnome/control-center/.data/laser.png +share/gnome/control-center/.data/lightning.png +share/gnome/control-center/.data/lisa.png share/gnome/control-center/.data/qix.png share/gnome/control-center/.data/starfish.png share/gnome/control-center/.directory -share/gnome/control-center/Appearances/.directory -share/gnome/control-center/Appearances/theme-selector.desktop -share/gnome/control-center/Appearances/ui-properties/.directory -share/gnome/control-center/Appearances/ui-properties/application.desktop -share/gnome/control-center/Appearances/ui-properties/dialogs.desktop -share/gnome/control-center/Appearances/ui-properties/mdi.desktop -share/gnome/control-center/Inputdevs/.directory -share/gnome/control-center/Inputdevs/bell-properties.desktop -share/gnome/control-center/Inputdevs/keyboard-properties.desktop -share/gnome/control-center/Inputdevs/mouse-properties.desktop +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 share/gnome/control-center/Multimedia/.directory +share/gnome/control-center/Multimedia/bell-properties.desktop share/gnome/control-center/Multimedia/sound-properties.desktop -share/gnome/control-center/WindowManager/.directory -share/gnome/control-center/Workspace/.directory -share/gnome/control-center/Workspace/Enlightenment.desktop -share/gnome/control-center/Workspace/background-properties.desktop -share/gnome/control-center/Workspace/screensaver-properties.desktop -share/gnome/control-center/Workspace/url-properties.desktop +share/gnome/control-center/Peripherals/.directory +share/gnome/control-center/Peripherals/keyboard-properties.desktop +share/gnome/control-center/Peripherals/mouse-properties.desktop +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 +share/gnome/control-center/gnome-edit-properties.desktop +share/gnome/control-center/session-properties.desktop +share/gnome/control-center/url-properties.desktop share/gnome/idl/control-center.idl share/gnome/pixmaps/control-center.png -share/locale/ca/LC_MESSAGES/control-center.mo +share/gnome/wm-properties/Enlightenment.desktop +share/gnome/wm-properties/IceWM.desktop +share/gnome/wm-properties/WindowMaker.desktop share/locale/cs/LC_MESSAGES/control-center.mo share/locale/da/LC_MESSAGES/control-center.mo share/locale/de/LC_MESSAGES/control-center.mo @@ -133,11 +178,10 @@ 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/control-center/.data -@dirrm share/gnome/control-center/Appearances/ui-properties -@dirrm share/gnome/control-center/Appearances -@dirrm share/gnome/control-center/Inputdevs +@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/WindowManager -@dirrm share/gnome/control-center/Workspace +@dirrm share/gnome/control-center/Desktop +@dirrm share/gnome/control-center/.data @dirrm share/gnome/control-center diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile index 7c9fdbdb2c9d..5ad347088d19 100644 --- a/sysutils/gnomecontrolcenter2/Makefile +++ b/sysutils/gnomecontrolcenter2/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: control-center -# Version required: 0.99.3.1 +# Version required: 1.0.1 # Date created: 29 Dec 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.4 1999/01/27 08:31:52 fenner Exp $ +# $Id: Makefile,v 1.5 1999/01/31 20:48:01 vanilla Exp $ # -DISTNAME= control-center-0.99.3.1 -PKGNAME= gnomecontrolcenter-0.99.3.1 +DISTNAME= control-center-1.0.1 +PKGNAME= gnomecontrolcenter-1.0.1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= control-center +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= vanilla@FreeBSD.ORG @@ -24,7 +24,7 @@ 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/gtk11d-config" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo index cdf113f00764..a3cdd5cebb34 100644 --- a/sysutils/gnomecontrolcenter2/distinfo +++ b/sysutils/gnomecontrolcenter2/distinfo @@ -1 +1 @@ -MD5 (control-center-0.99.3.1.tar.gz) = 38cba87ac9c5e7c2936029c33bdfdd74 +MD5 (control-center-1.0.1.tar.gz) = 8a95c168ed351ae2f14c18a0256e2ffb diff --git a/sysutils/gnomecontrolcenter2/files/patch-ad b/sysutils/gnomecontrolcenter2/files/patch-ad new file mode 100644 index 000000000000..c27189a35ee9 --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-ad @@ -0,0 +1,11 @@ +--- capplets/wm-properties/wm-list.c.orig Tue Mar 2 22:53:29 1999 ++++ capplets/wm-properties/wm-list.c Tue Mar 2 22:53:52 1999 +@@ -210,7 +210,7 @@ + gchar *tempdir; + gchar *name; + +- tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/"); ++ tempdir = gnome_unconditional_datadir_file ("wm-properties/"); + wm_list_read_dir (tempdir, FALSE); + g_free (tempdir); + diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist index d2038f5a2148..fe491fb06b90 100644 --- a/sysutils/gnomecontrolcenter2/pkg-plist +++ b/sysutils/gnomecontrolcenter2/pkg-plist @@ -1,24 +1,40 @@ bin/background-properties-capplet bin/bell-properties-capplet -bin/e-conf +bin/gnome-edit-properties-capplet bin/gnomecc bin/keyboard-properties bin/mouse-properties-capplet bin/screensaver-properties-capplet +bin/session-properties-capplet bin/sound-properties bin/theme-selector-capplet bin/ui-properties bin/url-properties +bin/wm-properties-capplet etc/CORBA/servers/gnomecc.gnorba +etc/cappletConf.sh include/capplet-widget.h lib/libcapplet.a lib/libcapplet.la lib/libcapplet.so -lib/libcapplet.so.0.99 +lib/libcapplet.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -share/gnome/cappletConf.sh -share/gnome/apps/System/gnomecc.desktop +share/gnome/apps/Settings/application.desktop +share/gnome/apps/Settings/background-properties.desktop +share/gnome/apps/Settings/bell-properties.desktop +share/gnome/apps/Settings/dialogs.desktop +share/gnome/apps/Settings/gnome-edit-properties.desktop +share/gnome/apps/Settings/gnomecc.desktop +share/gnome/apps/Settings/keyboard-properties.desktop +share/gnome/apps/Settings/mdi.desktop +share/gnome/apps/Settings/mouse-properties.desktop +share/gnome/apps/Settings/screensaver-properties.desktop +share/gnome/apps/Settings/session-properties.desktop +share/gnome/apps/Settings/sound-properties.desktop +share/gnome/apps/Settings/theme-selector.desktop +share/gnome/apps/Settings/url-properties.desktop +share/gnome/apps/Settings/wm-properties.desktop share/gnome/control-center/.data/Ant.desktop share/gnome/control-center/.data/Attraction.desktop share/gnome/control-center/.data/Blitspin.desktop @@ -90,33 +106,62 @@ share/gnome/control-center/.data/Xjack.desktop share/gnome/control-center/.data/Xlyap.desktop share/gnome/control-center/.data/Xroger.desktop share/gnome/control-center/.data/ant.png +share/gnome/control-center/.data/attraction.png +share/gnome/control-center/.data/blitspin.png share/gnome/control-center/.data/bouboule.png +share/gnome/control-center/.data/braid.png +share/gnome/control-center/.data/bsod.png +share/gnome/control-center/.data/bubbles.png +share/gnome/control-center/.data/coral.png +share/gnome/control-center/.data/crystal.png +share/gnome/control-center/.data/cynosure.png +share/gnome/control-center/.data/decayscreen.png share/gnome/control-center/.data/deco.png +share/gnome/control-center/.data/discrete.png +share/gnome/control-center/.data/drift.png +share/gnome/control-center/.data/epicycle.png +share/gnome/control-center/.data/flag.png +share/gnome/control-center/.data/flame.png +share/gnome/control-center/.data/forest.png +share/gnome/control-center/.data/goop.png +share/gnome/control-center/.data/grav.png +share/gnome/control-center/.data/greynetic.png +share/gnome/control-center/.data/halo.png +share/gnome/control-center/.data/helix.png +share/gnome/control-center/.data/hopalong.png +share/gnome/control-center/.data/hypercube.png +share/gnome/control-center/.data/ifs.png +share/gnome/control-center/.data/julia.png +share/gnome/control-center/.data/kaleidescope.png share/gnome/control-center/.data/laser.png +share/gnome/control-center/.data/lightning.png +share/gnome/control-center/.data/lisa.png share/gnome/control-center/.data/qix.png share/gnome/control-center/.data/starfish.png share/gnome/control-center/.directory -share/gnome/control-center/Appearances/.directory -share/gnome/control-center/Appearances/theme-selector.desktop -share/gnome/control-center/Appearances/ui-properties/.directory -share/gnome/control-center/Appearances/ui-properties/application.desktop -share/gnome/control-center/Appearances/ui-properties/dialogs.desktop -share/gnome/control-center/Appearances/ui-properties/mdi.desktop -share/gnome/control-center/Inputdevs/.directory -share/gnome/control-center/Inputdevs/bell-properties.desktop -share/gnome/control-center/Inputdevs/keyboard-properties.desktop -share/gnome/control-center/Inputdevs/mouse-properties.desktop +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 share/gnome/control-center/Multimedia/.directory +share/gnome/control-center/Multimedia/bell-properties.desktop share/gnome/control-center/Multimedia/sound-properties.desktop -share/gnome/control-center/WindowManager/.directory -share/gnome/control-center/Workspace/.directory -share/gnome/control-center/Workspace/Enlightenment.desktop -share/gnome/control-center/Workspace/background-properties.desktop -share/gnome/control-center/Workspace/screensaver-properties.desktop -share/gnome/control-center/Workspace/url-properties.desktop +share/gnome/control-center/Peripherals/.directory +share/gnome/control-center/Peripherals/keyboard-properties.desktop +share/gnome/control-center/Peripherals/mouse-properties.desktop +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 +share/gnome/control-center/gnome-edit-properties.desktop +share/gnome/control-center/session-properties.desktop +share/gnome/control-center/url-properties.desktop share/gnome/idl/control-center.idl share/gnome/pixmaps/control-center.png -share/locale/ca/LC_MESSAGES/control-center.mo +share/gnome/wm-properties/Enlightenment.desktop +share/gnome/wm-properties/IceWM.desktop +share/gnome/wm-properties/WindowMaker.desktop share/locale/cs/LC_MESSAGES/control-center.mo share/locale/da/LC_MESSAGES/control-center.mo share/locale/de/LC_MESSAGES/control-center.mo @@ -133,11 +178,10 @@ 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/control-center/.data -@dirrm share/gnome/control-center/Appearances/ui-properties -@dirrm share/gnome/control-center/Appearances -@dirrm share/gnome/control-center/Inputdevs +@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/WindowManager -@dirrm share/gnome/control-center/Workspace +@dirrm share/gnome/control-center/Desktop +@dirrm share/gnome/control-center/.data @dirrm share/gnome/control-center diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile index 1794d6caf874..1915b37f6850 100644 --- a/sysutils/gnomesystemmonitor/Makefile +++ b/sysutils/gnomesystemmonitor/Makefile @@ -1,16 +1,15 @@ # New ports collection makefile for: gtop -# Version required: 0.99.2 +# Version required: 1.0.1 # Date created: 28 September 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.6 1999/01/27 08:31:52 fenner Exp $ +# $Id: Makefile,v 1.7 1999/02/02 14:19:19 vanilla Exp $ # -DISTNAME= gtop-0.99.2 +DISTNAME= gtop-1.0.1 CATEGORIES= sysutils gnome -MASTER_SITES= ${MASTER_SITE_GNOME} \ - ftp://ftp.home-of-linux.org/pub/gtop/0.99.2/ -MASTER_SITE_SUBDIR= gtop +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com @@ -23,11 +22,7 @@ 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/gtk11d-config" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" -post-install: - chown root.kmem ${PREFIX}/bin/gtop - chmod 2555 ${PREFIX}/bin/gtop - .include <bsd.port.mk> diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo index a17a749f8909..c3a5606cd3e6 100644 --- a/sysutils/gnomesystemmonitor/distinfo +++ b/sysutils/gnomesystemmonitor/distinfo @@ -1 +1 @@ -MD5 (gtop-0.99.2.tar.gz) = fc0c5e0a39e9ecc9ec5c1bd91d7f5be0 +MD5 (gtop-1.0.1.tar.gz) = 20677ff8e3bb3f658ab0860969140cc2 diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile index 1794d6caf874..1915b37f6850 100644 --- a/sysutils/gtop/Makefile +++ b/sysutils/gtop/Makefile @@ -1,16 +1,15 @@ # New ports collection makefile for: gtop -# Version required: 0.99.2 +# Version required: 1.0.1 # Date created: 28 September 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.6 1999/01/27 08:31:52 fenner Exp $ +# $Id: Makefile,v 1.7 1999/02/02 14:19:19 vanilla Exp $ # -DISTNAME= gtop-0.99.2 +DISTNAME= gtop-1.0.1 CATEGORIES= sysutils gnome -MASTER_SITES= ${MASTER_SITE_GNOME} \ - ftp://ftp.home-of-linux.org/pub/gtop/0.99.2/ -MASTER_SITE_SUBDIR= gtop +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com @@ -23,11 +22,7 @@ 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/gtk11d-config" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" -post-install: - chown root.kmem ${PREFIX}/bin/gtop - chmod 2555 ${PREFIX}/bin/gtop - .include <bsd.port.mk> diff --git a/sysutils/gtop/distinfo b/sysutils/gtop/distinfo index a17a749f8909..c3a5606cd3e6 100644 --- a/sysutils/gtop/distinfo +++ b/sysutils/gtop/distinfo @@ -1 +1 @@ -MD5 (gtop-0.99.2.tar.gz) = fc0c5e0a39e9ecc9ec5c1bd91d7f5be0 +MD5 (gtop-1.0.1.tar.gz) = 20677ff8e3bb3f658ab0860969140cc2 diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile index 15440eb530d9..ef30bc49cb32 100644 --- a/textproc/libxml/Makefile +++ b/textproc/libxml/Makefile @@ -1,15 +1,15 @@ # New ports collection makefile for: libxml -# Version required: 0.99.8 +# Version required: 1.0.0 # Date created: 28 September 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.6 1999/01/31 19:06:19 vanilla Exp $ +# $Id: Makefile,v 1.7 1999/02/24 22:12:09 vanilla Exp $ # -DISTNAME= libxml-0.99.8 +DISTNAME= libxml-1.0.0 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= libxml +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com diff --git a/textproc/libxml/distinfo b/textproc/libxml/distinfo index 23ef42e5d15d..d73d4fb0a0ff 100644 --- a/textproc/libxml/distinfo +++ b/textproc/libxml/distinfo @@ -1 +1 @@ -MD5 (libxml-0.99.8.tar.gz) = ea51896c06b09bc2bee2b987cca2679a +MD5 (libxml-1.0.0.tar.gz) = 50c6631b4feb0cd6360ae2225fef0fe8 diff --git a/textproc/libxml/files/patch-aa b/textproc/libxml/files/patch-aa index e0422ab03404..4e29579d03dd 100644 --- a/textproc/libxml/files/patch-aa +++ b/textproc/libxml/files/patch-aa @@ -1,5 +1,14 @@ ---- Makefile.in.orig Wed Feb 17 02:43:25 1999 -+++ Makefile.in Wed Feb 24 07:42:58 1999 +--- Makefile.in.orig Thu Feb 25 13:01:50 1999 ++++ Makefile.in Wed Mar 3 13:15:47 1999 +@@ -94,7 +94,7 @@ + + + xmlincdir = $(includedir)/gnome-xml +-xmlinc_HEADERS = entities.h encoding.h parser.h parserInternals.h debugXML.h tree.h valid.h ++xmlinc_HEADERS = entities.h encoding.h error.h parser.h parserInternals.h debugXML.h tree.h valid.h + + + DEPS = $(top_builddir)/libxml.la @@ -105,7 +105,7 @@ tester_DEPENDENCIES = $(DEPS) tester_LDADD = $(LDADDS) @@ -8,8 +17,8 @@ +confexecdir = $(sysconfdir) confexec_DATA = xmlConf.sh - EXTRA_DIST = xmlConf.sh.in libxml.spec doc/xml.html doc/structure.gif doc/DOM.gif -@@ -513,7 +513,7 @@ + EXTRA_DIST = xmlConf.sh.in libxml.spec.in +@@ -518,7 +518,7 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-binSCRIPTS \ uninstall-confexecDATA uninstall-xmlincHEADERS uninstall: uninstall-recursive @@ -18,3 +27,28 @@ $(HEADERS) config.h all-redirect: all-recursive-am install-strip: +--- doc/Makefile.in.orig Thu Feb 25 13:01:51 1999 ++++ doc/Makefile.in Tue Mar 2 20:39:23 1999 +@@ -89,7 +89,7 @@ + # The directory containing the source code (if it contains documentation). + DOC_SOURCE_DIR = .. + +-HTML_DIR = $(datadir)/gnome-xml/html ++HTML_DIR = $(datadir) + + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -227,10 +227,9 @@ + + install-data-local: + install -d -m 0755 $(TARGET_DIR) +- -install -m 0644 $(srcdir)/xml.html $(srcdir)/structure.gif $(srcdir)/DOM.gif $(TARGET_DIR) +- -install -m 0644 $(srcdir)/html/*.html $(TARGET_DIR) +- -install -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR) +- -gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR) ++ -install -c -m 0644 $(srcdir)/xml.html $(srcdir)/structure.gif $(srcdir)/DOM.gif $(TARGET_DIR) ++ -install -c -m 0644 $(srcdir)/html/*.html $(TARGET_DIR) ++ -install -c -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR) + + dist-hook: + (cd $(srcdir) ; tar cvf - xml.html structure.gif DOM.gif html/*.html html/*.sgml) | (cd $(distdir); tar xf -) diff --git a/textproc/libxml/pkg-plist b/textproc/libxml/pkg-plist index 38938a3fc69d..4a5db9d97c60 100644 --- a/textproc/libxml/pkg-plist +++ b/textproc/libxml/pkg-plist @@ -3,7 +3,9 @@ etc/xmlConf.sh include/gnome-xml/debugXML.h include/gnome-xml/encoding.h include/gnome-xml/entities.h +include/gnome-xml/error.h include/gnome-xml/parser.h +include/gnome-xml/parserInternals.h include/gnome-xml/tree.h include/gnome-xml/valid.h lib/libxml.a @@ -12,4 +14,17 @@ lib/libxml.so lib/libxml.so.0 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R +share/gnome-xml/DOM.gif +share/gnome-xml/book1.html +share/gnome-xml/gnome-xml-entities.html +share/gnome-xml/gnome-xml-error.html +share/gnome-xml/gnome-xml-parser.html +share/gnome-xml/gnome-xml-parserinternals.html +share/gnome-xml/gnome-xml-tree.html +share/gnome-xml/gnome-xml-valid.html +share/gnome-xml/index.sgml +share/gnome-xml/libxml.html +share/gnome-xml/structure.gif +share/gnome-xml/xml.html +@dirrm share/gnome-xml @dirrm include/gnome-xml diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index 15440eb530d9..ef30bc49cb32 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -1,15 +1,15 @@ # New ports collection makefile for: libxml -# Version required: 0.99.8 +# Version required: 1.0.0 # Date created: 28 September 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.6 1999/01/31 19:06:19 vanilla Exp $ +# $Id: Makefile,v 1.7 1999/02/24 22:12:09 vanilla Exp $ # -DISTNAME= libxml-0.99.8 +DISTNAME= libxml-1.0.0 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= libxml +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo index 23ef42e5d15d..d73d4fb0a0ff 100644 --- a/textproc/libxml2/distinfo +++ b/textproc/libxml2/distinfo @@ -1 +1 @@ -MD5 (libxml-0.99.8.tar.gz) = ea51896c06b09bc2bee2b987cca2679a +MD5 (libxml-1.0.0.tar.gz) = 50c6631b4feb0cd6360ae2225fef0fe8 diff --git a/textproc/libxml2/files/patch-aa b/textproc/libxml2/files/patch-aa index e0422ab03404..4e29579d03dd 100644 --- a/textproc/libxml2/files/patch-aa +++ b/textproc/libxml2/files/patch-aa @@ -1,5 +1,14 @@ ---- Makefile.in.orig Wed Feb 17 02:43:25 1999 -+++ Makefile.in Wed Feb 24 07:42:58 1999 +--- Makefile.in.orig Thu Feb 25 13:01:50 1999 ++++ Makefile.in Wed Mar 3 13:15:47 1999 +@@ -94,7 +94,7 @@ + + + xmlincdir = $(includedir)/gnome-xml +-xmlinc_HEADERS = entities.h encoding.h parser.h parserInternals.h debugXML.h tree.h valid.h ++xmlinc_HEADERS = entities.h encoding.h error.h parser.h parserInternals.h debugXML.h tree.h valid.h + + + DEPS = $(top_builddir)/libxml.la @@ -105,7 +105,7 @@ tester_DEPENDENCIES = $(DEPS) tester_LDADD = $(LDADDS) @@ -8,8 +17,8 @@ +confexecdir = $(sysconfdir) confexec_DATA = xmlConf.sh - EXTRA_DIST = xmlConf.sh.in libxml.spec doc/xml.html doc/structure.gif doc/DOM.gif -@@ -513,7 +513,7 @@ + EXTRA_DIST = xmlConf.sh.in libxml.spec.in +@@ -518,7 +518,7 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-binSCRIPTS \ uninstall-confexecDATA uninstall-xmlincHEADERS uninstall: uninstall-recursive @@ -18,3 +27,28 @@ $(HEADERS) config.h all-redirect: all-recursive-am install-strip: +--- doc/Makefile.in.orig Thu Feb 25 13:01:51 1999 ++++ doc/Makefile.in Tue Mar 2 20:39:23 1999 +@@ -89,7 +89,7 @@ + # The directory containing the source code (if it contains documentation). + DOC_SOURCE_DIR = .. + +-HTML_DIR = $(datadir)/gnome-xml/html ++HTML_DIR = $(datadir) + + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -227,10 +227,9 @@ + + install-data-local: + install -d -m 0755 $(TARGET_DIR) +- -install -m 0644 $(srcdir)/xml.html $(srcdir)/structure.gif $(srcdir)/DOM.gif $(TARGET_DIR) +- -install -m 0644 $(srcdir)/html/*.html $(TARGET_DIR) +- -install -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR) +- -gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR) ++ -install -c -m 0644 $(srcdir)/xml.html $(srcdir)/structure.gif $(srcdir)/DOM.gif $(TARGET_DIR) ++ -install -c -m 0644 $(srcdir)/html/*.html $(TARGET_DIR) ++ -install -c -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR) + + dist-hook: + (cd $(srcdir) ; tar cvf - xml.html structure.gif DOM.gif html/*.html html/*.sgml) | (cd $(distdir); tar xf -) diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist index 38938a3fc69d..4a5db9d97c60 100644 --- a/textproc/libxml2/pkg-plist +++ b/textproc/libxml2/pkg-plist @@ -3,7 +3,9 @@ etc/xmlConf.sh include/gnome-xml/debugXML.h include/gnome-xml/encoding.h include/gnome-xml/entities.h +include/gnome-xml/error.h include/gnome-xml/parser.h +include/gnome-xml/parserInternals.h include/gnome-xml/tree.h include/gnome-xml/valid.h lib/libxml.a @@ -12,4 +14,17 @@ lib/libxml.so lib/libxml.so.0 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R +share/gnome-xml/DOM.gif +share/gnome-xml/book1.html +share/gnome-xml/gnome-xml-entities.html +share/gnome-xml/gnome-xml-error.html +share/gnome-xml/gnome-xml-parser.html +share/gnome-xml/gnome-xml-parserinternals.html +share/gnome-xml/gnome-xml-tree.html +share/gnome-xml/gnome-xml-valid.html +share/gnome-xml/index.sgml +share/gnome-xml/libxml.html +share/gnome-xml/structure.gif +share/gnome-xml/xml.html +@dirrm share/gnome-xml @dirrm include/gnome-xml diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile index 6045d1175fe7..b675aecca4b9 100644 --- a/www/libghttp/Makefile +++ b/www/libghttp/Makefile @@ -3,13 +3,13 @@ # Date Created: 24 Dec 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.3 1999/01/27 08:31:53 fenner Exp $ +# $Id: Makefile,v 1.4 1999/01/31 17:11:22 vanilla Exp $ # DISTNAME= libghttp-0.99.2 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= libghttp +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= vanilla@FreeBSD.ORG diff --git a/x11-fm/gnomemc/Makefile b/x11-fm/gnomemc/Makefile index bf2960bd66c2..df1ef6181c4c 100644 --- a/x11-fm/gnomemc/Makefile +++ b/x11-fm/gnomemc/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: gnomemc -# Version required: 4.5.10 +# Version required: 4.5.23 # Date created: 26 Jnuary 1999 # Whom: Jeremy Lea <reg@shale.csir.co.za> # -# $Id: Makefile,v 1.1.1.1 1999/01/31 20:57:11 vanilla Exp $ +# $Id: Makefile,v 1.2 1999/02/12 02:33:17 asami Exp $ # -DISTNAME= mc-4.5.10 -PKGNAME= gnomemc-4.5.10 +DISTNAME= mc-4.5.23 +PKGNAME= gnomemc-4.5.23 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= mc +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= reg@shale.csir.co.za @@ -18,7 +18,7 @@ BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore # implicit dependencies: -# gettext, glib11-devel, xpm, gnomelibs +# gettext, glib12, xpm, gnomelibs USE_X_PREFIX= yes USE_GMAKE= yes @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --without-edit -with-ncurses CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ MAKE="gmake" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ + GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" .include <bsd.port.mk> diff --git a/x11-fm/gnomemc/distinfo b/x11-fm/gnomemc/distinfo index 94bf014f4230..ec42a95ab3db 100644 --- a/x11-fm/gnomemc/distinfo +++ b/x11-fm/gnomemc/distinfo @@ -1 +1 @@ -MD5 (mc-4.5.10.tar.gz) = 13d941d11913d18b05a71df45d5d86ed +MD5 (mc-4.5.23.tar.gz) = 9953d8a88957e814a25e8ee364739318 diff --git a/x11-fm/gnomemc/files/patch-aa b/x11-fm/gnomemc/files/patch-aa index 9fea13f95ff6..11938f5c31bb 100644 --- a/x11-fm/gnomemc/files/patch-aa +++ b/x11-fm/gnomemc/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Wed Jan 27 00:01:05 1999 -+++ configure Wed Jan 27 00:01:25 1999 -@@ -3188,15 +3188,15 @@ +--- configure.orig Tue Feb 16 05:58:53 1999 ++++ configure Tue Feb 23 00:58:48 1999 +@@ -3269,15 +3269,15 @@ fi @@ -22,7 +22,7 @@ fi if test "$XGETTEXT" != ":"; then -@@ -10362,7 +10362,7 @@ +@@ -10553,7 +10553,7 @@ if test -f /usr/include/ncurses.h then echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6 @@ -31,12 +31,12 @@ CURSES_INCLUDEDIR="" search_ncurses=false screen_manager="ncurses on /usr/include" -@@ -10676,6 +10676,8 @@ - fi - done +@@ -10681,6 +10681,8 @@ + fi + fi +CFLAGS="$CFLAGS $CURSES_INCLUDEDIR" +LIBS="$LIBS $CURSES_LIBS" - if test "x$screen_manager" = "xunknown"; then - cat >> confdefs.h <<\EOF + if $search_ncurses + then diff --git a/x11-fm/gnomemc/files/patch-ac b/x11-fm/gnomemc/files/patch-ac index 92961fd24cb7..f76939585b40 100644 --- a/x11-fm/gnomemc/files/patch-ac +++ b/x11-fm/gnomemc/files/patch-ac @@ -1,22 +1,24 @@ ---- Make.common.in.orig Tue Jan 26 22:36:55 1999 -+++ Make.common.in Tue Jan 26 22:40:12 1999 -@@ -19,15 +19,15 @@ +--- Make.common.in.orig Thu Feb 25 08:53:30 1999 ++++ Make.common.in Thu Feb 25 18:29:33 1999 +@@ -19,17 +19,17 @@ bindir = @bindir@ sysconfdir = @sysconfdir@ corbadir = $(sysconfdir)/CORBA/servers -libdir = $(exec_prefix)/lib/mc -+libdir = @localstatedir@/mc -idldir = $(prefix)/share/idl ++libdir = @localstatedir@/mc +idldir = @localstatedir@/idl suppbindir = $(libdir)/bin -gnewdir = $(prefix)/share/mc/templates +gnewdir = $(libdir)/templates tidir = $(libdir)/term extfsdir = $(libdir)/extfs + confdir = $(prefix)/etc datadir = @datadir@ icondir = $(datadir)/pixmaps/mc + gnomeicondir = @gnomeicondir@ -localedir = $(datadir)/locale +localedir = $(prefix)/share/locale - basemandir = @mandir@ - mandir = $(basemandir)/man1 + mandir = @mandir@ + man1dir = $(mandir)/man1 manext = 1 diff --git a/x11-fm/gnomemc/files/patch-ad b/x11-fm/gnomemc/files/patch-ad index 1074809019fc..694c000fe771 100644 --- a/x11-fm/gnomemc/files/patch-ad +++ b/x11-fm/gnomemc/files/patch-ad @@ -1,11 +1,11 @@ ---- gnome/gtools.c.orig Tue Feb 2 16:10:31 1999 -+++ gnome/gtools.c Tue Feb 2 16:10:41 1999 -@@ -4,7 +4,7 @@ - * Written by Miguel de Icaza - */ - #include <config.h> +--- gnome/gtools.c.orig Tue Feb 16 01:29:19 1999 ++++ gnome/gtools.c Fri Feb 19 01:43:53 1999 +@@ -13,7 +13,7 @@ + #undef HAVE_LIBGPM + #include "mouse.h" + #include "key.h" -#include "myslang.h" +#include "tty.h" - #include <gnome.h> - #include <gdk/gdkkeysyms.h> - #include <string.h> + #include "widget.h" + #include "wtools.h" + #include "dialog.h" diff --git a/x11-fm/gnomemc/files/patch-af b/x11-fm/gnomemc/files/patch-af index 59c51acbece7..0399494979c3 100644 --- a/x11-fm/gnomemc/files/patch-af +++ b/x11-fm/gnomemc/files/patch-af @@ -1,5 +1,5 @@ ---- Makefile.in.orig Tue Jan 26 19:51:29 1999 -+++ Makefile.in Tue Jan 26 19:54:31 1999 +--- Makefile.in.orig Tue Feb 16 01:29:07 1999 ++++ Makefile.in Fri Feb 19 01:45:58 1999 @@ -5,7 +5,7 @@ @MCFGR@@MCF@ @@ -10,7 +10,7 @@ alldirs=$(unixdirs) $(foreigndirs) subdirs=$(alldirs) @@ -46,8 +46,6 @@ - install: installdirs @vcs@ + install: installdirs @for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done $(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(libdir)/FAQ - $(INSTALL_PROGRAM) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install @@ -20,21 +20,21 @@ @@ -58,12 +56,9 @@ installdirs: - $(mcsrcdir)/xmkdir $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) - $(mcsrcdir)/xmkdir $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir) -- $(mcsrcdir)/xmkdir $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir) -- $(mcsrcdir)/xmkdir $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir) -+ $(mcsrcdir)/xmkdir $(DESTDIR)$(icondir) -+ $(mcsrcdir)/xmkdir $(DESTDIR)$(extfsdir) - $(mcsrcdir)/xmkdir $(DESTDIR)$(idldir) + $(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) + $(MKINSTALLDIRS) $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir) +- $(MKINSTALLDIRS) $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir) +- $(MKINSTALLDIRS) $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir) ++ $(MKINSTALLDIRS) $(DESTDIR)$(icondir) ++ $(MKINSTALLDIRS) $(DESTDIR)$(extfsdir) + $(MKINSTALLDIRS) $(DESTDIR)$(idldir) - -mcfninstall: - -/bin/sh ./mcfn_install uninstall: @for I in $(unixdirs); do cd $$I; $(MAKE) $@ || exit 1; cd ..; done ---- lib/Makefile.in.orig Tue Jan 19 00:44:08 1999 -+++ lib/Makefile.in Thu Jan 28 15:45:04 1999 +--- lib/Makefile.in.orig Mon Mar 1 03:38:13 1999 ++++ lib/Makefile.in Mon Mar 1 14:43:56 1999 @@ -15,7 +15,6 @@ LIBFILES_IN = mc.ext.in mc-gnome.ext.in LIBFILES_OUT = mc.ext mc-gnome.ext @@ -42,13 +42,13 @@ -TIFILES = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap DISTLIB = $(LIBFILES_IN) $(LIBFILES_CONST) $(TIFILES) \ Makefile.in tdiff xnc.hlp ncurses.h mc.sh mc.csh mcserv.init \ - mcserv.pamd tkmc.wmconfig mc.ext.in.qnx.diff mc.menu.qnx.diff -@@ -42,8 +41,6 @@ + mcserv.pamd tkmc.wmconfig mc.ext.in.qnx.diff mc.global +@@ -45,8 +44,6 @@ do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(libdir)/$$I; done for I in $(LIBFILES_OUT); \ do $(INSTALL_DATA) $(builddir)/lib/$$I $(DESTDIR)$(libdir)/$$I; done - for I in $(TIFILES); \ - do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(tidir)/$$I; done + $(MKINSTALLDIRS) $(DESTDIR)$(confdir) + $(INSTALL_DATA) $(srcdir)/mc.global $(DESTDIR)$(confdir) - uninstall: - for I in $(LIBFILES_OUT) $(LIBFILES_CONST); \ diff --git a/x11-fm/gnomemc/files/patch-ag b/x11-fm/gnomemc/files/patch-ag index db4fed21727d..1ac4e786f4de 100644 --- a/x11-fm/gnomemc/files/patch-ag +++ b/x11-fm/gnomemc/files/patch-ag @@ -164,14 +164,14 @@ # Sound files shell/.mod ---- gnome/mc.keys.in.in.orig Tue Jan 19 00:44:12 1999 -+++ gnome/mc.keys.in.in Thu Jan 28 11:54:32 1999 -@@ -86,7 +86,7 @@ +--- gnome/mc.keys.in.in.orig Tue Feb 16 01:29:18 1999 ++++ gnome/mc.keys.in.in Fri Feb 19 01:47:31 1999 +@@ -96,7 +96,7 @@ icon-filename=@icondir@/tex.xpm application/postscript: - open=gv %f + open=ggv %f - icon-filename=@icondir@/postscript.xpm + icon-filename=@icondir@/gnome-application-postscript.png application/x-object-file: diff --git a/x11-fm/gnomemc/pkg-plist b/x11-fm/gnomemc/pkg-plist index 3dae830e85ca..86bbf86b6a24 100644 --- a/x11-fm/gnomemc/pkg-plist +++ b/x11-fm/gnomemc/pkg-plist @@ -1,6 +1,7 @@ bin/gmc bin/plain-gmc etc/CORBA/servers/gmc.gnorba +etc/mc.global share/gnome/idl/FileManager.idl share/gnome/idl/Makefile.in share/gnome/mc/FAQ @@ -29,16 +30,16 @@ share/gnome/mc/mc.ext share/gnome/mc/mc.hint share/gnome/mc/mc.lib share/gnome/mc/mc.menu -share/gnome/mc/templates/GIMP.desktop share/gnome/mime-info/mc.keys -share/gnome/pixmaps/mc/c.xpm -share/gnome/pixmaps/mc/calendar.xpm -share/gnome/pixmaps/mc/cc.xpm -share/gnome/pixmaps/mc/compressed.xpm share/gnome/pixmaps/mc/directory.xpm +share/gnome/pixmaps/mc/gnome-application-encapsulated_postscript.png +share/gnome/pixmaps/mc/gnome-application-postscript.png share/gnome/pixmaps/mc/gnome-application-x-c-header.png share/gnome/pixmaps/mc/gnome-application-x-c-source.png share/gnome/pixmaps/mc/gnome-application-x-cc-source.png +share/gnome/pixmaps/mc/gnome-audio.png +share/gnome/pixmaps/mc/gnome-compressed.png +share/gnome/pixmaps/mc/gnome-core.png share/gnome/pixmaps/mc/gnome-http-url.png share/gnome/pixmaps/mc/gnome-image-bmp.png share/gnome/pixmaps/mc/gnome-image-generic.png @@ -50,41 +51,45 @@ share/gnome/pixmaps/mc/gnome-image-pgm.png share/gnome/pixmaps/mc/gnome-image-png.png share/gnome/pixmaps/mc/gnome-image-pnm.png share/gnome/pixmaps/mc/gnome-image-ppm.png +share/gnome/pixmaps/mc/gnome-image-psd.png share/gnome/pixmaps/mc/gnome-image-ras.png share/gnome/pixmaps/mc/gnome-image-rgb.png share/gnome/pixmaps/mc/gnome-image-tga.png share/gnome/pixmaps/mc/gnome-image-tiff.png share/gnome/pixmaps/mc/gnome-image-xbm.png +share/gnome/pixmaps/mc/gnome-image-xcf.png share/gnome/pixmaps/mc/gnome-image-xpm.png share/gnome/pixmaps/mc/gnome-image-xwd.png +share/gnome/pixmaps/mc/gnome-manpage.png +share/gnome/pixmaps/mc/gnome-objectfile.png share/gnome/pixmaps/mc/gnome-pack-deb.png share/gnome/pixmaps/mc/gnome-pack-rpm.png +share/gnome/pixmaps/mc/gnome-package.png +share/gnome/pixmaps/mc/gnome-tex.png share/gnome/pixmaps/mc/gnome-text-html.png +share/gnome/pixmaps/mc/gnome-textfile.png share/gnome/pixmaps/mc/gnome-video-mpeg.png share/gnome/pixmaps/mc/gnome-video-quicktime.png share/gnome/pixmaps/mc/gnome-video-x-msvideo.png -share/gnome/pixmaps/mc/h.xpm -share/gnome/pixmaps/mc/html.xpm share/gnome/pixmaps/mc/i-blockdev.png +share/gnome/pixmaps/mc/i-cdrom.png share/gnome/pixmaps/mc/i-chardev.png share/gnome/pixmaps/mc/i-core.png share/gnome/pixmaps/mc/i-dirclosed.png share/gnome/pixmaps/mc/i-directory.png share/gnome/pixmaps/mc/i-executable.png +share/gnome/pixmaps/mc/i-fifo.png +share/gnome/pixmaps/mc/i-floppy.png +share/gnome/pixmaps/mc/i-printer.png share/gnome/pixmaps/mc/i-regular.png share/gnome/pixmaps/mc/i-sock.png share/gnome/pixmaps/mc/i-stalled.png share/gnome/pixmaps/mc/i-symlink.png share/gnome/pixmaps/mc/makefile.xpm -share/gnome/pixmaps/mc/man.xpm -share/gnome/pixmaps/mc/o.xpm -share/gnome/pixmaps/mc/postscript.xpm share/gnome/pixmaps/mc/sound.xpm -share/gnome/pixmaps/mc/tex.xpm -share/gnome/pixmaps/mc/text.xpm share/gnome/pixmaps/mc/trash.xpm -share/gnome/pixmaps/mc/word.xpm -share/gnome/pixmaps/mc/zip.xpm +share/locale/cs/LC_MESSAGES/mc.mo +share/locale/da/LC_MESSAGES/mc.mo share/locale/de/LC_MESSAGES/mc.mo share/locale/es/LC_MESSAGES/mc.mo share/locale/fr/LC_MESSAGES/mc.mo @@ -95,5 +100,3 @@ share/locale/pl/LC_MESSAGES/mc.mo share/locale/ru/LC_MESSAGES/mc.mo @dirrm share/gnome/pixmaps/mc @dirrm share/gnome/mc/extfs -@dirrm share/gnome/mc/templates -@dirrm share/gnome/mc diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile index 964fa2dc0162..85eb8e486975 100644 --- a/x11-themes/gtk-engines/Makefile +++ b/x11-themes/gtk-engines/Makefile @@ -1,15 +1,15 @@ # New ports collection makefile for: gtk-engines -# Version required: 0.1 +# Version required: 0.5 # Date Created: 23 Dec 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.6 1999/01/31 16:59:44 vanilla Exp $ +# $Id: Makefile,v 1.7 1999/02/02 17:01:42 vanilla Exp $ # -DISTNAME= gtk-engines-0.1 +DISTNAME= gtk-engines-0.5 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gtk-engines +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= vanilla@FreeBSD.ORG @@ -17,7 +17,7 @@ LIB_DEPENDS= gdk_imlib.2:${PORTSDIR}/graphics/imlib USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk11d-config" +CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" THEMES= metal notif pixmap redmond95 diff --git a/x11-themes/gtk-engines/distinfo b/x11-themes/gtk-engines/distinfo index e4277adf718d..391eac03b46e 100644 --- a/x11-themes/gtk-engines/distinfo +++ b/x11-themes/gtk-engines/distinfo @@ -1 +1 @@ -MD5 (gtk-engines-0.1.tar.gz) = 6bef05647b2a7fcb20987f9f0e0b3306 +MD5 (gtk-engines-0.5.tar.gz) = fbd20c48f8d070fa3a7044347a4ed684 diff --git a/x11-themes/gtk-engines/files/patch-ac b/x11-themes/gtk-engines/files/patch-ac index 804b3532ab0b..c4b32a6f7250 100644 --- a/x11-themes/gtk-engines/files/patch-ac +++ b/x11-themes/gtk-engines/files/patch-ac @@ -1,17 +1,13 @@ ---- metal/Theme/gtk/gtkrc.orig Sun Jan 31 03:04:18 1999 -+++ metal/Theme/gtk/gtkrc Sun Jan 31 03:11:48 1999 -@@ -13,9 +13,9 @@ - # testgtkrc2 sets all the buttons in the main window to blue by default - #include "testgtkrc2" - --#module_path ".:/home/raster/themes" +--- metal/Theme/gtk/gtkrc.orig Fri Feb 12 05:16:41 1999 ++++ metal/Theme/gtk/gtkrc Wed Feb 17 01:23:21 1999 +@@ -1,3 +1,7 @@ +#module_path "%%PREFIX%%/share/themes" - --pixmap_path "." ++ +pixmap_path "%%PREFIX%%/share/themes/Metal/gtk" - ++ style "default" { + font = "-b&h-lucida-bold-r-normal-sans-12-*-*-*-p-*-iso8859-1" --- notif/Theme/gtk/gtkrc.orig Sun Jan 31 03:05:48 1999 +++ notif/Theme/gtk/gtkrc Sun Jan 31 03:11:41 1999 @@ -13,9 +13,9 @@ diff --git a/x11-themes/gtk-engines/pkg-plist b/x11-themes/gtk-engines/pkg-plist index 030f5aa1656c..2d5af587e9c4 100644 --- a/x11-themes/gtk-engines/pkg-plist +++ b/x11-themes/gtk-engines/pkg-plist @@ -79,19 +79,15 @@ share/themes/Pixmap/gtk/vline.png share/themes/Redmond95/ICON.png share/themes/Redmond95/README.html share/themes/Redmond95/gtk/gtkrc -share/themes/engines/libmetal.a share/themes/engines/libmetal.la share/themes/engines/libmetal.so share/themes/engines/libmetal.so.0 -share/themes/engines/libnotif.a share/themes/engines/libnotif.la share/themes/engines/libnotif.so share/themes/engines/libnotif.so.0 -share/themes/engines/libpixmap.a share/themes/engines/libpixmap.la share/themes/engines/libpixmap.so share/themes/engines/libpixmap.so.0 -share/themes/engines/libredmond95.a share/themes/engines/libredmond95.la share/themes/engines/libredmond95.so share/themes/engines/libredmond95.so.0 diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile index 964fa2dc0162..85eb8e486975 100644 --- a/x11-themes/gtk-engines2/Makefile +++ b/x11-themes/gtk-engines2/Makefile @@ -1,15 +1,15 @@ # New ports collection makefile for: gtk-engines -# Version required: 0.1 +# Version required: 0.5 # Date Created: 23 Dec 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.6 1999/01/31 16:59:44 vanilla Exp $ +# $Id: Makefile,v 1.7 1999/02/02 17:01:42 vanilla Exp $ # -DISTNAME= gtk-engines-0.1 +DISTNAME= gtk-engines-0.5 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gtk-engines +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= vanilla@FreeBSD.ORG @@ -17,7 +17,7 @@ LIB_DEPENDS= gdk_imlib.2:${PORTSDIR}/graphics/imlib USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk11d-config" +CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" THEMES= metal notif pixmap redmond95 diff --git a/x11-themes/gtk-engines2/distinfo b/x11-themes/gtk-engines2/distinfo index e4277adf718d..391eac03b46e 100644 --- a/x11-themes/gtk-engines2/distinfo +++ b/x11-themes/gtk-engines2/distinfo @@ -1 +1 @@ -MD5 (gtk-engines-0.1.tar.gz) = 6bef05647b2a7fcb20987f9f0e0b3306 +MD5 (gtk-engines-0.5.tar.gz) = fbd20c48f8d070fa3a7044347a4ed684 diff --git a/x11-themes/gtk-engines2/files/patch-ac b/x11-themes/gtk-engines2/files/patch-ac index 804b3532ab0b..c4b32a6f7250 100644 --- a/x11-themes/gtk-engines2/files/patch-ac +++ b/x11-themes/gtk-engines2/files/patch-ac @@ -1,17 +1,13 @@ ---- metal/Theme/gtk/gtkrc.orig Sun Jan 31 03:04:18 1999 -+++ metal/Theme/gtk/gtkrc Sun Jan 31 03:11:48 1999 -@@ -13,9 +13,9 @@ - # testgtkrc2 sets all the buttons in the main window to blue by default - #include "testgtkrc2" - --#module_path ".:/home/raster/themes" +--- metal/Theme/gtk/gtkrc.orig Fri Feb 12 05:16:41 1999 ++++ metal/Theme/gtk/gtkrc Wed Feb 17 01:23:21 1999 +@@ -1,3 +1,7 @@ +#module_path "%%PREFIX%%/share/themes" - --pixmap_path "." ++ +pixmap_path "%%PREFIX%%/share/themes/Metal/gtk" - ++ style "default" { + font = "-b&h-lucida-bold-r-normal-sans-12-*-*-*-p-*-iso8859-1" --- notif/Theme/gtk/gtkrc.orig Sun Jan 31 03:05:48 1999 +++ notif/Theme/gtk/gtkrc Sun Jan 31 03:11:41 1999 @@ -13,9 +13,9 @@ diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist index 030f5aa1656c..2d5af587e9c4 100644 --- a/x11-themes/gtk-engines2/pkg-plist +++ b/x11-themes/gtk-engines2/pkg-plist @@ -79,19 +79,15 @@ share/themes/Pixmap/gtk/vline.png share/themes/Redmond95/ICON.png share/themes/Redmond95/README.html share/themes/Redmond95/gtk/gtkrc -share/themes/engines/libmetal.a share/themes/engines/libmetal.la share/themes/engines/libmetal.so share/themes/engines/libmetal.so.0 -share/themes/engines/libnotif.a share/themes/engines/libnotif.la share/themes/engines/libnotif.so share/themes/engines/libnotif.so.0 -share/themes/engines/libpixmap.a share/themes/engines/libpixmap.la share/themes/engines/libpixmap.so share/themes/engines/libpixmap.so.0 -share/themes/engines/libredmond95.a share/themes/engines/libredmond95.la share/themes/engines/libredmond95.so share/themes/engines/libredmond95.so.0 diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index e195699f8539..f1c6192832fd 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.20 1999/02/23 08:15:54 asami Exp $ +# $Id: Makefile,v 1.21 1999/03/07 23:53:37 billf Exp $ # SUBDIR += FWF @@ -12,6 +12,7 @@ SUBDIR += gtk10 SUBDIR += gtk11 SUBDIR += gtk11-devel + SUBDIR += gtk12 SUBDIR += gtkgl SUBDIR += gtkstep SUBDIR += iv diff --git a/x11-toolkits/gtk-engines/Makefile b/x11-toolkits/gtk-engines/Makefile index 964fa2dc0162..85eb8e486975 100644 --- a/x11-toolkits/gtk-engines/Makefile +++ b/x11-toolkits/gtk-engines/Makefile @@ -1,15 +1,15 @@ # New ports collection makefile for: gtk-engines -# Version required: 0.1 +# Version required: 0.5 # Date Created: 23 Dec 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.6 1999/01/31 16:59:44 vanilla Exp $ +# $Id: Makefile,v 1.7 1999/02/02 17:01:42 vanilla Exp $ # -DISTNAME= gtk-engines-0.1 +DISTNAME= gtk-engines-0.5 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gtk-engines +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= vanilla@FreeBSD.ORG @@ -17,7 +17,7 @@ LIB_DEPENDS= gdk_imlib.2:${PORTSDIR}/graphics/imlib USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk11d-config" +CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" THEMES= metal notif pixmap redmond95 diff --git a/x11-toolkits/gtk-engines/distinfo b/x11-toolkits/gtk-engines/distinfo index e4277adf718d..391eac03b46e 100644 --- a/x11-toolkits/gtk-engines/distinfo +++ b/x11-toolkits/gtk-engines/distinfo @@ -1 +1 @@ -MD5 (gtk-engines-0.1.tar.gz) = 6bef05647b2a7fcb20987f9f0e0b3306 +MD5 (gtk-engines-0.5.tar.gz) = fbd20c48f8d070fa3a7044347a4ed684 diff --git a/x11-toolkits/gtk-engines/files/patch-ac b/x11-toolkits/gtk-engines/files/patch-ac index 804b3532ab0b..c4b32a6f7250 100644 --- a/x11-toolkits/gtk-engines/files/patch-ac +++ b/x11-toolkits/gtk-engines/files/patch-ac @@ -1,17 +1,13 @@ ---- metal/Theme/gtk/gtkrc.orig Sun Jan 31 03:04:18 1999 -+++ metal/Theme/gtk/gtkrc Sun Jan 31 03:11:48 1999 -@@ -13,9 +13,9 @@ - # testgtkrc2 sets all the buttons in the main window to blue by default - #include "testgtkrc2" - --#module_path ".:/home/raster/themes" +--- metal/Theme/gtk/gtkrc.orig Fri Feb 12 05:16:41 1999 ++++ metal/Theme/gtk/gtkrc Wed Feb 17 01:23:21 1999 +@@ -1,3 +1,7 @@ +#module_path "%%PREFIX%%/share/themes" - --pixmap_path "." ++ +pixmap_path "%%PREFIX%%/share/themes/Metal/gtk" - ++ style "default" { + font = "-b&h-lucida-bold-r-normal-sans-12-*-*-*-p-*-iso8859-1" --- notif/Theme/gtk/gtkrc.orig Sun Jan 31 03:05:48 1999 +++ notif/Theme/gtk/gtkrc Sun Jan 31 03:11:41 1999 @@ -13,9 +13,9 @@ diff --git a/x11-toolkits/gtk-engines/pkg-plist b/x11-toolkits/gtk-engines/pkg-plist index 030f5aa1656c..2d5af587e9c4 100644 --- a/x11-toolkits/gtk-engines/pkg-plist +++ b/x11-toolkits/gtk-engines/pkg-plist @@ -79,19 +79,15 @@ share/themes/Pixmap/gtk/vline.png share/themes/Redmond95/ICON.png share/themes/Redmond95/README.html share/themes/Redmond95/gtk/gtkrc -share/themes/engines/libmetal.a share/themes/engines/libmetal.la share/themes/engines/libmetal.so share/themes/engines/libmetal.so.0 -share/themes/engines/libnotif.a share/themes/engines/libnotif.la share/themes/engines/libnotif.so share/themes/engines/libnotif.so.0 -share/themes/engines/libpixmap.a share/themes/engines/libpixmap.la share/themes/engines/libpixmap.so share/themes/engines/libpixmap.so.0 -share/themes/engines/libredmond95.a share/themes/engines/libredmond95.la share/themes/engines/libredmond95.so share/themes/engines/libredmond95.so.0 diff --git a/x11-toolkits/gtk-engines2/Makefile b/x11-toolkits/gtk-engines2/Makefile index 964fa2dc0162..85eb8e486975 100644 --- a/x11-toolkits/gtk-engines2/Makefile +++ b/x11-toolkits/gtk-engines2/Makefile @@ -1,15 +1,15 @@ # New ports collection makefile for: gtk-engines -# Version required: 0.1 +# Version required: 0.5 # Date Created: 23 Dec 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.6 1999/01/31 16:59:44 vanilla Exp $ +# $Id: Makefile,v 1.7 1999/02/02 17:01:42 vanilla Exp $ # -DISTNAME= gtk-engines-0.1 +DISTNAME= gtk-engines-0.5 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gtk-engines +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= vanilla@FreeBSD.ORG @@ -17,7 +17,7 @@ LIB_DEPENDS= gdk_imlib.2:${PORTSDIR}/graphics/imlib USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk11d-config" +CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" THEMES= metal notif pixmap redmond95 diff --git a/x11-toolkits/gtk-engines2/distinfo b/x11-toolkits/gtk-engines2/distinfo index e4277adf718d..391eac03b46e 100644 --- a/x11-toolkits/gtk-engines2/distinfo +++ b/x11-toolkits/gtk-engines2/distinfo @@ -1 +1 @@ -MD5 (gtk-engines-0.1.tar.gz) = 6bef05647b2a7fcb20987f9f0e0b3306 +MD5 (gtk-engines-0.5.tar.gz) = fbd20c48f8d070fa3a7044347a4ed684 diff --git a/x11-toolkits/gtk-engines2/files/patch-ac b/x11-toolkits/gtk-engines2/files/patch-ac index 804b3532ab0b..c4b32a6f7250 100644 --- a/x11-toolkits/gtk-engines2/files/patch-ac +++ b/x11-toolkits/gtk-engines2/files/patch-ac @@ -1,17 +1,13 @@ ---- metal/Theme/gtk/gtkrc.orig Sun Jan 31 03:04:18 1999 -+++ metal/Theme/gtk/gtkrc Sun Jan 31 03:11:48 1999 -@@ -13,9 +13,9 @@ - # testgtkrc2 sets all the buttons in the main window to blue by default - #include "testgtkrc2" - --#module_path ".:/home/raster/themes" +--- metal/Theme/gtk/gtkrc.orig Fri Feb 12 05:16:41 1999 ++++ metal/Theme/gtk/gtkrc Wed Feb 17 01:23:21 1999 +@@ -1,3 +1,7 @@ +#module_path "%%PREFIX%%/share/themes" - --pixmap_path "." ++ +pixmap_path "%%PREFIX%%/share/themes/Metal/gtk" - ++ style "default" { + font = "-b&h-lucida-bold-r-normal-sans-12-*-*-*-p-*-iso8859-1" --- notif/Theme/gtk/gtkrc.orig Sun Jan 31 03:05:48 1999 +++ notif/Theme/gtk/gtkrc Sun Jan 31 03:11:41 1999 @@ -13,9 +13,9 @@ diff --git a/x11-toolkits/gtk-engines2/pkg-plist b/x11-toolkits/gtk-engines2/pkg-plist index 030f5aa1656c..2d5af587e9c4 100644 --- a/x11-toolkits/gtk-engines2/pkg-plist +++ b/x11-toolkits/gtk-engines2/pkg-plist @@ -79,19 +79,15 @@ share/themes/Pixmap/gtk/vline.png share/themes/Redmond95/ICON.png share/themes/Redmond95/README.html share/themes/Redmond95/gtk/gtkrc -share/themes/engines/libmetal.a share/themes/engines/libmetal.la share/themes/engines/libmetal.so share/themes/engines/libmetal.so.0 -share/themes/engines/libnotif.a share/themes/engines/libnotif.la share/themes/engines/libnotif.so share/themes/engines/libnotif.so.0 -share/themes/engines/libpixmap.a share/themes/engines/libpixmap.la share/themes/engines/libpixmap.so share/themes/engines/libpixmap.so.0 -share/themes/engines/libredmond95.a share/themes/engines/libredmond95.la share/themes/engines/libredmond95.so share/themes/engines/libredmond95.so.0 diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile index 47d3fc8e8399..0136c7202403 100644 --- a/x11-toolkits/gtk12/Makefile +++ b/x11-toolkits/gtk12/Makefile @@ -1,43 +1,49 @@ -# New ports collection makefile for: gtk11-devel -# Version required: 1.1.16 +# New ports collection makefile for: gtk12 +# Version required: 1.2.0 # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $Id: Makefile,v 1.44 1999/02/18 04:49:25 vanilla Exp $ # -DISTNAME= gtk+-1.1.16 -PKGNAME= gtk-1.1.16 +DISTNAME= gtk+-1.2.0 +PKGNAME= gtk-1.2.0 CATEGORIES= x11-toolkits -MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ - ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ - http://www.ameth.org/gimp/gtk/v1.1/ +MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \ + ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \ + http://www.ameth.org/gimp/gtk/v1.2/ MAINTAINER= vanilla@FreeBSD.ORG BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext -LIB_DEPENDS= glib11d.2:${PORTSDIR}/devel/glib11-devel +LIB_DEPENDS= glib12.1:${PORTSDIR}/devel/glib12 USE_X_PREFIX= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk11d +CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ + GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \ LIBS="-L${LOCALBASE}/lib" -MAN1= gtk-config.1 +MAN1= gtk12-config.1 pre-build: ${RM} -rf ${WRKSRC}/docs/gtk.info* post-install: - @${MKDIR} ${LOCALBASE}/share/aclocal - @${INSTALL_DATA} ${WRKSRC}/gtk.m4 ${LOCALBASE}/share/aclocal/gtk11d.m4 + @${MKDIR} ${PREFIX}/share/themes/engines @if [ ! -f ${PREFIX}/share/info ]; then \ ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ fi @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib + @${ECHO} '*********************************************************' + @${ECHO} '* *' + @${ECHO} '* If you want to use autoconf with gtk, *' + @${ECHO} '* Please copy gtk.m4 to /usr/local/share/aclocal *' + @${ECHO} '* by yourself, thanks. *' + @${ECHO} '* *' + @${ECHO} '*********************************************************' .include <bsd.port.mk> diff --git a/x11-toolkits/gtk12/distinfo b/x11-toolkits/gtk12/distinfo index 992dadfae7e1..b648580fc3d6 100644 --- a/x11-toolkits/gtk12/distinfo +++ b/x11-toolkits/gtk12/distinfo @@ -1 +1 @@ -MD5 (gtk+-1.1.16.tar.gz) = 6de7a1a397eac37d7fc1f8ef008a9f02 +MD5 (gtk+-1.2.0.tar.gz) = d935cf94a4b0167b6b3570580a1013b9 diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa index 89e094d9c3bf..bea450001131 100644 --- a/x11-toolkits/gtk12/files/patch-aa +++ b/x11-toolkits/gtk12/files/patch-aa @@ -1,207 +1,170 @@ --- Makefile.in.orig Sun Jan 31 23:26:39 1999 +++ Makefile.in Sun Jan 31 23:31:06 1999 -@@ -124,7 +124,7 @@ +@@ -126,7 +126,7 @@ SRC_SUBDIRS = gdk gtk SUBDIRS = po $(SRC_SUBDIRS) docs -bin_SCRIPTS = gtk-config -+bin_SCRIPTS = gtk11d-config ++bin_SCRIPTS = gtk12-config - EXTRA_DIST = HACKING gtk+.spec gtk.m4 makecopyright TODO NEWS.pre-1-0 ChangeLog.pre-1-0 README.cvs-commits intl/libgettext.h intl/po2tbl.sed.in examples/Makefile examples/README.1ST examples/extract.awk examples/extract.sh examples/aspectframe/Makefile examples/aspectframe/aspectframe.c examples/base/Makefile examples/base/base.c examples/buttons/Makefile examples/buttons/buttons.c examples/buttons/info.xpm examples/clist/clist.c examples/entry/Makefile examples/entry/entry.c examples/eventbox/Makefile examples/eventbox/eventbox.c examples/filesel/Makefile examples/filesel/filesel.c examples/gtkdial/Makefile examples/gtkdial/dial_test.c examples/gtkdial/gtkdial.c examples/gtkdial/gtkdial.h examples/helloworld/Makefile examples/helloworld/helloworld.c examples/helloworld2/Makefile examples/helloworld2/helloworld2.c examples/list/Makefile examples/list/list.c examples/menu/Makefile examples/menu/menu.c examples/menu/menufactory.c examples/menu/menufactory.h examples/menu/mfmain.c examples/menu/mfmain.h examples/notebook/Makefile examples/notebook/notebook.c examples/packer/Makefile examples/packer/pack.c examples/packbox/Makefile examples/packbox/packbox.c examples/paned/Makefile examples/paned/paned.c examples/pixmap/Makefile examples/pixmap/pixmap.c examples/progressbar/Makefile examples/progressbar/progressbar.c examples/radiobuttons/Makefile examples/radiobuttons/radiobuttons.c examples/rulers/Makefile examples/rulers/rulers.c examples/scribble-simple/Makefile examples/scribble-simple/scribble-simple.c examples/scrolledwin/Makefile examples/scrolledwin/scrolledwin.c examples/selection/Makefile examples/selection/gettargets.c examples/selection/setselection.c examples/statusbar/Makefile examples/statusbar/statusbar.c examples/table/Makefile examples/table/table.c examples/tictactoe/Makefile examples/tictactoe/tictactoe.c examples/tictactoe/tictactoe.h examples/tictactoe/ttt_test.c examples/wheelbarrow/Makefile examples/wheelbarrow/wheelbarrow.c examples/find-examples.sh + EXTRA_DIST = HACKING gtk+.spec.in gtk.m4 makecopyright TODO NEWS.pre-1-0 ChangeLog.pre-1-0 README.cvs-commits intl/libgettext.h intl/po2tbl.sed.in examples/aspectframe/Makefile examples/aspectframe/aspectframe.c examples/Makefile examples/README.1ST examples/extract.awk examples/extract.sh examples/base/Makefile examples/base/base.c examples/buttons/Makefile examples/buttons/buttons.c examples/buttons/info.xpm examples/calendar/Makefile examples/calendar/gcalendar.c examples/clist/Makefile examples/clist/clist.c examples/entry/Makefile examples/entry/entry.c examples/eventbox/Makefile examples/eventbox/eventbox.c examples/filesel/Makefile examples/filesel/filesel.c examples/gtkdial/Makefile examples/gtkdial/dial_test.c examples/gtkdial/gtkdial.c examples/gtkdial/gtkdial.h examples/helloworld/Makefile examples/helloworld/helloworld.c examples/helloworld2/Makefile examples/helloworld2/helloworld2.c examples/list/Makefile examples/list/list.c examples/menu/Makefile examples/menu/menu.c examples/menu/itemfactory.c examples/notebook/Makefile examples/notebook/notebook.c examples/packbox/Makefile examples/packbox/packbox.c examples/packer/Makefile examples/packer/pack.c examples/paned/Makefile examples/paned/paned.c examples/pixmap/Makefile examples/pixmap/pixmap.c examples/progressbar/Makefile examples/progressbar/progressbar.c examples/radiobuttons/Makefile examples/radiobuttons/radiobuttons.c examples/rangewidgets/Makefile examples/rangewidgets/rangewidgets.c examples/rulers/Makefile examples/rulers/rulers.c examples/scribble-simple/Makefile examples/scribble-simple/scribble-simple.c examples/scrolledwin/Makefile examples/scrolledwin/scrolledwin.c examples/selection/Makefile examples/selection/gettargets.c examples/selection/setselection.c examples/statusbar/Makefile examples/statusbar/statusbar.c examples/table/Makefile examples/table/table.c examples/text/Makefile examples/text/text.c examples/tictactoe/Makefile examples/tictactoe/tictactoe.c examples/tictactoe/tictactoe.h examples/tictactoe/ttt_test.c examples/tree/Makefile examples/tree/tree.c examples/wheelbarrow/Makefile examples/wheelbarrow/wheelbarrow.c examples/fixed/fixed.c examples/fixed/Makefile examples/frame/frame.c examples/frame/Makefile examples/spinbutton/spinbutton.c examples/spinbutton/Makefile examples/find-examples.sh -@@ -134,7 +134,7 @@ +@@ -136,7 +136,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h --CONFIG_CLEAN_FILES = gtk-config -+CONFIG_CLEAN_FILES = gtk11d-config +-CONFIG_CLEAN_FILES = gtk+.spec gtk-config ++CONFIG_CLEAN_FILES = gtk-config SCRIPTS = $(bin_SCRIPTS) DATA = $(m4data_DATA) -@@ -193,7 +193,10 @@ - -rm -f config.h - +@@ -198,7 +198,10 @@ maintainer-clean-hdr: + gtk+.spec: $(top_builddir)/config.status gtk+.spec.in + cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -gtk-config: $(top_builddir)/config.status gtk-config.in -+gtk11d-config.in: gtk-config.in -+ cp gtk-config.in gtk11d-config.in ++gtk12-config.in: gtk-config.in ++ cp gtk-config.in gtk12-config.in + -+gtk11d-config: $(top_builddir)/config.status gtk11d-config.in ++gtk12-config: $(top_builddir)/config.status gtk12-config.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status install-binSCRIPTS: $(bin_SCRIPTS) -@@ -411,15 +414,14 @@ +@@ -407,7 +410,6 @@ + || exit 1; \ + fi; \ + done +- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook + info-am: + info: info-recursive + dvi-am: +@@ -422,13 +424,13 @@ install-exec-am: install-binSCRIPTS install-exec: install-exec-recursive -install-data-am: install-m4dataDATA ++install-data-am: install-data: install-data-recursive install-am: all-am -- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive -uninstall-am: uninstall-binSCRIPTS uninstall-m4dataDATA +uninstall-am: uninstall-binSCRIPTS uninstall: uninstall-recursive --all-am: Makefile $(SCRIPTS) $(DATA) config.h -+all-am: Makefile $(SCRIPTS) config.h + all-am: Makefile $(SCRIPTS) $(DATA) config.h all-redirect: all-recursive-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install --- gdk/Makefile.in.orig Sun Jan 31 23:33:26 1999 +++ gdk/Makefile.in Sun Jan 31 23:35:01 1999 -@@ -123,12 +123,12 @@ +@@ -125,7 +125,7 @@ gdkincludedir = $(includedir)/gdk -lib_LTLIBRARIES = libgdk.la -+lib_LTLIBRARIES = libgdk11d.la ++lib_LTLIBRARIES = libgdk12.la INCLUDES = -DG_LOG_DOMAIN=\"Gdk\" -I$(top_srcdir) @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @GLIB_CFLAGS@ @x_cflags@ - --libgdk_la_SOURCES = gdk.c gdkcc.c gdkcolor.c gdkcursor.c gdkdnd.c gdkdraw.c gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkim.c gdkimage.c gdkinput.c gdkinput.h gdkinputnone.h gdkinputcommon.h gdkinputgxi.h gdkinputxfree.h gdkpixmap.c gdkproperty.c gdkrgb.c gdkrectangle.c gdkregion.c gdkselection.c gdkvisual.c gdkwindow.c gdkxid.c MwmUtil.h gxid_lib.h gxid_proto.h gxid_lib.c -+libgdk11d_la_SOURCES = gdk.c gdkcc.c gdkcolor.c gdkcursor.c gdkdnd.c gdkdraw.c gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkim.c gdkimage.c gdkinput.c gdkinput.h gdkinputnone.h gdkinputcommon.h gdkinputgxi.h gdkinputxfree.h gdkpixmap.c gdkproperty.c gdkrgb.c gdkrectangle.c gdkregion.c gdkselection.c gdkvisual.c gdkwindow.c gdkxid.c MwmUtil.h gxid_lib.h gxid_proto.h gxid_lib.c - - - gdkinclude_HEADERS = gdk.h gdkcursors.h gdkrgb.h gdki18n.h gdkkeysyms.h gdkprivate.h gdktypes.h gdkx.h -@@ -137,7 +137,7 @@ +@@ -139,7 +139,7 @@ LDADDS = @x_ldflags@ @x_libs@ @GLIB_LIBS@ -lm -libgdk_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm -+libgdk11d_la_LDFLAGS = -version-info 1:3:0 @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm ++libgdk_la_LDFLAGS = -version-info 1:0:0 @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm EXTRA_PROGRAMS = gxid -@@ -161,8 +161,8 @@ - X_LIBS = @X_LIBS@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ --libgdk_la_LIBADD = --libgdk_la_OBJECTS = gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo gdkdnd.lo \ -+libgdk11d_la_LIBADD = -+libgdk11d_la_OBJECTS = gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo gdkdnd.lo \ - gdkdraw.lo gdkevents.lo gdkfont.lo gdkgc.lo gdkglobals.lo gdkim.lo \ - gdkimage.lo gdkinput.lo gdkpixmap.lo gdkproperty.lo gdkrgb.lo \ - gdkrectangle.lo gdkregion.lo gdkselection.lo gdkvisual.lo gdkwindow.lo \ -@@ -186,8 +186,8 @@ - - TAR = tar - GZIP_ENV = --best --SOURCES = $(libgdk_la_SOURCES) $(gxid_SOURCES) --OBJECTS = $(libgdk_la_OBJECTS) $(gxid_OBJECTS) -+SOURCES = $(libgdk11d_la_SOURCES) $(gxid_SOURCES) -+OBJECTS = $(libgdk11d_la_OBJECTS) $(gxid_OBJECTS) - - all: all-redirect - .SUFFIXES: -@@ -263,8 +263,8 @@ +@@ -265,7 +265,7 @@ maintainer-clean-libtool: -libgdk.la: $(libgdk_la_OBJECTS) $(libgdk_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libgdk_la_LDFLAGS) $(libgdk_la_OBJECTS) $(libgdk_la_LIBADD) $(LIBS) -+libgdk11d.la: $(libgdk11d_la_OBJECTS) $(libgdk11d_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libgdk11d_la_LDFLAGS) $(libgdk11d_la_OBJECTS) $(libgdk11d_la_LIBADD) $(LIBS) ++libgdk12.la: $(libgdk_la_OBJECTS) $(libgdk_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libgdk_la_LDFLAGS) $(libgdk_la_OBJECTS) $(libgdk_la_LIBADD) $(LIBS) mostlyclean-binPROGRAMS: - --- gtk/Makefile.in.orig Sun Jan 31 23:35:10 1999 +++ gtk/Makefile.in Sun Jan 31 23:37:31 1999 -@@ -125,12 +125,12 @@ +@@ -127,7 +127,7 @@ gtkincludedir = $(includedir)/gtk -lib_LTLIBRARIES = libgtk.la -+lib_LTLIBRARIES = libgtk11d.la ++lib_LTLIBRARIES = libgtk12.la static_SOURCES = gtkaccelgroup.c gtkaccellabel.c gtkadjustment.c gtkalignment.c gtkarg.c gtkarrow.c gtkaspectframe.c gtkbin.c gtkbindings.c gtkbbox.c gtkbox.c gtkbutton.c gtkcalendar.c gtkcheckbutton.c gtkcheckmenuitem.c gtkclist.c gtkcolorsel.c gtkcombo.c gtkcontainer.c gtkctree.c gtkcurve.c gtkdata.c gtkdialog.c gtkdnd.c gtkdrawingarea.c gtkeditable.c gtkentry.c gtkeventbox.c gtkfilesel.c gtkfixed.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkimage.c gtkinputdialog.c gtkintl.h gtkinvisible.c gtkitem.c gtkitemfactory.c gtklabel.c gtklayout.c gtklist.c gtklistitem.c gtkmain.c gtkmenu.c gtkmenubar.c gtkmenufactory.c gtkmenuitem.c gtkmenushell.c gtkmisc.c gtknotebook.c gtkobject.c gtkoptionmenu.c gtkpacker.c gtkpaned.c gtkpixmap.c gtkplug.c gtkpreview.c gtkprogress.c gtkprogressbar.c gtkradiobutton.c gtkradiomenuitem.c gtkrange.c gtkrc.c gtkruler.c gtkscale.c gtkscrollbar.c gtkscrolledwindow.c gtkselection.c gtkseparator.c gtksignal.c gtksocket.c gtkspinbutton.c gtkstyle.c gtkstatusbar.c gtktable.c gtktearoffmenuitem.c gtktext.c gtkthemes.c gtktipsquery.c gtktogglebutton.c gtktoolbar.c gtktooltips.c gtktree.c gtktreeitem.c gtktypeutils.c gtkvbbox.c gtkvbox.c gtkviewport.c gtkvpaned.c gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c gtkwidget.c gtkwindow.c fnmatch.c fnmatch.h +@@ -152,26 +152,26 @@ + gdk_headers = ../gdk/gdktypes.h ../gdk/gdkrgb.h --libgtk_la_SOURCES = $(static_SOURCES) gtkmarshal.c -+libgtk11d_la_SOURCES = $(static_SOURCES) gtkmarshal.c +-libgtk_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm ++libgtk_la_LDFLAGS = -version-info 1:0:0 @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm - # Source headers which are non-autogenerated headers -@@ -150,7 +150,7 @@ - gdk_headers = ../gdk/gdktypes.h ../gdk/gdkrgb.h + # $(top_builddir)/gdk/libgdk.la +-gtkconfdir = $(sysconfdir)/gtk ++gtkconfdir = $(datadir)/themes/Default/gtk + gtkconf_DATA = gtkrc gtkrc.ja gtkrc.ko gtkrc.ru --libgtk_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm -+libgtk11d_la_LDFLAGS = -version-info 1:3:0 @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm + EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtk.1 testgtkrc testgtkrc2 gtkfeatures.h.in makeenums.pl makeenums.awk maketypes.awk makeenums.h gtkargcollector.c gtktypebuiltins_vars.c gtktypebuiltins_ids.c gtktypebuiltins_evals.c gtk-boxed.defs gtk.defs genmarshal.pl gtkmarshal.list check-y.xpm check-n.xpm test.xpm marble.xpm 3DRings.xpm FilesQueue.xpm Modeller.xpm tree_plus.xpm tree_minus.xpm tree_plus.xbm tree_minus.xbm circles.xbm gtkrc.ja gtkrc.ko gtkrc.ru + + +-INCLUDES = -DGTK_DISABLE_COMPAT_H -DG_LOG_DOMAIN=\"Gtk\" -DGTK_EXE_PREFIX=\"$(exec_prefix)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -I$(top_srcdir) @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @GLIB_CFLAGS@ @x_cflags@ ++INCLUDES = -DGTK_DISABLE_COMPAT_H -DG_LOG_DOMAIN=\"Gtk\" -DGTK_EXE_PREFIX=\"$(exec_prefix)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(gtkconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -I$(top_srcdir) @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @GLIB_CFLAGS@ @x_cflags@ - EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtk.1 testgtkrc testgtkrc2 gtkfeatures.h.in makeenums.pl makeenums.awk maketypes.awk makeenums.h gtkargcollector.c gtktypebuiltins_vars.c gtktypebuiltins_ids.c gtktypebuiltins_evals.c gtk-boxed.defs gtk.defs genmarshal.pl gtkmarshal.list check-y.xpm check-n.xpm test.xpm marble.xpm 3DRings.xpm FilesQueue.xpm Modeller.xpm tree_plus.xpm tree_minus.xpm tree_plus.xbm tree_minus.xbm circles.xbm -@@ -162,10 +162,10 @@ noinst_PROGRAMS = testgtk testinput testselection testrgb testdnd simple # testthreads -DEPS = libgtk.la $(top_builddir)/gdk/libgdk.la -+DEPS = libgtk11d.la $(top_builddir)/gdk/libgdk11d.la ++DEPS = libgtk12.la $(top_builddir)/gdk/libgdk12.la -LDADDS = libgtk.la $(top_builddir)/gdk/libgdk.la @x_ldflags@ @x_libs@ @GLIB_LIBS@ -lm -+LDADDS = libgtk11d.la $(top_builddir)/gdk/libgdk11d.la @x_ldflags@ @x_libs@ @GLIB_LIBS@ -lm ++LDADDS = libgtk12.la $(top_builddir)/gdk/libgdk12.la @x_ldflags@ @x_libs@ @GLIB_LIBS@ -lm testgtk_DEPENDENCIES = $(DEPS) -@@ -197,8 +197,8 @@ - X_LIBS = @X_LIBS@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ --libgtk_la_LIBADD = --libgtk_la_OBJECTS = gtkaccelgroup.lo gtkaccellabel.lo gtkadjustment.lo \ -+libgtk11d_la_LIBADD = -+libgtk11d_la_OBJECTS = gtkaccelgroup.lo gtkaccellabel.lo gtkadjustment.lo \ - gtkalignment.lo gtkarg.lo gtkarrow.lo gtkaspectframe.lo gtkbin.lo \ - gtkbindings.lo gtkbbox.lo gtkbox.lo gtkbutton.lo gtkcalendar.lo \ - gtkcheckbutton.lo gtkcheckmenuitem.lo gtkclist.lo gtkcolorsel.lo \ -@@ -255,8 +255,8 @@ - - TAR = tar - GZIP_ENV = --best --SOURCES = $(libgtk_la_SOURCES) testgtk.c testinput.c testselection.c testrgb.c testdnd.c simple.c --OBJECTS = $(libgtk_la_OBJECTS) testgtk.o testinput.o testselection.o testrgb.o testdnd.o simple.o -+SOURCES = $(libgtk11d_la_SOURCES) testgtk.c testinput.c testselection.c testrgb.c testdnd.c simple.c -+OBJECTS = $(libgtk11d_la_OBJECTS) testgtk.o testinput.o testselection.o testrgb.o testdnd.o simple.o - - all: all-redirect - .SUFFIXES: -@@ -334,8 +334,8 @@ +@@ -342,7 +342,7 @@ maintainer-clean-libtool: -libgtk.la: $(libgtk_la_OBJECTS) $(libgtk_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libgtk_la_LDFLAGS) $(libgtk_la_OBJECTS) $(libgtk_la_LIBADD) $(LIBS) -+libgtk11d.la: $(libgtk11d_la_OBJECTS) $(libgtk11d_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libgtk11d_la_LDFLAGS) $(libgtk11d_la_OBJECTS) $(libgtk11d_la_LIBADD) $(LIBS) ++libgtk12.la: $(libgtk_la_OBJECTS) $(libgtk_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libgtk_la_LDFLAGS) $(libgtk_la_OBJECTS) $(libgtk_la_LIBADD) $(LIBS) mostlyclean-noinstPROGRAMS: - -@@ -450,7 +450,7 @@ - uninstall-am: uninstall-libLTLIBRARIES uninstall-gtkincludeHEADERS \ - uninstall-local +@@ -478,7 +478,7 @@ + uninstall-am: uninstall-libLTLIBRARIES uninstall-gtkconfDATA \ + uninstall-gtkincludeHEADERS uninstall-local uninstall: uninstall-am --all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) -+all-am: Makefile $(LTLIBRARIES) $(HEADERS) +-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) ++all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ---- po/Makefile.in.in.orig Sun Jan 31 23:37:42 1999 -+++ po/Makefile.in.in Sun Jan 31 23:37:51 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 ---- docs/Makefile.in.orig Tue Feb 2 03:29:59 1999 -+++ docs/Makefile.in Tue Feb 2 03:30:15 1999 +@@ -599,17 +599,11 @@ + && echo timestamp > stamp-m + + gtkrc: +- : +- +-# We create a dummy theme for the default GTK+ theme ++ echo "# Empty gtkrc for default theme" > gtkrc + + install-data-local: +- $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk +- echo "# Empty gtkrc for default theme" > \ +- $(DESTDIR)$(datadir)/themes/Default/gtk/gtkrc + + uninstall-local: +- rm -f $(DESTDIR)$(datadir)/themes/Default/gtkrc + + .PHONY: files test test-debug + +--- docs/Makefile.in.orig Thu Feb 25 22:17:02 1999 ++++ docs/Makefile.in Tue Mar 2 11:39:50 1999 @@ -99,7 +99,7 @@ LT_RELEASE = @LT_RELEASE@ LT_REVISION = @LT_REVISION@ @@ -211,3 +174,30 @@ MKINSTALLDIRS = @MKINSTALLDIRS@ NM = @NM@ PACKAGE = @PACKAGE@ +@@ -125,7 +125,7 @@ + + info_TEXINFOS = gdk.texi gtk.texi + +-man_MANS = gtk-config.1 ++man_MANS = gtk12-config.1 + + TUTORIAL_FR_FILES = html/gtk_tut_fr-1.html html/gtk_tut_fr-2.html html/gtk_tut_fr-3.html html/gtk_tut_fr-4.html html/gtk_tut_fr-5.html html/gtk_tut_fr-6.html html/gtk_tut_fr-7.html html/gtk_tut_fr-8.html html/gtk_tut_fr-9.html html/gtk_tut_fr-10.html html/gtk_tut_fr-11.html html/gtk_tut_fr-12.html html/gtk_tut_fr-13.html html/gtk_tut_fr-14.html html/gtk_tut_fr-15.html html/gtk_tut_fr-16.html html/gtk_tut_fr-17.html html/gtk_tut_fr-18.html html/gtk_tut_fr-19.html html/gtk_tut_fr-20.html html/gtk_tut_fr-21.html html/gtk_tut_fr-22.html html/gtk_tut_fr-23.html html/gtk_tut_fr-24.html html/gtk_tut_fr.html text/gtk_tut_fr.txt + +@@ -139,7 +139,7 @@ + FAQ_FILES = html/gtkfaq.html html/gtkfaq-1.html html/gtkfaq-2.html html/gtkfaq-3.html html/gtkfaq-4.html html/gtkfaq-5.html html/gtkfaq-6.html html/gtkfaq-7.html text/gtkfaq.txt + + +-EXTRA_DIST = gtk-config.1 texinfo.tex macros.texi gtkdocs_fix gtkfaq.sgml gtk-config.txt gtk_tut.sgml gtk_tut_it.sgml gtk_tut_fr.sgml debugging.txt developers.txt refcounting.txt styles.txt text_widget.txt widget_system.txt gtk_tut_packbox1.gif gtk_tut_packbox2.gif html/gtk_tut_table.gif html/gtk_tut_packbox1.gif html/gtk_tut_packbox2.gif gtk_tut_table.gif html/gdk.html html/gdk_toc.html html/gtk.html html/gtk_toc.html $(TUTORIAL_FILES) $(TUTORIAL_FR_FILES) $(TUTORIAL_IT_FILES) $(FAQ_FILES) ++EXTRA_DIST = gtk12-config.1 texinfo.tex macros.texi gtkdocs_fix gtkfaq.sgml gtk-config.txt gtk_tut.sgml gtk_tut_it.sgml gtk_tut_fr.sgml debugging.txt developers.txt refcounting.txt styles.txt text_widget.txt widget_system.txt gtk_tut_packbox1.gif gtk_tut_packbox2.gif html/gtk_tut_table.gif html/gtk_tut_packbox1.gif html/gtk_tut_packbox2.gif gtk_tut_table.gif html/gdk.html html/gdk_toc.html html/gtk.html html/gtk_toc.html $(TUTORIAL_FILES) $(TUTORIAL_FR_FILES) $(TUTORIAL_IT_FILES) $(FAQ_FILES) + + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +@@ -177,6 +177,8 @@ + gtk.info: gtk.texi + gtk.dvi: gtk.texi + ++gtk12-config.1: gtk-config.1 ++ cp gtk-config.1 gtk12-config.1 + + DVIPS = dvips + diff --git a/x11-toolkits/gtk12/files/patch-ab b/x11-toolkits/gtk12/files/patch-ab index 8bcd09e856f3..5daa432dc5b9 100644 --- a/x11-toolkits/gtk12/files/patch-ab +++ b/x11-toolkits/gtk12/files/patch-ab @@ -1,10 +1,19 @@ --- gtk-config.in.orig Thu Feb 4 17:06:44 1999 +++ gtk-config.in Wed Feb 17 21:22:48 1999 +@@ -12,7 +12,7 @@ + usage() + { + cat <<EOF +-Usage: gtk-config [OPTIONS] [LIBRARIES] ++Usage: gtk12-config [OPTIONS] [LIBRARIES] + Options: + [--prefix[=DIR]] + [--exec-prefix[=DIR]] @@ -115,6 +115,6 @@ fi done - echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm -+ echo $libdirs @x_ldflags@ -lgtk11d -lgdk11d $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm ++ echo $libdirs @x_ldflags@ -lgtk12 -lgdk12 $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm fi diff --git a/x11-toolkits/gtk12/files/patch-ad b/x11-toolkits/gtk12/files/patch-ad index e0851a1a730f..43832268e1e3 100644 --- a/x11-toolkits/gtk12/files/patch-ad +++ b/x11-toolkits/gtk12/files/patch-ad @@ -1,6 +1,6 @@ --- gtk/gtkrc.c.orig Mon Jan 4 17:33:28 1999 +++ gtk/gtkrc.c Tue Jan 5 07:41:04 1999 -@@ -223,9 +223,9 @@ +@@ -231,9 +231,9 @@ var = getenv("GTK_EXE_PREFIX"); if (var) @@ -12,7 +12,7 @@ return path; } -@@ -238,9 +238,9 @@ +@@ -246,9 +246,9 @@ var = getenv("GTK_DATA_PREFIX"); if (var) @@ -24,7 +24,7 @@ for (n = 0; pixmap_path[n]; n++) ; if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1) -@@ -274,15 +274,15 @@ +@@ -282,15 +282,15 @@ var = getenv("GTK_EXE_PREFIX"); if (var) @@ -43,3 +43,12 @@ module_path[n++] = g_strdup(path); module_path[n] = NULL; g_free(path); +@@ -324,7 +324,7 @@ + } + else + { +- str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtk/gtkrc"); ++ str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtkrc"); + gtk_rc_add_default_file (str); + g_free (str); + diff --git a/x11-toolkits/gtk12/files/patch-ae b/x11-toolkits/gtk12/files/patch-ae index 20f506155853..854b0d4e5cc3 100644 --- a/x11-toolkits/gtk12/files/patch-ae +++ b/x11-toolkits/gtk12/files/patch-ae @@ -1,11 +1,11 @@ ---- configure.orig Thu Feb 18 01:35:07 1999 -+++ configure Thu Feb 18 01:35:27 1999 -@@ -4444,7 +4444,7 @@ - - # AM_GTK_GNU_GETTEXT above substs $DATADIRNAME - # this is the directory where the *.{mo,gmo} files are installed --gtklocaledir='${prefix}/${DATADIRNAME}/locale' -+gtklocaledir='${prefix}/share/locale' - - - echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6 +--- configure.orig Thu Feb 25 13:02:28 1999 ++++ configure Tue Mar 2 11:11:14 1999 +@@ -3977,7 +3977,7 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + CATOBJEXT=.mo +- DATADIRNAME=lib ++ DATADIRNAME=share + fi + rm -f conftest* + INSTOBJEXT=.mo diff --git a/x11-toolkits/gtk12/pkg-descr b/x11-toolkits/gtk12/pkg-descr index 15cddd29f66d..75f50206dbe7 100644 --- a/x11-toolkits/gtk12/pkg-descr +++ b/x11-toolkits/gtk12/pkg-descr @@ -2,10 +2,9 @@ the Motif "look and feel". It is designed to be small and efficient, but still flexible enough to allow the programmer freedom in the interfaces created. GTK allows the programmer to use a variety of standard user -interface widgets (*note Widgets::.) such as push, radio and check -buttons, menus, lists and frames. It also provides several "container" -widgets which can be used to control the layout of the user interface -elements. +interface widgets such as push, radio and check buttons, menus, lists +and frames. It also provides several "container" widgets which can be +used to control the layout of the user interface elements. GTK provides some unique features. (At least, I know of no other widget library which provides them). For example, a button does not diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist index 33398999e7a4..eaa533417e51 100644 --- a/x11-toolkits/gtk12/pkg-plist +++ b/x11-toolkits/gtk12/pkg-plist @@ -1,124 +1,124 @@ -bin/gtk11d-config -include/gtk11d/gdk/gdk.h -include/gtk11d/gdk/gdkcursors.h -include/gtk11d/gdk/gdki18n.h -include/gtk11d/gdk/gdkkeysyms.h -include/gtk11d/gdk/gdkprivate.h -include/gtk11d/gdk/gdkrgb.h -include/gtk11d/gdk/gdktypes.h -include/gtk11d/gdk/gdkx.h -include/gtk11d/gtk/gtk.h -include/gtk11d/gtk/gtkaccelgroup.h -include/gtk11d/gtk/gtkaccellabel.h -include/gtk11d/gtk/gtkadjustment.h -include/gtk11d/gtk/gtkalignment.h -include/gtk11d/gtk/gtkarg.h -include/gtk11d/gtk/gtkarrow.h -include/gtk11d/gtk/gtkaspectframe.h -include/gtk11d/gtk/gtkbbox.h -include/gtk11d/gtk/gtkbin.h -include/gtk11d/gtk/gtkbindings.h -include/gtk11d/gtk/gtkbox.h -include/gtk11d/gtk/gtkbutton.h -include/gtk11d/gtk/gtkcalendar.h -include/gtk11d/gtk/gtkcheckbutton.h -include/gtk11d/gtk/gtkcheckmenuitem.h -include/gtk11d/gtk/gtkclist.h -include/gtk11d/gtk/gtkcolorsel.h -include/gtk11d/gtk/gtkcombo.h -include/gtk11d/gtk/gtkcompat.h -include/gtk11d/gtk/gtkcontainer.h -include/gtk11d/gtk/gtkctree.h -include/gtk11d/gtk/gtkcurve.h -include/gtk11d/gtk/gtkdata.h -include/gtk11d/gtk/gtkdebug.h -include/gtk11d/gtk/gtkdialog.h -include/gtk11d/gtk/gtkdnd.h -include/gtk11d/gtk/gtkdrawingarea.h -include/gtk11d/gtk/gtkeditable.h -include/gtk11d/gtk/gtkentry.h -include/gtk11d/gtk/gtkenums.h -include/gtk11d/gtk/gtkeventbox.h -include/gtk11d/gtk/gtkfeatures.h -include/gtk11d/gtk/gtkfilesel.h -include/gtk11d/gtk/gtkfixed.h -include/gtk11d/gtk/gtkfontsel.h -include/gtk11d/gtk/gtkframe.h -include/gtk11d/gtk/gtkgamma.h -include/gtk11d/gtk/gtkgc.h -include/gtk11d/gtk/gtkhandlebox.h -include/gtk11d/gtk/gtkhbbox.h -include/gtk11d/gtk/gtkhbox.h -include/gtk11d/gtk/gtkhpaned.h -include/gtk11d/gtk/gtkhruler.h -include/gtk11d/gtk/gtkhscale.h -include/gtk11d/gtk/gtkhscrollbar.h -include/gtk11d/gtk/gtkhseparator.h -include/gtk11d/gtk/gtkimage.h -include/gtk11d/gtk/gtkinputdialog.h -include/gtk11d/gtk/gtkinvisible.h -include/gtk11d/gtk/gtkitem.h -include/gtk11d/gtk/gtkitemfactory.h -include/gtk11d/gtk/gtklabel.h -include/gtk11d/gtk/gtklayout.h -include/gtk11d/gtk/gtklist.h -include/gtk11d/gtk/gtklistitem.h -include/gtk11d/gtk/gtkmain.h -include/gtk11d/gtk/gtkmarshal.h -include/gtk11d/gtk/gtkmenu.h -include/gtk11d/gtk/gtkmenubar.h -include/gtk11d/gtk/gtkmenufactory.h -include/gtk11d/gtk/gtkmenuitem.h -include/gtk11d/gtk/gtkmenushell.h -include/gtk11d/gtk/gtkmisc.h -include/gtk11d/gtk/gtknotebook.h -include/gtk11d/gtk/gtkobject.h -include/gtk11d/gtk/gtkoptionmenu.h -include/gtk11d/gtk/gtkpacker.h -include/gtk11d/gtk/gtkpaned.h -include/gtk11d/gtk/gtkpixmap.h -include/gtk11d/gtk/gtkplug.h -include/gtk11d/gtk/gtkpreview.h -include/gtk11d/gtk/gtkprivate.h -include/gtk11d/gtk/gtkprogress.h -include/gtk11d/gtk/gtkprogressbar.h -include/gtk11d/gtk/gtkradiobutton.h -include/gtk11d/gtk/gtkradiomenuitem.h -include/gtk11d/gtk/gtkrange.h -include/gtk11d/gtk/gtkrc.h -include/gtk11d/gtk/gtkruler.h -include/gtk11d/gtk/gtkscale.h -include/gtk11d/gtk/gtkscrollbar.h -include/gtk11d/gtk/gtkscrolledwindow.h -include/gtk11d/gtk/gtkselection.h -include/gtk11d/gtk/gtkseparator.h -include/gtk11d/gtk/gtksignal.h -include/gtk11d/gtk/gtksocket.h -include/gtk11d/gtk/gtkspinbutton.h -include/gtk11d/gtk/gtkstatusbar.h -include/gtk11d/gtk/gtkstyle.h -include/gtk11d/gtk/gtktable.h -include/gtk11d/gtk/gtktearoffmenuitem.h -include/gtk11d/gtk/gtktext.h -include/gtk11d/gtk/gtkthemes.h -include/gtk11d/gtk/gtktipsquery.h -include/gtk11d/gtk/gtktogglebutton.h -include/gtk11d/gtk/gtktoolbar.h -include/gtk11d/gtk/gtktooltips.h -include/gtk11d/gtk/gtktree.h -include/gtk11d/gtk/gtktreeitem.h -include/gtk11d/gtk/gtktypebuiltins.h -include/gtk11d/gtk/gtktypeutils.h -include/gtk11d/gtk/gtkvbbox.h -include/gtk11d/gtk/gtkvbox.h -include/gtk11d/gtk/gtkviewport.h -include/gtk11d/gtk/gtkvpaned.h -include/gtk11d/gtk/gtkvruler.h -include/gtk11d/gtk/gtkvscale.h -include/gtk11d/gtk/gtkvscrollbar.h -include/gtk11d/gtk/gtkvseparator.h -include/gtk11d/gtk/gtkwidget.h -include/gtk11d/gtk/gtkwindow.h +bin/gtk12-config +include/gtk12/gdk/gdk.h +include/gtk12/gdk/gdkcursors.h +include/gtk12/gdk/gdki18n.h +include/gtk12/gdk/gdkkeysyms.h +include/gtk12/gdk/gdkprivate.h +include/gtk12/gdk/gdkrgb.h +include/gtk12/gdk/gdktypes.h +include/gtk12/gdk/gdkx.h +include/gtk12/gtk/gtk.h +include/gtk12/gtk/gtkaccelgroup.h +include/gtk12/gtk/gtkaccellabel.h +include/gtk12/gtk/gtkadjustment.h +include/gtk12/gtk/gtkalignment.h +include/gtk12/gtk/gtkarg.h +include/gtk12/gtk/gtkarrow.h +include/gtk12/gtk/gtkaspectframe.h +include/gtk12/gtk/gtkbbox.h +include/gtk12/gtk/gtkbin.h +include/gtk12/gtk/gtkbindings.h +include/gtk12/gtk/gtkbox.h +include/gtk12/gtk/gtkbutton.h +include/gtk12/gtk/gtkcalendar.h +include/gtk12/gtk/gtkcheckbutton.h +include/gtk12/gtk/gtkcheckmenuitem.h +include/gtk12/gtk/gtkclist.h +include/gtk12/gtk/gtkcolorsel.h +include/gtk12/gtk/gtkcombo.h +include/gtk12/gtk/gtkcompat.h +include/gtk12/gtk/gtkcontainer.h +include/gtk12/gtk/gtkctree.h +include/gtk12/gtk/gtkcurve.h +include/gtk12/gtk/gtkdata.h +include/gtk12/gtk/gtkdebug.h +include/gtk12/gtk/gtkdialog.h +include/gtk12/gtk/gtkdnd.h +include/gtk12/gtk/gtkdrawingarea.h +include/gtk12/gtk/gtkeditable.h +include/gtk12/gtk/gtkentry.h +include/gtk12/gtk/gtkenums.h +include/gtk12/gtk/gtkeventbox.h +include/gtk12/gtk/gtkfeatures.h +include/gtk12/gtk/gtkfilesel.h +include/gtk12/gtk/gtkfixed.h +include/gtk12/gtk/gtkfontsel.h +include/gtk12/gtk/gtkframe.h +include/gtk12/gtk/gtkgamma.h +include/gtk12/gtk/gtkgc.h +include/gtk12/gtk/gtkhandlebox.h +include/gtk12/gtk/gtkhbbox.h +include/gtk12/gtk/gtkhbox.h +include/gtk12/gtk/gtkhpaned.h +include/gtk12/gtk/gtkhruler.h +include/gtk12/gtk/gtkhscale.h +include/gtk12/gtk/gtkhscrollbar.h +include/gtk12/gtk/gtkhseparator.h +include/gtk12/gtk/gtkimage.h +include/gtk12/gtk/gtkinputdialog.h +include/gtk12/gtk/gtkinvisible.h +include/gtk12/gtk/gtkitem.h +include/gtk12/gtk/gtkitemfactory.h +include/gtk12/gtk/gtklabel.h +include/gtk12/gtk/gtklayout.h +include/gtk12/gtk/gtklist.h +include/gtk12/gtk/gtklistitem.h +include/gtk12/gtk/gtkmain.h +include/gtk12/gtk/gtkmarshal.h +include/gtk12/gtk/gtkmenu.h +include/gtk12/gtk/gtkmenubar.h +include/gtk12/gtk/gtkmenufactory.h +include/gtk12/gtk/gtkmenuitem.h +include/gtk12/gtk/gtkmenushell.h +include/gtk12/gtk/gtkmisc.h +include/gtk12/gtk/gtknotebook.h +include/gtk12/gtk/gtkobject.h +include/gtk12/gtk/gtkoptionmenu.h +include/gtk12/gtk/gtkpacker.h +include/gtk12/gtk/gtkpaned.h +include/gtk12/gtk/gtkpixmap.h +include/gtk12/gtk/gtkplug.h +include/gtk12/gtk/gtkpreview.h +include/gtk12/gtk/gtkprivate.h +include/gtk12/gtk/gtkprogress.h +include/gtk12/gtk/gtkprogressbar.h +include/gtk12/gtk/gtkradiobutton.h +include/gtk12/gtk/gtkradiomenuitem.h +include/gtk12/gtk/gtkrange.h +include/gtk12/gtk/gtkrc.h +include/gtk12/gtk/gtkruler.h +include/gtk12/gtk/gtkscale.h +include/gtk12/gtk/gtkscrollbar.h +include/gtk12/gtk/gtkscrolledwindow.h +include/gtk12/gtk/gtkselection.h +include/gtk12/gtk/gtkseparator.h +include/gtk12/gtk/gtksignal.h +include/gtk12/gtk/gtksocket.h +include/gtk12/gtk/gtkspinbutton.h +include/gtk12/gtk/gtkstatusbar.h +include/gtk12/gtk/gtkstyle.h +include/gtk12/gtk/gtktable.h +include/gtk12/gtk/gtktearoffmenuitem.h +include/gtk12/gtk/gtktext.h +include/gtk12/gtk/gtkthemes.h +include/gtk12/gtk/gtktipsquery.h +include/gtk12/gtk/gtktogglebutton.h +include/gtk12/gtk/gtktoolbar.h +include/gtk12/gtk/gtktooltips.h +include/gtk12/gtk/gtktree.h +include/gtk12/gtk/gtktreeitem.h +include/gtk12/gtk/gtktypebuiltins.h +include/gtk12/gtk/gtktypeutils.h +include/gtk12/gtk/gtkvbbox.h +include/gtk12/gtk/gtkvbox.h +include/gtk12/gtk/gtkviewport.h +include/gtk12/gtk/gtkvpaned.h +include/gtk12/gtk/gtkvruler.h +include/gtk12/gtk/gtkvscale.h +include/gtk12/gtk/gtkvscrollbar.h +include/gtk12/gtk/gtkvseparator.h +include/gtk12/gtk/gtkwidget.h +include/gtk12/gtk/gtkwindow.h @unexec install-info --delete %D/info/gdk.info %D/info/dir @unexec install-info --delete %D/info/gtk.info %D/info/dir info/gdk.info @@ -126,20 +126,21 @@ info/gtk.info @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/gdk.info %D/info/dir @exec install-info %D/info/gtk.info %D/info/dir -lib/libgdk11d.a -lib/libgdk11d.la -lib/libgdk11d.so -lib/libgdk11d.so.1.3 -lib/libgtk11d.a -lib/libgtk11d.la -lib/libgtk11d.so -lib/libgtk11d.so.1.3 +lib/libgdk12.a +lib/libgdk12.la +lib/libgdk12.so +lib/libgdk12.so.1 +lib/libgtk12.a +lib/libgtk12.la +lib/libgtk12.so +lib/libgtk12.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/locale/cs/LC_MESSAGES/gtk+.mo share/locale/de/LC_MESSAGES/gtk+.mo share/locale/es/LC_MESSAGES/gtk+.mo share/locale/fr/LC_MESSAGES/gtk+.mo +share/locale/hu/LC_MESSAGES/gtk+.mo share/locale/it/LC_MESSAGES/gtk+.mo share/locale/ja/LC_MESSAGES/gtk+.mo share/locale/ko/LC_MESSAGES/gtk+.mo @@ -150,10 +151,14 @@ share/locale/pt/LC_MESSAGES/gtk+.mo share/locale/ru/LC_MESSAGES/gtk+.mo share/locale/sv/LC_MESSAGES/gtk+.mo share/themes/Default/gtk/gtkrc +share/themes/Default/gtk/gtkrc.ja +share/themes/Default/gtk/gtkrc.ko +share/themes/Default/gtk/gtkrc.ru +@exec mkdir -p %D/share/themes/engines @dirrm share/themes/Default/gtk @dirrm share/themes/Default @dirrm share/themes/engines @dirrm share/themes -@dirrm include/gtk11d/gdk -@dirrm include/gtk11d/gtk -@dirrm include/gtk11d +@dirrm include/gtk12/gdk +@dirrm include/gtk12/gtk +@dirrm include/gtk12 diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile index 47d3fc8e8399..0136c7202403 100644 --- a/x11-toolkits/gtk13/Makefile +++ b/x11-toolkits/gtk13/Makefile @@ -1,43 +1,49 @@ -# New ports collection makefile for: gtk11-devel -# Version required: 1.1.16 +# New ports collection makefile for: gtk12 +# Version required: 1.2.0 # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $Id: Makefile,v 1.44 1999/02/18 04:49:25 vanilla Exp $ # -DISTNAME= gtk+-1.1.16 -PKGNAME= gtk-1.1.16 +DISTNAME= gtk+-1.2.0 +PKGNAME= gtk-1.2.0 CATEGORIES= x11-toolkits -MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ - ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ - http://www.ameth.org/gimp/gtk/v1.1/ +MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \ + ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \ + http://www.ameth.org/gimp/gtk/v1.2/ MAINTAINER= vanilla@FreeBSD.ORG BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext -LIB_DEPENDS= glib11d.2:${PORTSDIR}/devel/glib11-devel +LIB_DEPENDS= glib12.1:${PORTSDIR}/devel/glib12 USE_X_PREFIX= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk11d +CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ + GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \ LIBS="-L${LOCALBASE}/lib" -MAN1= gtk-config.1 +MAN1= gtk12-config.1 pre-build: ${RM} -rf ${WRKSRC}/docs/gtk.info* post-install: - @${MKDIR} ${LOCALBASE}/share/aclocal - @${INSTALL_DATA} ${WRKSRC}/gtk.m4 ${LOCALBASE}/share/aclocal/gtk11d.m4 + @${MKDIR} ${PREFIX}/share/themes/engines @if [ ! -f ${PREFIX}/share/info ]; then \ ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ fi @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib + @${ECHO} '*********************************************************' + @${ECHO} '* *' + @${ECHO} '* If you want to use autoconf with gtk, *' + @${ECHO} '* Please copy gtk.m4 to /usr/local/share/aclocal *' + @${ECHO} '* by yourself, thanks. *' + @${ECHO} '* *' + @${ECHO} '*********************************************************' .include <bsd.port.mk> diff --git a/x11-toolkits/gtk13/distinfo b/x11-toolkits/gtk13/distinfo index 992dadfae7e1..b648580fc3d6 100644 --- a/x11-toolkits/gtk13/distinfo +++ b/x11-toolkits/gtk13/distinfo @@ -1 +1 @@ -MD5 (gtk+-1.1.16.tar.gz) = 6de7a1a397eac37d7fc1f8ef008a9f02 +MD5 (gtk+-1.2.0.tar.gz) = d935cf94a4b0167b6b3570580a1013b9 diff --git a/x11-toolkits/gtk13/files/patch-ad b/x11-toolkits/gtk13/files/patch-ad index e0851a1a730f..43832268e1e3 100644 --- a/x11-toolkits/gtk13/files/patch-ad +++ b/x11-toolkits/gtk13/files/patch-ad @@ -1,6 +1,6 @@ --- gtk/gtkrc.c.orig Mon Jan 4 17:33:28 1999 +++ gtk/gtkrc.c Tue Jan 5 07:41:04 1999 -@@ -223,9 +223,9 @@ +@@ -231,9 +231,9 @@ var = getenv("GTK_EXE_PREFIX"); if (var) @@ -12,7 +12,7 @@ return path; } -@@ -238,9 +238,9 @@ +@@ -246,9 +246,9 @@ var = getenv("GTK_DATA_PREFIX"); if (var) @@ -24,7 +24,7 @@ for (n = 0; pixmap_path[n]; n++) ; if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1) -@@ -274,15 +274,15 @@ +@@ -282,15 +282,15 @@ var = getenv("GTK_EXE_PREFIX"); if (var) @@ -43,3 +43,12 @@ module_path[n++] = g_strdup(path); module_path[n] = NULL; g_free(path); +@@ -324,7 +324,7 @@ + } + else + { +- str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtk/gtkrc"); ++ str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtkrc"); + gtk_rc_add_default_file (str); + g_free (str); + diff --git a/x11-toolkits/gtk13/files/patch-ae b/x11-toolkits/gtk13/files/patch-ae index 20f506155853..854b0d4e5cc3 100644 --- a/x11-toolkits/gtk13/files/patch-ae +++ b/x11-toolkits/gtk13/files/patch-ae @@ -1,11 +1,11 @@ ---- configure.orig Thu Feb 18 01:35:07 1999 -+++ configure Thu Feb 18 01:35:27 1999 -@@ -4444,7 +4444,7 @@ - - # AM_GTK_GNU_GETTEXT above substs $DATADIRNAME - # this is the directory where the *.{mo,gmo} files are installed --gtklocaledir='${prefix}/${DATADIRNAME}/locale' -+gtklocaledir='${prefix}/share/locale' - - - echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6 +--- configure.orig Thu Feb 25 13:02:28 1999 ++++ configure Tue Mar 2 11:11:14 1999 +@@ -3977,7 +3977,7 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + CATOBJEXT=.mo +- DATADIRNAME=lib ++ DATADIRNAME=share + fi + rm -f conftest* + INSTOBJEXT=.mo diff --git a/x11-toolkits/gtk13/pkg-descr b/x11-toolkits/gtk13/pkg-descr index 15cddd29f66d..75f50206dbe7 100644 --- a/x11-toolkits/gtk13/pkg-descr +++ b/x11-toolkits/gtk13/pkg-descr @@ -2,10 +2,9 @@ the Motif "look and feel". It is designed to be small and efficient, but still flexible enough to allow the programmer freedom in the interfaces created. GTK allows the programmer to use a variety of standard user -interface widgets (*note Widgets::.) such as push, radio and check -buttons, menus, lists and frames. It also provides several "container" -widgets which can be used to control the layout of the user interface -elements. +interface widgets such as push, radio and check buttons, menus, lists +and frames. It also provides several "container" widgets which can be +used to control the layout of the user interface elements. GTK provides some unique features. (At least, I know of no other widget library which provides them). For example, a button does not diff --git a/x11-toolkits/gtk13/pkg-plist b/x11-toolkits/gtk13/pkg-plist index 33398999e7a4..eaa533417e51 100644 --- a/x11-toolkits/gtk13/pkg-plist +++ b/x11-toolkits/gtk13/pkg-plist @@ -1,124 +1,124 @@ -bin/gtk11d-config -include/gtk11d/gdk/gdk.h -include/gtk11d/gdk/gdkcursors.h -include/gtk11d/gdk/gdki18n.h -include/gtk11d/gdk/gdkkeysyms.h -include/gtk11d/gdk/gdkprivate.h -include/gtk11d/gdk/gdkrgb.h -include/gtk11d/gdk/gdktypes.h -include/gtk11d/gdk/gdkx.h -include/gtk11d/gtk/gtk.h -include/gtk11d/gtk/gtkaccelgroup.h -include/gtk11d/gtk/gtkaccellabel.h -include/gtk11d/gtk/gtkadjustment.h -include/gtk11d/gtk/gtkalignment.h -include/gtk11d/gtk/gtkarg.h -include/gtk11d/gtk/gtkarrow.h -include/gtk11d/gtk/gtkaspectframe.h -include/gtk11d/gtk/gtkbbox.h -include/gtk11d/gtk/gtkbin.h -include/gtk11d/gtk/gtkbindings.h -include/gtk11d/gtk/gtkbox.h -include/gtk11d/gtk/gtkbutton.h -include/gtk11d/gtk/gtkcalendar.h -include/gtk11d/gtk/gtkcheckbutton.h -include/gtk11d/gtk/gtkcheckmenuitem.h -include/gtk11d/gtk/gtkclist.h -include/gtk11d/gtk/gtkcolorsel.h -include/gtk11d/gtk/gtkcombo.h -include/gtk11d/gtk/gtkcompat.h -include/gtk11d/gtk/gtkcontainer.h -include/gtk11d/gtk/gtkctree.h -include/gtk11d/gtk/gtkcurve.h -include/gtk11d/gtk/gtkdata.h -include/gtk11d/gtk/gtkdebug.h -include/gtk11d/gtk/gtkdialog.h -include/gtk11d/gtk/gtkdnd.h -include/gtk11d/gtk/gtkdrawingarea.h -include/gtk11d/gtk/gtkeditable.h -include/gtk11d/gtk/gtkentry.h -include/gtk11d/gtk/gtkenums.h -include/gtk11d/gtk/gtkeventbox.h -include/gtk11d/gtk/gtkfeatures.h -include/gtk11d/gtk/gtkfilesel.h -include/gtk11d/gtk/gtkfixed.h -include/gtk11d/gtk/gtkfontsel.h -include/gtk11d/gtk/gtkframe.h -include/gtk11d/gtk/gtkgamma.h -include/gtk11d/gtk/gtkgc.h -include/gtk11d/gtk/gtkhandlebox.h -include/gtk11d/gtk/gtkhbbox.h -include/gtk11d/gtk/gtkhbox.h -include/gtk11d/gtk/gtkhpaned.h -include/gtk11d/gtk/gtkhruler.h -include/gtk11d/gtk/gtkhscale.h -include/gtk11d/gtk/gtkhscrollbar.h -include/gtk11d/gtk/gtkhseparator.h -include/gtk11d/gtk/gtkimage.h -include/gtk11d/gtk/gtkinputdialog.h -include/gtk11d/gtk/gtkinvisible.h -include/gtk11d/gtk/gtkitem.h -include/gtk11d/gtk/gtkitemfactory.h -include/gtk11d/gtk/gtklabel.h -include/gtk11d/gtk/gtklayout.h -include/gtk11d/gtk/gtklist.h -include/gtk11d/gtk/gtklistitem.h -include/gtk11d/gtk/gtkmain.h -include/gtk11d/gtk/gtkmarshal.h -include/gtk11d/gtk/gtkmenu.h -include/gtk11d/gtk/gtkmenubar.h -include/gtk11d/gtk/gtkmenufactory.h -include/gtk11d/gtk/gtkmenuitem.h -include/gtk11d/gtk/gtkmenushell.h -include/gtk11d/gtk/gtkmisc.h -include/gtk11d/gtk/gtknotebook.h -include/gtk11d/gtk/gtkobject.h -include/gtk11d/gtk/gtkoptionmenu.h -include/gtk11d/gtk/gtkpacker.h -include/gtk11d/gtk/gtkpaned.h -include/gtk11d/gtk/gtkpixmap.h -include/gtk11d/gtk/gtkplug.h -include/gtk11d/gtk/gtkpreview.h -include/gtk11d/gtk/gtkprivate.h -include/gtk11d/gtk/gtkprogress.h -include/gtk11d/gtk/gtkprogressbar.h -include/gtk11d/gtk/gtkradiobutton.h -include/gtk11d/gtk/gtkradiomenuitem.h -include/gtk11d/gtk/gtkrange.h -include/gtk11d/gtk/gtkrc.h -include/gtk11d/gtk/gtkruler.h -include/gtk11d/gtk/gtkscale.h -include/gtk11d/gtk/gtkscrollbar.h -include/gtk11d/gtk/gtkscrolledwindow.h -include/gtk11d/gtk/gtkselection.h -include/gtk11d/gtk/gtkseparator.h -include/gtk11d/gtk/gtksignal.h -include/gtk11d/gtk/gtksocket.h -include/gtk11d/gtk/gtkspinbutton.h -include/gtk11d/gtk/gtkstatusbar.h -include/gtk11d/gtk/gtkstyle.h -include/gtk11d/gtk/gtktable.h -include/gtk11d/gtk/gtktearoffmenuitem.h -include/gtk11d/gtk/gtktext.h -include/gtk11d/gtk/gtkthemes.h -include/gtk11d/gtk/gtktipsquery.h -include/gtk11d/gtk/gtktogglebutton.h -include/gtk11d/gtk/gtktoolbar.h -include/gtk11d/gtk/gtktooltips.h -include/gtk11d/gtk/gtktree.h -include/gtk11d/gtk/gtktreeitem.h -include/gtk11d/gtk/gtktypebuiltins.h -include/gtk11d/gtk/gtktypeutils.h -include/gtk11d/gtk/gtkvbbox.h -include/gtk11d/gtk/gtkvbox.h -include/gtk11d/gtk/gtkviewport.h -include/gtk11d/gtk/gtkvpaned.h -include/gtk11d/gtk/gtkvruler.h -include/gtk11d/gtk/gtkvscale.h -include/gtk11d/gtk/gtkvscrollbar.h -include/gtk11d/gtk/gtkvseparator.h -include/gtk11d/gtk/gtkwidget.h -include/gtk11d/gtk/gtkwindow.h +bin/gtk12-config +include/gtk12/gdk/gdk.h +include/gtk12/gdk/gdkcursors.h +include/gtk12/gdk/gdki18n.h +include/gtk12/gdk/gdkkeysyms.h +include/gtk12/gdk/gdkprivate.h +include/gtk12/gdk/gdkrgb.h +include/gtk12/gdk/gdktypes.h +include/gtk12/gdk/gdkx.h +include/gtk12/gtk/gtk.h +include/gtk12/gtk/gtkaccelgroup.h +include/gtk12/gtk/gtkaccellabel.h +include/gtk12/gtk/gtkadjustment.h +include/gtk12/gtk/gtkalignment.h +include/gtk12/gtk/gtkarg.h +include/gtk12/gtk/gtkarrow.h +include/gtk12/gtk/gtkaspectframe.h +include/gtk12/gtk/gtkbbox.h +include/gtk12/gtk/gtkbin.h +include/gtk12/gtk/gtkbindings.h +include/gtk12/gtk/gtkbox.h +include/gtk12/gtk/gtkbutton.h +include/gtk12/gtk/gtkcalendar.h +include/gtk12/gtk/gtkcheckbutton.h +include/gtk12/gtk/gtkcheckmenuitem.h +include/gtk12/gtk/gtkclist.h +include/gtk12/gtk/gtkcolorsel.h +include/gtk12/gtk/gtkcombo.h +include/gtk12/gtk/gtkcompat.h +include/gtk12/gtk/gtkcontainer.h +include/gtk12/gtk/gtkctree.h +include/gtk12/gtk/gtkcurve.h +include/gtk12/gtk/gtkdata.h +include/gtk12/gtk/gtkdebug.h +include/gtk12/gtk/gtkdialog.h +include/gtk12/gtk/gtkdnd.h +include/gtk12/gtk/gtkdrawingarea.h +include/gtk12/gtk/gtkeditable.h +include/gtk12/gtk/gtkentry.h +include/gtk12/gtk/gtkenums.h +include/gtk12/gtk/gtkeventbox.h +include/gtk12/gtk/gtkfeatures.h +include/gtk12/gtk/gtkfilesel.h +include/gtk12/gtk/gtkfixed.h +include/gtk12/gtk/gtkfontsel.h +include/gtk12/gtk/gtkframe.h +include/gtk12/gtk/gtkgamma.h +include/gtk12/gtk/gtkgc.h +include/gtk12/gtk/gtkhandlebox.h +include/gtk12/gtk/gtkhbbox.h +include/gtk12/gtk/gtkhbox.h +include/gtk12/gtk/gtkhpaned.h +include/gtk12/gtk/gtkhruler.h +include/gtk12/gtk/gtkhscale.h +include/gtk12/gtk/gtkhscrollbar.h +include/gtk12/gtk/gtkhseparator.h +include/gtk12/gtk/gtkimage.h +include/gtk12/gtk/gtkinputdialog.h +include/gtk12/gtk/gtkinvisible.h +include/gtk12/gtk/gtkitem.h +include/gtk12/gtk/gtkitemfactory.h +include/gtk12/gtk/gtklabel.h +include/gtk12/gtk/gtklayout.h +include/gtk12/gtk/gtklist.h +include/gtk12/gtk/gtklistitem.h +include/gtk12/gtk/gtkmain.h +include/gtk12/gtk/gtkmarshal.h +include/gtk12/gtk/gtkmenu.h +include/gtk12/gtk/gtkmenubar.h +include/gtk12/gtk/gtkmenufactory.h +include/gtk12/gtk/gtkmenuitem.h +include/gtk12/gtk/gtkmenushell.h +include/gtk12/gtk/gtkmisc.h +include/gtk12/gtk/gtknotebook.h +include/gtk12/gtk/gtkobject.h +include/gtk12/gtk/gtkoptionmenu.h +include/gtk12/gtk/gtkpacker.h +include/gtk12/gtk/gtkpaned.h +include/gtk12/gtk/gtkpixmap.h +include/gtk12/gtk/gtkplug.h +include/gtk12/gtk/gtkpreview.h +include/gtk12/gtk/gtkprivate.h +include/gtk12/gtk/gtkprogress.h +include/gtk12/gtk/gtkprogressbar.h +include/gtk12/gtk/gtkradiobutton.h +include/gtk12/gtk/gtkradiomenuitem.h +include/gtk12/gtk/gtkrange.h +include/gtk12/gtk/gtkrc.h +include/gtk12/gtk/gtkruler.h +include/gtk12/gtk/gtkscale.h +include/gtk12/gtk/gtkscrollbar.h +include/gtk12/gtk/gtkscrolledwindow.h +include/gtk12/gtk/gtkselection.h +include/gtk12/gtk/gtkseparator.h +include/gtk12/gtk/gtksignal.h +include/gtk12/gtk/gtksocket.h +include/gtk12/gtk/gtkspinbutton.h +include/gtk12/gtk/gtkstatusbar.h +include/gtk12/gtk/gtkstyle.h +include/gtk12/gtk/gtktable.h +include/gtk12/gtk/gtktearoffmenuitem.h +include/gtk12/gtk/gtktext.h +include/gtk12/gtk/gtkthemes.h +include/gtk12/gtk/gtktipsquery.h +include/gtk12/gtk/gtktogglebutton.h +include/gtk12/gtk/gtktoolbar.h +include/gtk12/gtk/gtktooltips.h +include/gtk12/gtk/gtktree.h +include/gtk12/gtk/gtktreeitem.h +include/gtk12/gtk/gtktypebuiltins.h +include/gtk12/gtk/gtktypeutils.h +include/gtk12/gtk/gtkvbbox.h +include/gtk12/gtk/gtkvbox.h +include/gtk12/gtk/gtkviewport.h +include/gtk12/gtk/gtkvpaned.h +include/gtk12/gtk/gtkvruler.h +include/gtk12/gtk/gtkvscale.h +include/gtk12/gtk/gtkvscrollbar.h +include/gtk12/gtk/gtkvseparator.h +include/gtk12/gtk/gtkwidget.h +include/gtk12/gtk/gtkwindow.h @unexec install-info --delete %D/info/gdk.info %D/info/dir @unexec install-info --delete %D/info/gtk.info %D/info/dir info/gdk.info @@ -126,20 +126,21 @@ info/gtk.info @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/gdk.info %D/info/dir @exec install-info %D/info/gtk.info %D/info/dir -lib/libgdk11d.a -lib/libgdk11d.la -lib/libgdk11d.so -lib/libgdk11d.so.1.3 -lib/libgtk11d.a -lib/libgtk11d.la -lib/libgtk11d.so -lib/libgtk11d.so.1.3 +lib/libgdk12.a +lib/libgdk12.la +lib/libgdk12.so +lib/libgdk12.so.1 +lib/libgtk12.a +lib/libgtk12.la +lib/libgtk12.so +lib/libgtk12.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/locale/cs/LC_MESSAGES/gtk+.mo share/locale/de/LC_MESSAGES/gtk+.mo share/locale/es/LC_MESSAGES/gtk+.mo share/locale/fr/LC_MESSAGES/gtk+.mo +share/locale/hu/LC_MESSAGES/gtk+.mo share/locale/it/LC_MESSAGES/gtk+.mo share/locale/ja/LC_MESSAGES/gtk+.mo share/locale/ko/LC_MESSAGES/gtk+.mo @@ -150,10 +151,14 @@ share/locale/pt/LC_MESSAGES/gtk+.mo share/locale/ru/LC_MESSAGES/gtk+.mo share/locale/sv/LC_MESSAGES/gtk+.mo share/themes/Default/gtk/gtkrc +share/themes/Default/gtk/gtkrc.ja +share/themes/Default/gtk/gtkrc.ko +share/themes/Default/gtk/gtkrc.ru +@exec mkdir -p %D/share/themes/engines @dirrm share/themes/Default/gtk @dirrm share/themes/Default @dirrm share/themes/engines @dirrm share/themes -@dirrm include/gtk11d/gdk -@dirrm include/gtk11d/gtk -@dirrm include/gtk11d +@dirrm include/gtk12/gdk +@dirrm include/gtk12/gtk +@dirrm include/gtk12 diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 47d3fc8e8399..0136c7202403 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -1,43 +1,49 @@ -# New ports collection makefile for: gtk11-devel -# Version required: 1.1.16 +# New ports collection makefile for: gtk12 +# Version required: 1.2.0 # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $Id: Makefile,v 1.44 1999/02/18 04:49:25 vanilla Exp $ # -DISTNAME= gtk+-1.1.16 -PKGNAME= gtk-1.1.16 +DISTNAME= gtk+-1.2.0 +PKGNAME= gtk-1.2.0 CATEGORIES= x11-toolkits -MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ - ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ - http://www.ameth.org/gimp/gtk/v1.1/ +MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \ + ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \ + http://www.ameth.org/gimp/gtk/v1.2/ MAINTAINER= vanilla@FreeBSD.ORG BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext -LIB_DEPENDS= glib11d.2:${PORTSDIR}/devel/glib11-devel +LIB_DEPENDS= glib12.1:${PORTSDIR}/devel/glib12 USE_X_PREFIX= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk11d +CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ + GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \ LIBS="-L${LOCALBASE}/lib" -MAN1= gtk-config.1 +MAN1= gtk12-config.1 pre-build: ${RM} -rf ${WRKSRC}/docs/gtk.info* post-install: - @${MKDIR} ${LOCALBASE}/share/aclocal - @${INSTALL_DATA} ${WRKSRC}/gtk.m4 ${LOCALBASE}/share/aclocal/gtk11d.m4 + @${MKDIR} ${PREFIX}/share/themes/engines @if [ ! -f ${PREFIX}/share/info ]; then \ ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ fi @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib + @${ECHO} '*********************************************************' + @${ECHO} '* *' + @${ECHO} '* If you want to use autoconf with gtk, *' + @${ECHO} '* Please copy gtk.m4 to /usr/local/share/aclocal *' + @${ECHO} '* by yourself, thanks. *' + @${ECHO} '* *' + @${ECHO} '*********************************************************' .include <bsd.port.mk> diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index 992dadfae7e1..b648580fc3d6 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1 +1 @@ -MD5 (gtk+-1.1.16.tar.gz) = 6de7a1a397eac37d7fc1f8ef008a9f02 +MD5 (gtk+-1.2.0.tar.gz) = d935cf94a4b0167b6b3570580a1013b9 diff --git a/x11-toolkits/gtk20/files/patch-ad b/x11-toolkits/gtk20/files/patch-ad index e0851a1a730f..43832268e1e3 100644 --- a/x11-toolkits/gtk20/files/patch-ad +++ b/x11-toolkits/gtk20/files/patch-ad @@ -1,6 +1,6 @@ --- gtk/gtkrc.c.orig Mon Jan 4 17:33:28 1999 +++ gtk/gtkrc.c Tue Jan 5 07:41:04 1999 -@@ -223,9 +223,9 @@ +@@ -231,9 +231,9 @@ var = getenv("GTK_EXE_PREFIX"); if (var) @@ -12,7 +12,7 @@ return path; } -@@ -238,9 +238,9 @@ +@@ -246,9 +246,9 @@ var = getenv("GTK_DATA_PREFIX"); if (var) @@ -24,7 +24,7 @@ for (n = 0; pixmap_path[n]; n++) ; if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1) -@@ -274,15 +274,15 @@ +@@ -282,15 +282,15 @@ var = getenv("GTK_EXE_PREFIX"); if (var) @@ -43,3 +43,12 @@ module_path[n++] = g_strdup(path); module_path[n] = NULL; g_free(path); +@@ -324,7 +324,7 @@ + } + else + { +- str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtk/gtkrc"); ++ str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtkrc"); + gtk_rc_add_default_file (str); + g_free (str); + diff --git a/x11-toolkits/gtk20/files/patch-ae b/x11-toolkits/gtk20/files/patch-ae index 20f506155853..854b0d4e5cc3 100644 --- a/x11-toolkits/gtk20/files/patch-ae +++ b/x11-toolkits/gtk20/files/patch-ae @@ -1,11 +1,11 @@ ---- configure.orig Thu Feb 18 01:35:07 1999 -+++ configure Thu Feb 18 01:35:27 1999 -@@ -4444,7 +4444,7 @@ - - # AM_GTK_GNU_GETTEXT above substs $DATADIRNAME - # this is the directory where the *.{mo,gmo} files are installed --gtklocaledir='${prefix}/${DATADIRNAME}/locale' -+gtklocaledir='${prefix}/share/locale' - - - echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6 +--- configure.orig Thu Feb 25 13:02:28 1999 ++++ configure Tue Mar 2 11:11:14 1999 +@@ -3977,7 +3977,7 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + CATOBJEXT=.mo +- DATADIRNAME=lib ++ DATADIRNAME=share + fi + rm -f conftest* + INSTOBJEXT=.mo diff --git a/x11-toolkits/gtk20/pkg-descr b/x11-toolkits/gtk20/pkg-descr index 15cddd29f66d..75f50206dbe7 100644 --- a/x11-toolkits/gtk20/pkg-descr +++ b/x11-toolkits/gtk20/pkg-descr @@ -2,10 +2,9 @@ the Motif "look and feel". It is designed to be small and efficient, but still flexible enough to allow the programmer freedom in the interfaces created. GTK allows the programmer to use a variety of standard user -interface widgets (*note Widgets::.) such as push, radio and check -buttons, menus, lists and frames. It also provides several "container" -widgets which can be used to control the layout of the user interface -elements. +interface widgets such as push, radio and check buttons, menus, lists +and frames. It also provides several "container" widgets which can be +used to control the layout of the user interface elements. GTK provides some unique features. (At least, I know of no other widget library which provides them). For example, a button does not diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 33398999e7a4..eaa533417e51 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -1,124 +1,124 @@ -bin/gtk11d-config -include/gtk11d/gdk/gdk.h -include/gtk11d/gdk/gdkcursors.h -include/gtk11d/gdk/gdki18n.h -include/gtk11d/gdk/gdkkeysyms.h -include/gtk11d/gdk/gdkprivate.h -include/gtk11d/gdk/gdkrgb.h -include/gtk11d/gdk/gdktypes.h -include/gtk11d/gdk/gdkx.h -include/gtk11d/gtk/gtk.h -include/gtk11d/gtk/gtkaccelgroup.h -include/gtk11d/gtk/gtkaccellabel.h -include/gtk11d/gtk/gtkadjustment.h -include/gtk11d/gtk/gtkalignment.h -include/gtk11d/gtk/gtkarg.h -include/gtk11d/gtk/gtkarrow.h -include/gtk11d/gtk/gtkaspectframe.h -include/gtk11d/gtk/gtkbbox.h -include/gtk11d/gtk/gtkbin.h -include/gtk11d/gtk/gtkbindings.h -include/gtk11d/gtk/gtkbox.h -include/gtk11d/gtk/gtkbutton.h -include/gtk11d/gtk/gtkcalendar.h -include/gtk11d/gtk/gtkcheckbutton.h -include/gtk11d/gtk/gtkcheckmenuitem.h -include/gtk11d/gtk/gtkclist.h -include/gtk11d/gtk/gtkcolorsel.h -include/gtk11d/gtk/gtkcombo.h -include/gtk11d/gtk/gtkcompat.h -include/gtk11d/gtk/gtkcontainer.h -include/gtk11d/gtk/gtkctree.h -include/gtk11d/gtk/gtkcurve.h -include/gtk11d/gtk/gtkdata.h -include/gtk11d/gtk/gtkdebug.h -include/gtk11d/gtk/gtkdialog.h -include/gtk11d/gtk/gtkdnd.h -include/gtk11d/gtk/gtkdrawingarea.h -include/gtk11d/gtk/gtkeditable.h -include/gtk11d/gtk/gtkentry.h -include/gtk11d/gtk/gtkenums.h -include/gtk11d/gtk/gtkeventbox.h -include/gtk11d/gtk/gtkfeatures.h -include/gtk11d/gtk/gtkfilesel.h -include/gtk11d/gtk/gtkfixed.h -include/gtk11d/gtk/gtkfontsel.h -include/gtk11d/gtk/gtkframe.h -include/gtk11d/gtk/gtkgamma.h -include/gtk11d/gtk/gtkgc.h -include/gtk11d/gtk/gtkhandlebox.h -include/gtk11d/gtk/gtkhbbox.h -include/gtk11d/gtk/gtkhbox.h -include/gtk11d/gtk/gtkhpaned.h -include/gtk11d/gtk/gtkhruler.h -include/gtk11d/gtk/gtkhscale.h -include/gtk11d/gtk/gtkhscrollbar.h -include/gtk11d/gtk/gtkhseparator.h -include/gtk11d/gtk/gtkimage.h -include/gtk11d/gtk/gtkinputdialog.h -include/gtk11d/gtk/gtkinvisible.h -include/gtk11d/gtk/gtkitem.h -include/gtk11d/gtk/gtkitemfactory.h -include/gtk11d/gtk/gtklabel.h -include/gtk11d/gtk/gtklayout.h -include/gtk11d/gtk/gtklist.h -include/gtk11d/gtk/gtklistitem.h -include/gtk11d/gtk/gtkmain.h -include/gtk11d/gtk/gtkmarshal.h -include/gtk11d/gtk/gtkmenu.h -include/gtk11d/gtk/gtkmenubar.h -include/gtk11d/gtk/gtkmenufactory.h -include/gtk11d/gtk/gtkmenuitem.h -include/gtk11d/gtk/gtkmenushell.h -include/gtk11d/gtk/gtkmisc.h -include/gtk11d/gtk/gtknotebook.h -include/gtk11d/gtk/gtkobject.h -include/gtk11d/gtk/gtkoptionmenu.h -include/gtk11d/gtk/gtkpacker.h -include/gtk11d/gtk/gtkpaned.h -include/gtk11d/gtk/gtkpixmap.h -include/gtk11d/gtk/gtkplug.h -include/gtk11d/gtk/gtkpreview.h -include/gtk11d/gtk/gtkprivate.h -include/gtk11d/gtk/gtkprogress.h -include/gtk11d/gtk/gtkprogressbar.h -include/gtk11d/gtk/gtkradiobutton.h -include/gtk11d/gtk/gtkradiomenuitem.h -include/gtk11d/gtk/gtkrange.h -include/gtk11d/gtk/gtkrc.h -include/gtk11d/gtk/gtkruler.h -include/gtk11d/gtk/gtkscale.h -include/gtk11d/gtk/gtkscrollbar.h -include/gtk11d/gtk/gtkscrolledwindow.h -include/gtk11d/gtk/gtkselection.h -include/gtk11d/gtk/gtkseparator.h -include/gtk11d/gtk/gtksignal.h -include/gtk11d/gtk/gtksocket.h -include/gtk11d/gtk/gtkspinbutton.h -include/gtk11d/gtk/gtkstatusbar.h -include/gtk11d/gtk/gtkstyle.h -include/gtk11d/gtk/gtktable.h -include/gtk11d/gtk/gtktearoffmenuitem.h -include/gtk11d/gtk/gtktext.h -include/gtk11d/gtk/gtkthemes.h -include/gtk11d/gtk/gtktipsquery.h -include/gtk11d/gtk/gtktogglebutton.h -include/gtk11d/gtk/gtktoolbar.h -include/gtk11d/gtk/gtktooltips.h -include/gtk11d/gtk/gtktree.h -include/gtk11d/gtk/gtktreeitem.h -include/gtk11d/gtk/gtktypebuiltins.h -include/gtk11d/gtk/gtktypeutils.h -include/gtk11d/gtk/gtkvbbox.h -include/gtk11d/gtk/gtkvbox.h -include/gtk11d/gtk/gtkviewport.h -include/gtk11d/gtk/gtkvpaned.h -include/gtk11d/gtk/gtkvruler.h -include/gtk11d/gtk/gtkvscale.h -include/gtk11d/gtk/gtkvscrollbar.h -include/gtk11d/gtk/gtkvseparator.h -include/gtk11d/gtk/gtkwidget.h -include/gtk11d/gtk/gtkwindow.h +bin/gtk12-config +include/gtk12/gdk/gdk.h +include/gtk12/gdk/gdkcursors.h +include/gtk12/gdk/gdki18n.h +include/gtk12/gdk/gdkkeysyms.h +include/gtk12/gdk/gdkprivate.h +include/gtk12/gdk/gdkrgb.h +include/gtk12/gdk/gdktypes.h +include/gtk12/gdk/gdkx.h +include/gtk12/gtk/gtk.h +include/gtk12/gtk/gtkaccelgroup.h +include/gtk12/gtk/gtkaccellabel.h +include/gtk12/gtk/gtkadjustment.h +include/gtk12/gtk/gtkalignment.h +include/gtk12/gtk/gtkarg.h +include/gtk12/gtk/gtkarrow.h +include/gtk12/gtk/gtkaspectframe.h +include/gtk12/gtk/gtkbbox.h +include/gtk12/gtk/gtkbin.h +include/gtk12/gtk/gtkbindings.h +include/gtk12/gtk/gtkbox.h +include/gtk12/gtk/gtkbutton.h +include/gtk12/gtk/gtkcalendar.h +include/gtk12/gtk/gtkcheckbutton.h +include/gtk12/gtk/gtkcheckmenuitem.h +include/gtk12/gtk/gtkclist.h +include/gtk12/gtk/gtkcolorsel.h +include/gtk12/gtk/gtkcombo.h +include/gtk12/gtk/gtkcompat.h +include/gtk12/gtk/gtkcontainer.h +include/gtk12/gtk/gtkctree.h +include/gtk12/gtk/gtkcurve.h +include/gtk12/gtk/gtkdata.h +include/gtk12/gtk/gtkdebug.h +include/gtk12/gtk/gtkdialog.h +include/gtk12/gtk/gtkdnd.h +include/gtk12/gtk/gtkdrawingarea.h +include/gtk12/gtk/gtkeditable.h +include/gtk12/gtk/gtkentry.h +include/gtk12/gtk/gtkenums.h +include/gtk12/gtk/gtkeventbox.h +include/gtk12/gtk/gtkfeatures.h +include/gtk12/gtk/gtkfilesel.h +include/gtk12/gtk/gtkfixed.h +include/gtk12/gtk/gtkfontsel.h +include/gtk12/gtk/gtkframe.h +include/gtk12/gtk/gtkgamma.h +include/gtk12/gtk/gtkgc.h +include/gtk12/gtk/gtkhandlebox.h +include/gtk12/gtk/gtkhbbox.h +include/gtk12/gtk/gtkhbox.h +include/gtk12/gtk/gtkhpaned.h +include/gtk12/gtk/gtkhruler.h +include/gtk12/gtk/gtkhscale.h +include/gtk12/gtk/gtkhscrollbar.h +include/gtk12/gtk/gtkhseparator.h +include/gtk12/gtk/gtkimage.h +include/gtk12/gtk/gtkinputdialog.h +include/gtk12/gtk/gtkinvisible.h +include/gtk12/gtk/gtkitem.h +include/gtk12/gtk/gtkitemfactory.h +include/gtk12/gtk/gtklabel.h +include/gtk12/gtk/gtklayout.h +include/gtk12/gtk/gtklist.h +include/gtk12/gtk/gtklistitem.h +include/gtk12/gtk/gtkmain.h +include/gtk12/gtk/gtkmarshal.h +include/gtk12/gtk/gtkmenu.h +include/gtk12/gtk/gtkmenubar.h +include/gtk12/gtk/gtkmenufactory.h +include/gtk12/gtk/gtkmenuitem.h +include/gtk12/gtk/gtkmenushell.h +include/gtk12/gtk/gtkmisc.h +include/gtk12/gtk/gtknotebook.h +include/gtk12/gtk/gtkobject.h +include/gtk12/gtk/gtkoptionmenu.h +include/gtk12/gtk/gtkpacker.h +include/gtk12/gtk/gtkpaned.h +include/gtk12/gtk/gtkpixmap.h +include/gtk12/gtk/gtkplug.h +include/gtk12/gtk/gtkpreview.h +include/gtk12/gtk/gtkprivate.h +include/gtk12/gtk/gtkprogress.h +include/gtk12/gtk/gtkprogressbar.h +include/gtk12/gtk/gtkradiobutton.h +include/gtk12/gtk/gtkradiomenuitem.h +include/gtk12/gtk/gtkrange.h +include/gtk12/gtk/gtkrc.h +include/gtk12/gtk/gtkruler.h +include/gtk12/gtk/gtkscale.h +include/gtk12/gtk/gtkscrollbar.h +include/gtk12/gtk/gtkscrolledwindow.h +include/gtk12/gtk/gtkselection.h +include/gtk12/gtk/gtkseparator.h +include/gtk12/gtk/gtksignal.h +include/gtk12/gtk/gtksocket.h +include/gtk12/gtk/gtkspinbutton.h +include/gtk12/gtk/gtkstatusbar.h +include/gtk12/gtk/gtkstyle.h +include/gtk12/gtk/gtktable.h +include/gtk12/gtk/gtktearoffmenuitem.h +include/gtk12/gtk/gtktext.h +include/gtk12/gtk/gtkthemes.h +include/gtk12/gtk/gtktipsquery.h +include/gtk12/gtk/gtktogglebutton.h +include/gtk12/gtk/gtktoolbar.h +include/gtk12/gtk/gtktooltips.h +include/gtk12/gtk/gtktree.h +include/gtk12/gtk/gtktreeitem.h +include/gtk12/gtk/gtktypebuiltins.h +include/gtk12/gtk/gtktypeutils.h +include/gtk12/gtk/gtkvbbox.h +include/gtk12/gtk/gtkvbox.h +include/gtk12/gtk/gtkviewport.h +include/gtk12/gtk/gtkvpaned.h +include/gtk12/gtk/gtkvruler.h +include/gtk12/gtk/gtkvscale.h +include/gtk12/gtk/gtkvscrollbar.h +include/gtk12/gtk/gtkvseparator.h +include/gtk12/gtk/gtkwidget.h +include/gtk12/gtk/gtkwindow.h @unexec install-info --delete %D/info/gdk.info %D/info/dir @unexec install-info --delete %D/info/gtk.info %D/info/dir info/gdk.info @@ -126,20 +126,21 @@ info/gtk.info @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/gdk.info %D/info/dir @exec install-info %D/info/gtk.info %D/info/dir -lib/libgdk11d.a -lib/libgdk11d.la -lib/libgdk11d.so -lib/libgdk11d.so.1.3 -lib/libgtk11d.a -lib/libgtk11d.la -lib/libgtk11d.so -lib/libgtk11d.so.1.3 +lib/libgdk12.a +lib/libgdk12.la +lib/libgdk12.so +lib/libgdk12.so.1 +lib/libgtk12.a +lib/libgtk12.la +lib/libgtk12.so +lib/libgtk12.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/locale/cs/LC_MESSAGES/gtk+.mo share/locale/de/LC_MESSAGES/gtk+.mo share/locale/es/LC_MESSAGES/gtk+.mo share/locale/fr/LC_MESSAGES/gtk+.mo +share/locale/hu/LC_MESSAGES/gtk+.mo share/locale/it/LC_MESSAGES/gtk+.mo share/locale/ja/LC_MESSAGES/gtk+.mo share/locale/ko/LC_MESSAGES/gtk+.mo @@ -150,10 +151,14 @@ share/locale/pt/LC_MESSAGES/gtk+.mo share/locale/ru/LC_MESSAGES/gtk+.mo share/locale/sv/LC_MESSAGES/gtk+.mo share/themes/Default/gtk/gtkrc +share/themes/Default/gtk/gtkrc.ja +share/themes/Default/gtk/gtkrc.ko +share/themes/Default/gtk/gtkrc.ru +@exec mkdir -p %D/share/themes/engines @dirrm share/themes/Default/gtk @dirrm share/themes/Default @dirrm share/themes/engines @dirrm share/themes -@dirrm include/gtk11d/gdk -@dirrm include/gtk11d/gtk -@dirrm include/gtk11d +@dirrm include/gtk12/gdk +@dirrm include/gtk12/gtk +@dirrm include/gtk12 diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 47d3fc8e8399..0136c7202403 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -1,43 +1,49 @@ -# New ports collection makefile for: gtk11-devel -# Version required: 1.1.16 +# New ports collection makefile for: gtk12 +# Version required: 1.2.0 # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $Id: Makefile,v 1.44 1999/02/18 04:49:25 vanilla Exp $ # -DISTNAME= gtk+-1.1.16 -PKGNAME= gtk-1.1.16 +DISTNAME= gtk+-1.2.0 +PKGNAME= gtk-1.2.0 CATEGORIES= x11-toolkits -MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ - ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ - http://www.ameth.org/gimp/gtk/v1.1/ +MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \ + ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \ + http://www.ameth.org/gimp/gtk/v1.2/ MAINTAINER= vanilla@FreeBSD.ORG BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext -LIB_DEPENDS= glib11d.2:${PORTSDIR}/devel/glib11-devel +LIB_DEPENDS= glib12.1:${PORTSDIR}/devel/glib12 USE_X_PREFIX= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk11d +CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ + GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \ LIBS="-L${LOCALBASE}/lib" -MAN1= gtk-config.1 +MAN1= gtk12-config.1 pre-build: ${RM} -rf ${WRKSRC}/docs/gtk.info* post-install: - @${MKDIR} ${LOCALBASE}/share/aclocal - @${INSTALL_DATA} ${WRKSRC}/gtk.m4 ${LOCALBASE}/share/aclocal/gtk11d.m4 + @${MKDIR} ${PREFIX}/share/themes/engines @if [ ! -f ${PREFIX}/share/info ]; then \ ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ fi @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib + @${ECHO} '*********************************************************' + @${ECHO} '* *' + @${ECHO} '* If you want to use autoconf with gtk, *' + @${ECHO} '* Please copy gtk.m4 to /usr/local/share/aclocal *' + @${ECHO} '* by yourself, thanks. *' + @${ECHO} '* *' + @${ECHO} '*********************************************************' .include <bsd.port.mk> diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index 992dadfae7e1..b648580fc3d6 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1 +1 @@ -MD5 (gtk+-1.1.16.tar.gz) = 6de7a1a397eac37d7fc1f8ef008a9f02 +MD5 (gtk+-1.2.0.tar.gz) = d935cf94a4b0167b6b3570580a1013b9 diff --git a/x11-toolkits/gtk30/files/patch-ad b/x11-toolkits/gtk30/files/patch-ad index e0851a1a730f..43832268e1e3 100644 --- a/x11-toolkits/gtk30/files/patch-ad +++ b/x11-toolkits/gtk30/files/patch-ad @@ -1,6 +1,6 @@ --- gtk/gtkrc.c.orig Mon Jan 4 17:33:28 1999 +++ gtk/gtkrc.c Tue Jan 5 07:41:04 1999 -@@ -223,9 +223,9 @@ +@@ -231,9 +231,9 @@ var = getenv("GTK_EXE_PREFIX"); if (var) @@ -12,7 +12,7 @@ return path; } -@@ -238,9 +238,9 @@ +@@ -246,9 +246,9 @@ var = getenv("GTK_DATA_PREFIX"); if (var) @@ -24,7 +24,7 @@ for (n = 0; pixmap_path[n]; n++) ; if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1) -@@ -274,15 +274,15 @@ +@@ -282,15 +282,15 @@ var = getenv("GTK_EXE_PREFIX"); if (var) @@ -43,3 +43,12 @@ module_path[n++] = g_strdup(path); module_path[n] = NULL; g_free(path); +@@ -324,7 +324,7 @@ + } + else + { +- str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtk/gtkrc"); ++ str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtkrc"); + gtk_rc_add_default_file (str); + g_free (str); + diff --git a/x11-toolkits/gtk30/files/patch-ae b/x11-toolkits/gtk30/files/patch-ae index 20f506155853..854b0d4e5cc3 100644 --- a/x11-toolkits/gtk30/files/patch-ae +++ b/x11-toolkits/gtk30/files/patch-ae @@ -1,11 +1,11 @@ ---- configure.orig Thu Feb 18 01:35:07 1999 -+++ configure Thu Feb 18 01:35:27 1999 -@@ -4444,7 +4444,7 @@ - - # AM_GTK_GNU_GETTEXT above substs $DATADIRNAME - # this is the directory where the *.{mo,gmo} files are installed --gtklocaledir='${prefix}/${DATADIRNAME}/locale' -+gtklocaledir='${prefix}/share/locale' - - - echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6 +--- configure.orig Thu Feb 25 13:02:28 1999 ++++ configure Tue Mar 2 11:11:14 1999 +@@ -3977,7 +3977,7 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + CATOBJEXT=.mo +- DATADIRNAME=lib ++ DATADIRNAME=share + fi + rm -f conftest* + INSTOBJEXT=.mo diff --git a/x11-toolkits/gtk30/pkg-descr b/x11-toolkits/gtk30/pkg-descr index 15cddd29f66d..75f50206dbe7 100644 --- a/x11-toolkits/gtk30/pkg-descr +++ b/x11-toolkits/gtk30/pkg-descr @@ -2,10 +2,9 @@ the Motif "look and feel". It is designed to be small and efficient, but still flexible enough to allow the programmer freedom in the interfaces created. GTK allows the programmer to use a variety of standard user -interface widgets (*note Widgets::.) such as push, radio and check -buttons, menus, lists and frames. It also provides several "container" -widgets which can be used to control the layout of the user interface -elements. +interface widgets such as push, radio and check buttons, menus, lists +and frames. It also provides several "container" widgets which can be +used to control the layout of the user interface elements. GTK provides some unique features. (At least, I know of no other widget library which provides them). For example, a button does not diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index 33398999e7a4..eaa533417e51 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -1,124 +1,124 @@ -bin/gtk11d-config -include/gtk11d/gdk/gdk.h -include/gtk11d/gdk/gdkcursors.h -include/gtk11d/gdk/gdki18n.h -include/gtk11d/gdk/gdkkeysyms.h -include/gtk11d/gdk/gdkprivate.h -include/gtk11d/gdk/gdkrgb.h -include/gtk11d/gdk/gdktypes.h -include/gtk11d/gdk/gdkx.h -include/gtk11d/gtk/gtk.h -include/gtk11d/gtk/gtkaccelgroup.h -include/gtk11d/gtk/gtkaccellabel.h -include/gtk11d/gtk/gtkadjustment.h -include/gtk11d/gtk/gtkalignment.h -include/gtk11d/gtk/gtkarg.h -include/gtk11d/gtk/gtkarrow.h -include/gtk11d/gtk/gtkaspectframe.h -include/gtk11d/gtk/gtkbbox.h -include/gtk11d/gtk/gtkbin.h -include/gtk11d/gtk/gtkbindings.h -include/gtk11d/gtk/gtkbox.h -include/gtk11d/gtk/gtkbutton.h -include/gtk11d/gtk/gtkcalendar.h -include/gtk11d/gtk/gtkcheckbutton.h -include/gtk11d/gtk/gtkcheckmenuitem.h -include/gtk11d/gtk/gtkclist.h -include/gtk11d/gtk/gtkcolorsel.h -include/gtk11d/gtk/gtkcombo.h -include/gtk11d/gtk/gtkcompat.h -include/gtk11d/gtk/gtkcontainer.h -include/gtk11d/gtk/gtkctree.h -include/gtk11d/gtk/gtkcurve.h -include/gtk11d/gtk/gtkdata.h -include/gtk11d/gtk/gtkdebug.h -include/gtk11d/gtk/gtkdialog.h -include/gtk11d/gtk/gtkdnd.h -include/gtk11d/gtk/gtkdrawingarea.h -include/gtk11d/gtk/gtkeditable.h -include/gtk11d/gtk/gtkentry.h -include/gtk11d/gtk/gtkenums.h -include/gtk11d/gtk/gtkeventbox.h -include/gtk11d/gtk/gtkfeatures.h -include/gtk11d/gtk/gtkfilesel.h -include/gtk11d/gtk/gtkfixed.h -include/gtk11d/gtk/gtkfontsel.h -include/gtk11d/gtk/gtkframe.h -include/gtk11d/gtk/gtkgamma.h -include/gtk11d/gtk/gtkgc.h -include/gtk11d/gtk/gtkhandlebox.h -include/gtk11d/gtk/gtkhbbox.h -include/gtk11d/gtk/gtkhbox.h -include/gtk11d/gtk/gtkhpaned.h -include/gtk11d/gtk/gtkhruler.h -include/gtk11d/gtk/gtkhscale.h -include/gtk11d/gtk/gtkhscrollbar.h -include/gtk11d/gtk/gtkhseparator.h -include/gtk11d/gtk/gtkimage.h -include/gtk11d/gtk/gtkinputdialog.h -include/gtk11d/gtk/gtkinvisible.h -include/gtk11d/gtk/gtkitem.h -include/gtk11d/gtk/gtkitemfactory.h -include/gtk11d/gtk/gtklabel.h -include/gtk11d/gtk/gtklayout.h -include/gtk11d/gtk/gtklist.h -include/gtk11d/gtk/gtklistitem.h -include/gtk11d/gtk/gtkmain.h -include/gtk11d/gtk/gtkmarshal.h -include/gtk11d/gtk/gtkmenu.h -include/gtk11d/gtk/gtkmenubar.h -include/gtk11d/gtk/gtkmenufactory.h -include/gtk11d/gtk/gtkmenuitem.h -include/gtk11d/gtk/gtkmenushell.h -include/gtk11d/gtk/gtkmisc.h -include/gtk11d/gtk/gtknotebook.h -include/gtk11d/gtk/gtkobject.h -include/gtk11d/gtk/gtkoptionmenu.h -include/gtk11d/gtk/gtkpacker.h -include/gtk11d/gtk/gtkpaned.h -include/gtk11d/gtk/gtkpixmap.h -include/gtk11d/gtk/gtkplug.h -include/gtk11d/gtk/gtkpreview.h -include/gtk11d/gtk/gtkprivate.h -include/gtk11d/gtk/gtkprogress.h -include/gtk11d/gtk/gtkprogressbar.h -include/gtk11d/gtk/gtkradiobutton.h -include/gtk11d/gtk/gtkradiomenuitem.h -include/gtk11d/gtk/gtkrange.h -include/gtk11d/gtk/gtkrc.h -include/gtk11d/gtk/gtkruler.h -include/gtk11d/gtk/gtkscale.h -include/gtk11d/gtk/gtkscrollbar.h -include/gtk11d/gtk/gtkscrolledwindow.h -include/gtk11d/gtk/gtkselection.h -include/gtk11d/gtk/gtkseparator.h -include/gtk11d/gtk/gtksignal.h -include/gtk11d/gtk/gtksocket.h -include/gtk11d/gtk/gtkspinbutton.h -include/gtk11d/gtk/gtkstatusbar.h -include/gtk11d/gtk/gtkstyle.h -include/gtk11d/gtk/gtktable.h -include/gtk11d/gtk/gtktearoffmenuitem.h -include/gtk11d/gtk/gtktext.h -include/gtk11d/gtk/gtkthemes.h -include/gtk11d/gtk/gtktipsquery.h -include/gtk11d/gtk/gtktogglebutton.h -include/gtk11d/gtk/gtktoolbar.h -include/gtk11d/gtk/gtktooltips.h -include/gtk11d/gtk/gtktree.h -include/gtk11d/gtk/gtktreeitem.h -include/gtk11d/gtk/gtktypebuiltins.h -include/gtk11d/gtk/gtktypeutils.h -include/gtk11d/gtk/gtkvbbox.h -include/gtk11d/gtk/gtkvbox.h -include/gtk11d/gtk/gtkviewport.h -include/gtk11d/gtk/gtkvpaned.h -include/gtk11d/gtk/gtkvruler.h -include/gtk11d/gtk/gtkvscale.h -include/gtk11d/gtk/gtkvscrollbar.h -include/gtk11d/gtk/gtkvseparator.h -include/gtk11d/gtk/gtkwidget.h -include/gtk11d/gtk/gtkwindow.h +bin/gtk12-config +include/gtk12/gdk/gdk.h +include/gtk12/gdk/gdkcursors.h +include/gtk12/gdk/gdki18n.h +include/gtk12/gdk/gdkkeysyms.h +include/gtk12/gdk/gdkprivate.h +include/gtk12/gdk/gdkrgb.h +include/gtk12/gdk/gdktypes.h +include/gtk12/gdk/gdkx.h +include/gtk12/gtk/gtk.h +include/gtk12/gtk/gtkaccelgroup.h +include/gtk12/gtk/gtkaccellabel.h +include/gtk12/gtk/gtkadjustment.h +include/gtk12/gtk/gtkalignment.h +include/gtk12/gtk/gtkarg.h +include/gtk12/gtk/gtkarrow.h +include/gtk12/gtk/gtkaspectframe.h +include/gtk12/gtk/gtkbbox.h +include/gtk12/gtk/gtkbin.h +include/gtk12/gtk/gtkbindings.h +include/gtk12/gtk/gtkbox.h +include/gtk12/gtk/gtkbutton.h +include/gtk12/gtk/gtkcalendar.h +include/gtk12/gtk/gtkcheckbutton.h +include/gtk12/gtk/gtkcheckmenuitem.h +include/gtk12/gtk/gtkclist.h +include/gtk12/gtk/gtkcolorsel.h +include/gtk12/gtk/gtkcombo.h +include/gtk12/gtk/gtkcompat.h +include/gtk12/gtk/gtkcontainer.h +include/gtk12/gtk/gtkctree.h +include/gtk12/gtk/gtkcurve.h +include/gtk12/gtk/gtkdata.h +include/gtk12/gtk/gtkdebug.h +include/gtk12/gtk/gtkdialog.h +include/gtk12/gtk/gtkdnd.h +include/gtk12/gtk/gtkdrawingarea.h +include/gtk12/gtk/gtkeditable.h +include/gtk12/gtk/gtkentry.h +include/gtk12/gtk/gtkenums.h +include/gtk12/gtk/gtkeventbox.h +include/gtk12/gtk/gtkfeatures.h +include/gtk12/gtk/gtkfilesel.h +include/gtk12/gtk/gtkfixed.h +include/gtk12/gtk/gtkfontsel.h +include/gtk12/gtk/gtkframe.h +include/gtk12/gtk/gtkgamma.h +include/gtk12/gtk/gtkgc.h +include/gtk12/gtk/gtkhandlebox.h +include/gtk12/gtk/gtkhbbox.h +include/gtk12/gtk/gtkhbox.h +include/gtk12/gtk/gtkhpaned.h +include/gtk12/gtk/gtkhruler.h +include/gtk12/gtk/gtkhscale.h +include/gtk12/gtk/gtkhscrollbar.h +include/gtk12/gtk/gtkhseparator.h +include/gtk12/gtk/gtkimage.h +include/gtk12/gtk/gtkinputdialog.h +include/gtk12/gtk/gtkinvisible.h +include/gtk12/gtk/gtkitem.h +include/gtk12/gtk/gtkitemfactory.h +include/gtk12/gtk/gtklabel.h +include/gtk12/gtk/gtklayout.h +include/gtk12/gtk/gtklist.h +include/gtk12/gtk/gtklistitem.h +include/gtk12/gtk/gtkmain.h +include/gtk12/gtk/gtkmarshal.h +include/gtk12/gtk/gtkmenu.h +include/gtk12/gtk/gtkmenubar.h +include/gtk12/gtk/gtkmenufactory.h +include/gtk12/gtk/gtkmenuitem.h +include/gtk12/gtk/gtkmenushell.h +include/gtk12/gtk/gtkmisc.h +include/gtk12/gtk/gtknotebook.h +include/gtk12/gtk/gtkobject.h +include/gtk12/gtk/gtkoptionmenu.h +include/gtk12/gtk/gtkpacker.h +include/gtk12/gtk/gtkpaned.h +include/gtk12/gtk/gtkpixmap.h +include/gtk12/gtk/gtkplug.h +include/gtk12/gtk/gtkpreview.h +include/gtk12/gtk/gtkprivate.h +include/gtk12/gtk/gtkprogress.h +include/gtk12/gtk/gtkprogressbar.h +include/gtk12/gtk/gtkradiobutton.h +include/gtk12/gtk/gtkradiomenuitem.h +include/gtk12/gtk/gtkrange.h +include/gtk12/gtk/gtkrc.h +include/gtk12/gtk/gtkruler.h +include/gtk12/gtk/gtkscale.h +include/gtk12/gtk/gtkscrollbar.h +include/gtk12/gtk/gtkscrolledwindow.h +include/gtk12/gtk/gtkselection.h +include/gtk12/gtk/gtkseparator.h +include/gtk12/gtk/gtksignal.h +include/gtk12/gtk/gtksocket.h +include/gtk12/gtk/gtkspinbutton.h +include/gtk12/gtk/gtkstatusbar.h +include/gtk12/gtk/gtkstyle.h +include/gtk12/gtk/gtktable.h +include/gtk12/gtk/gtktearoffmenuitem.h +include/gtk12/gtk/gtktext.h +include/gtk12/gtk/gtkthemes.h +include/gtk12/gtk/gtktipsquery.h +include/gtk12/gtk/gtktogglebutton.h +include/gtk12/gtk/gtktoolbar.h +include/gtk12/gtk/gtktooltips.h +include/gtk12/gtk/gtktree.h +include/gtk12/gtk/gtktreeitem.h +include/gtk12/gtk/gtktypebuiltins.h +include/gtk12/gtk/gtktypeutils.h +include/gtk12/gtk/gtkvbbox.h +include/gtk12/gtk/gtkvbox.h +include/gtk12/gtk/gtkviewport.h +include/gtk12/gtk/gtkvpaned.h +include/gtk12/gtk/gtkvruler.h +include/gtk12/gtk/gtkvscale.h +include/gtk12/gtk/gtkvscrollbar.h +include/gtk12/gtk/gtkvseparator.h +include/gtk12/gtk/gtkwidget.h +include/gtk12/gtk/gtkwindow.h @unexec install-info --delete %D/info/gdk.info %D/info/dir @unexec install-info --delete %D/info/gtk.info %D/info/dir info/gdk.info @@ -126,20 +126,21 @@ info/gtk.info @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/gdk.info %D/info/dir @exec install-info %D/info/gtk.info %D/info/dir -lib/libgdk11d.a -lib/libgdk11d.la -lib/libgdk11d.so -lib/libgdk11d.so.1.3 -lib/libgtk11d.a -lib/libgtk11d.la -lib/libgtk11d.so -lib/libgtk11d.so.1.3 +lib/libgdk12.a +lib/libgdk12.la +lib/libgdk12.so +lib/libgdk12.so.1 +lib/libgtk12.a +lib/libgtk12.la +lib/libgtk12.so +lib/libgtk12.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/locale/cs/LC_MESSAGES/gtk+.mo share/locale/de/LC_MESSAGES/gtk+.mo share/locale/es/LC_MESSAGES/gtk+.mo share/locale/fr/LC_MESSAGES/gtk+.mo +share/locale/hu/LC_MESSAGES/gtk+.mo share/locale/it/LC_MESSAGES/gtk+.mo share/locale/ja/LC_MESSAGES/gtk+.mo share/locale/ko/LC_MESSAGES/gtk+.mo @@ -150,10 +151,14 @@ share/locale/pt/LC_MESSAGES/gtk+.mo share/locale/ru/LC_MESSAGES/gtk+.mo share/locale/sv/LC_MESSAGES/gtk+.mo share/themes/Default/gtk/gtkrc +share/themes/Default/gtk/gtkrc.ja +share/themes/Default/gtk/gtkrc.ko +share/themes/Default/gtk/gtkrc.ru +@exec mkdir -p %D/share/themes/engines @dirrm share/themes/Default/gtk @dirrm share/themes/Default @dirrm share/themes/engines @dirrm share/themes -@dirrm include/gtk11d/gdk -@dirrm include/gtk11d/gtk -@dirrm include/gtk11d +@dirrm include/gtk12/gdk +@dirrm include/gtk12/gtk +@dirrm include/gtk12 diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 61e7c65fd0fd..39dccdb790ba 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: gnomelibs -# Version required: 0.99.8.1 +# Version required: 1.0.1 # Date created: 17 June 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.31 1999/02/01 20:58:45 vanilla Exp $ +# $Id: Makefile,v 1.32 1999/02/18 17:53:23 vanilla Exp $ # -DISTNAME= gnome-libs-0.99.8.1 -PKGNAME= gnomelibs-0.99.8.1 +DISTNAME= gnome-libs-1.0.1 +PKGNAME= gnomelibs-1.0.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-libs +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com @@ -20,7 +20,7 @@ LIB_DEPENDS= gdk_imlib.2:${PORTSDIR}/graphics/imlib \ esd.1:${PORTSDIR}/audio/esound # implicit dependencies: -# gettext, gtk11-devel, tiff34, jpeg, giflib, png +# gettext, gtk12, tiff34, jpeg, giflib, png USE_X_PREFIX= yes USE_PERL5= yes @@ -30,9 +30,9 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ --disable-gnome-hello \ --disable-test-gnome -CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \ - -I${X11BASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ + -I${LOCALBASE}/include/giflib" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: diff --git a/x11/gnome-libs/distinfo b/x11/gnome-libs/distinfo index f7e1fd302f48..455cc546ff06 100644 --- a/x11/gnome-libs/distinfo +++ b/x11/gnome-libs/distinfo @@ -1 +1 @@ -MD5 (gnome-libs-0.99.8.1.tar.gz) = 1f11250f9fd5c9632e1b0e920d250d31 +MD5 (gnome-libs-1.0.1.tar.gz) = ec15a4281426ea664d501edc3fdba47f diff --git a/x11/gnome-libs/files/patch-aa b/x11/gnome-libs/files/patch-aa index cfa5a37c0dc2..02ba2b3b8c3c 100644 --- a/x11/gnome-libs/files/patch-aa +++ b/x11/gnome-libs/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Tue Feb 16 00:40:19 1999 -+++ configure Fri Feb 19 00:19:26 1999 -@@ -5137,7 +5137,7 @@ +--- configure.orig Mon Mar 1 21:51:08 1999 ++++ configure Sat Mar 6 13:33:05 1999 +@@ -5149,7 +5149,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo @@ -9,59 +9,17 @@ fi rm -f conftest* INSTOBJEXT=.mo -@@ -6747,7 +6747,7 @@ +@@ -7233,7 +7233,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 6753 "configure" + #line 7239 "configure" #include "confdefs.h" -@@ -7001,16 +7001,16 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 --echo "configure:7007: checking for gif_lib.h" >&5 -+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6 -+echo "configure:7007: checking for giflib/gif_lib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF - #line 7012 "configure" - #include "confdefs.h" --#include <gif_lib.h> -+#include <giflib/gif_lib.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:7017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -7077,16 +7077,16 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 --echo "configure:7083: checking for gif_lib.h" >&5 -+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6 -+echo "configure:7083: checking for giflib/gif_lib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF - #line 7088 "configure" - #include "confdefs.h" --#include <gif_lib.h> -+#include <giflib/gif_lib.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:7093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -10218,7 +10218,7 @@ - ZVT_LIBS="-lzvt $GTK_LIBS" +@@ -10704,7 +10704,7 @@ + ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS" GNOME_LIBDIR='-L${libdir}' -GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include' @@ -69,3 +27,14 @@ GNOME_IDLDIR='-I${datadir}/idl' +@@ -11548,10 +11548,6 @@ + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. diff --git a/x11/gnome-libs/files/patch-ac b/x11/gnome-libs/files/patch-ac index 91dbb7fa8ed8..be621cf51bcc 100644 --- a/x11/gnome-libs/files/patch-ac +++ b/x11/gnome-libs/files/patch-ac @@ -1,42 +1,49 @@ ---- gnome-config.in.orig Wed Jan 13 07:42:48 1999 -+++ gnome-config.in Fri Jan 15 00:02:56 1999 -@@ -41,18 +41,18 @@ +--- gnome-config.in.orig Mon Feb 15 20:05:33 1999 ++++ gnome-config.in Tue Mar 2 09:00:51 1999 +@@ -43,25 +43,25 @@ Known values for LIBRARY are: - glib (calls glib-config) -+ glib11d (calls glib11d-config) ++ glib (calls glib12-config) idl (to be used with orbit-idl) gnome gnomeui gnorba - gtk (calls gtk-config) -+ gtk11d (calls gtk11d-config) ++ gtk (calls gtk12-config) gtkxmhtml (only --libs) zvt (only --libs) If LIBRARY is none of these, - ${libdir}/<LIBRARY>Conf.sh -+ ${datadir}/<LIBRARY>Conf.sh ++ ${sysconfdir}/<LIBRARY>Conf.sh + + is looked in for the necessary information. Those currently installed + appear to be: - is looked in for the necessary information. EOF -@@ -114,33 +114,33 @@ + +- conf_shs=`cd ${libdir}; echo *Conf.sh` ++ conf_shs=`cd ${sysconfdir}; echo *Conf.sh` + + if test "x$conf_shs" = x || test "x$conf_shs" = 'x*Conf.sh'; then + echo " <NONE>" +@@ -146,36 +146,36 @@ usage 1 ;; glib) - the_libs="$the_libs `glib-config --libs`" - the_flags="$the_flags `glib-config --cflags`" -+ the_libs="$the_libs `glib11d-config --libs`" -+ the_flags="$the_flags `glib11d-config --cflags`" ++ the_libs="$the_libs `glib12-config --libs`" ++ the_flags="$the_flags `glib12-config --cflags`" ;; -- gtk) + gtk) - the_libs="$the_libs `gtk-config --libs`" - the_flags="$the_flags `gtk-config --cflags`" -+ gtk11) -+ the_libs="$the_libs `gtk11d-config --libs`" -+ the_flags="$the_flags `gtk11d-config --cflags`" ++ the_libs="$the_libs `gtk12-config --libs`" ++ the_flags="$the_flags `gtk12-config --cflags`" ;; gnome) - the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@" @@ -65,4 +72,8 @@ + the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@ -lintl" ;; *) - cnf_sh=${libdir}/${1}Conf.sh +- cnf_sh=${libdir}/${1}Conf.sh ++ cnf_sh=${sysconfdir}/${1}Conf.sh + if test -f ${cnf_sh}; then + . ${cnf_sh} + up_name=`echo $1 | tr a-z A-Z` diff --git a/x11/gnome-libs/pkg-plist b/x11/gnome-libs/pkg-plist index 5ac61c20790c..021e4eabd18b 100644 --- a/x11/gnome-libs/pkg-plist +++ b/x11/gnome-libs/pkg-plist @@ -9,6 +9,8 @@ bin/goad-browser bin/libart-config bin/loadshlib bin/new-object +etc/gnomeConf.sh +etc/libartConf.sh etc/mime-magic etc/mime-magic.dat etc/paper.config @@ -16,7 +18,6 @@ etc/sound/events/gnome.soundlist etc/sound/events/gtk-events.soundlist include/gnome.h include/gnomesupport.h -include/popt-gnome.h include/gtk-xmhtml/HTML.h include/gtk-xmhtml/XmHTML.h include/gtk-xmhtml/XmHTMLI.h @@ -32,8 +33,8 @@ include/libart_lgpl/art_filterlevel.h include/libart_lgpl/art_gray_svp.h include/libart_lgpl/art_misc.h include/libart_lgpl/art_pathcode.h -include/libart_lgpl/art_point.h include/libart_lgpl/art_pixbuf.h +include/libart_lgpl/art_point.h include/libart_lgpl/art_rect.h include/libart_lgpl/art_rect_svp.h include/libart_lgpl/art_rect_uta.h @@ -152,6 +153,7 @@ include/libgnomeui/gtkpixmapmenuitem.h include/libgnomeui/libgnomeui.h include/libgnorba/gnome-factory.h include/libgnorba/gnorba.h +include/popt-gnome.h include/zvt/lists.h include/zvt/vt.h include/zvt/vtx.h @@ -190,15 +192,14 @@ lib/libzvt.so lib/libzvt.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -share/gnome/gnomeConf.sh share/gnome/gtkrc share/gnome/gtkrc.ja share/gnome/gtkrc.ko +share/gnome/gtkrc.ru share/gnome/idl/Table.idl share/gnome/idl/base.idl share/gnome/idl/gnome-factory.idl share/gnome/idl/name-service.idl -share/gnome/libartConf.sh share/gnome/mime-info/gnome.mime share/gnome/pixmaps/calculator-font.png share/gnome/pixmaps/gnome-default-dlg.png @@ -208,6 +209,8 @@ share/gnome/pixmaps/gnome-question.png share/gnome/pixmaps/gnome-warning.png share/gnome/pixmaps/no.xpm share/gnome/pixmaps/yes.xpm +share/gnome/type-convert/gnome-make-postscript-mimes +share/gnome/type-convert/postscript.convert share/gnome/type-convert/type.convert share/locale/ca/LC_MESSAGES/gnome-libs.mo share/locale/cs/LC_MESSAGES/gnome-libs.mo @@ -227,17 +230,18 @@ share/locale/pl/LC_MESSAGES/gnome-libs.mo share/locale/pt/LC_MESSAGES/gnome-libs.mo share/locale/ru/LC_MESSAGES/gnome-libs.mo share/locale/sv/LC_MESSAGES/gnome-libs.mo -@dirrm etc/sound/events -@dirrm etc/sound -@dirrm include/gtk-xmhtml -@dirrm include/libart_lgpl -@dirrm include/libgnome -@dirrm include/libgnomeui -@dirrm include/libgnorba -@dirrm include/zvt -@dirrm share/gnome/games -@dirrm share/gnome/idl -@dirrm share/gnome/mime-info -@dirrm share/gnome/pixmaps +@exec mkdir -p %D/share/gnome/games @dirrm share/gnome/type-convert +@dirrm share/gnome/pixmaps +@dirrm share/gnome/mime-info +@dirrm share/gnome/idl +@dirrm share/gnome/games @dirrm share/gnome +@dirrm include/zvt +@dirrm include/libgnorba +@dirrm include/libgnomeui +@dirrm include/libgnome +@dirrm include/libart_lgpl +@dirrm include/gtk-xmhtml +@dirrm etc/sound/events +@dirrm etc/sound diff --git a/x11/gnome/Makefile b/x11/gnome/Makefile index dd818ad0312a..a7a5eacf7bc4 100644 --- a/x11/gnome/Makefile +++ b/x11/gnome/Makefile @@ -1,29 +1,29 @@ # New ports collection makefile for: gnome -# Version required: 0.99.3 +# Version required: 1.0.0 # Date created: 17 Aug 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.3 1999/01/20 22:11:43 vanilla Exp $ +# $Id: Makefile,v 1.4 1999/01/21 06:10:09 jkh Exp $ # -DISTNAME= gnome-0.99.3 -CATEGORIES= x11 +DISTNAME= gnome-1.0.0 +CATEGORIES= x11 gnome MASTER_SITES= # empty DISTFILES= # empty MAINTAINER= nacai@iname.com -LIB_DEPENDS= gnome.1:${PORTSDIR}/x11/gnomelibs \ - panel_applet.1:${PORTSDIR}/x11/gnomecore \ - gdkcardimage.1:${PORTSDIR}/games/gnomegames \ - gnomeprint.0:${PORTSDIR}/print/gnomeprint -# gxsnmp.1:${PORTSDIR}/sysutils/gnomeadmin -RUN_DEPENDS= gcalc:${PORTSDIR}/misc/gnomeutils \ +RUN_DEPENDS= gtcd:${PORTSDIR}/audio/gnomemedia \ + gnomecard:${PORTSDIR}/deskutils/gnomepim \ + gnomine:${PORTSDIR}/games/gnomegames \ ElectricEyes:${PORTSDIR}/graphics/electriceyes \ - gtop:${PORTSDIR}/sysutils/gtop \ + gnumeric:${PORTSDIR}/math/gnumeric \ + gcalc:${PORTSDIR}/misc/gnomeutils \ + gtalk:${PORTSDIR}/net/gnomenetwork \ + gulp:${PORTSDIR}/sysutils/gnomeadmin \ gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter \ - gnomecard:${PORTSDIR}/deskutils/gnomepim \ - gnumeric:${PORTSDIR}/math/gnumeric + gtop:${PORTSDIR}/sysutils/gtop \ + gmc:${PORTSDIR}/x11-fm/gnomemc EXTRACT_ONLY= # empty NO_BUILD= yes diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index dd818ad0312a..a7a5eacf7bc4 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -1,29 +1,29 @@ # New ports collection makefile for: gnome -# Version required: 0.99.3 +# Version required: 1.0.0 # Date created: 17 Aug 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.3 1999/01/20 22:11:43 vanilla Exp $ +# $Id: Makefile,v 1.4 1999/01/21 06:10:09 jkh Exp $ # -DISTNAME= gnome-0.99.3 -CATEGORIES= x11 +DISTNAME= gnome-1.0.0 +CATEGORIES= x11 gnome MASTER_SITES= # empty DISTFILES= # empty MAINTAINER= nacai@iname.com -LIB_DEPENDS= gnome.1:${PORTSDIR}/x11/gnomelibs \ - panel_applet.1:${PORTSDIR}/x11/gnomecore \ - gdkcardimage.1:${PORTSDIR}/games/gnomegames \ - gnomeprint.0:${PORTSDIR}/print/gnomeprint -# gxsnmp.1:${PORTSDIR}/sysutils/gnomeadmin -RUN_DEPENDS= gcalc:${PORTSDIR}/misc/gnomeutils \ +RUN_DEPENDS= gtcd:${PORTSDIR}/audio/gnomemedia \ + gnomecard:${PORTSDIR}/deskutils/gnomepim \ + gnomine:${PORTSDIR}/games/gnomegames \ ElectricEyes:${PORTSDIR}/graphics/electriceyes \ - gtop:${PORTSDIR}/sysutils/gtop \ + gnumeric:${PORTSDIR}/math/gnumeric \ + gcalc:${PORTSDIR}/misc/gnomeutils \ + gtalk:${PORTSDIR}/net/gnomenetwork \ + gulp:${PORTSDIR}/sysutils/gnomeadmin \ gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter \ - gnomecard:${PORTSDIR}/deskutils/gnomepim \ - gnumeric:${PORTSDIR}/math/gnumeric + gtop:${PORTSDIR}/sysutils/gtop \ + gmc:${PORTSDIR}/x11-fm/gnomemc EXTRACT_ONLY= # empty NO_BUILD= yes diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile index 8012cd447da5..074755689656 100644 --- a/x11/gnomecore/Makefile +++ b/x11/gnomecore/Makefile @@ -1,20 +1,20 @@ # New ports collection makefile for: gnomecore -# Version required: 0.99.8.1 +# Version required: 1.0.1 # Date created: 17 March 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.17 1999/02/02 08:30:21 vanilla Exp $ +# $Id: Makefile,v 1.18 1999/02/19 04:26:33 vanilla Exp $ # -DISTNAME= gnome-core-0.99.8.1 -PKGNAME= gnomecore-0.99.8.1 +DISTNAME= gnome-core-1.0.1 +PKGNAME= gnomecore-1.0.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-core +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com -RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/duck.wav:${PORTSDIR}/audio/gnomeaudio +RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop \ ghttp.0:${PORTSDIR}/www/libghttp @@ -28,16 +28,10 @@ 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/gtk11d-config" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib - chown root.kmem ${PREFIX}/bin/cpumemusage_applet - chown root.kmem ${PREFIX}/bin/diskusage_applet - chown root.kmem ${PREFIX}/bin/multiload_applet - chmod 2555 ${PREFIX}/bin/cpumemusage_applet - chmod 2555 ${PREFIX}/bin/diskusage_applet - chmod 2555 ${PREFIX}/bin/multiload_applet .include <bsd.port.mk> diff --git a/x11/gnomecore/distinfo b/x11/gnomecore/distinfo index 4dbf7775d069..01226fad42fa 100644 --- a/x11/gnomecore/distinfo +++ b/x11/gnomecore/distinfo @@ -1 +1 @@ -MD5 (gnome-core-0.99.8.1.tar.gz) = 927e5ffaaba7a8fd5cd1b55be993d5b0 +MD5 (gnome-core-1.0.1.tar.gz) = 9ce27fa72576f0dc3291ec8d5c71b96f diff --git a/x11/gnomecore/files/patch-aa b/x11/gnomecore/files/patch-aa index 32da72ad6ce5..b46bf15f1c0b 100644 --- a/x11/gnomecore/files/patch-aa +++ b/x11/gnomecore/files/patch-aa @@ -1,25 +1,6 @@ ---- configure.orig Tue Feb 16 01:45:51 1999 -+++ configure Fri Feb 19 03:41:47 1999 -@@ -1133,13 +1133,13 @@ - fi - - if test "$no_gnome_config" = "yes"; then -- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 --echo "configure:1138: checking for gnomeConf.sh file in $gnome_prefix" >&5 -- if test -f $gnome_prefix/gnomeConf.sh; then -+ echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6 -+echo "configure:1138: checking for gnomeConf.sh file in $prefix/share/gnome" >&5 -+ if test -f $prefix/share/gnome/gnomeConf.sh; then - echo "$ac_t""found" 1>&6 - echo "loading gnome configuration from" \ -- "$gnome_prefix/gnomeConf.sh" -- . $gnome_prefix/gnomeConf.sh -+ "$prefix/share/gnome/gnomeConf.sh" -+ . $prefix/share/gnome/gnomeConf.sh - - else - echo "$ac_t""not found" 1>&6 -@@ -5071,7 +5071,7 @@ +--- configure.orig Sun Feb 28 23:24:44 1999 ++++ configure Tue Mar 2 19:12:49 1999 +@@ -5076,7 +5076,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo @@ -28,7 +9,7 @@ fi rm -f conftest* INSTOBJEXT=.mo -@@ -5333,7 +5333,7 @@ +@@ -5338,7 +5338,7 @@ USE_INCLUDED_LIBINTL=yes CATOBJEXT=.cat INSTOBJEXT=.cat @@ -37,3 +18,11 @@ INTLDEPS='$(top_builddir)/intl/libintl.a' INTLLIBS=$INTLDEPS LIBS=`echo $LIBS | sed -e 's/-lintl//'` +@@ -6247,6 +6247,7 @@ + case "$host" in + *linux*) CDROM_HOST=linux;; + *solaris*) CDROM_HOST=solaris;; ++*freebsd*) CDROM_HOST=freebsd;; + esac + + diff --git a/x11/gnomecore/files/patch-ae b/x11/gnomecore/files/patch-ae index 320b3643a70b..464ef2979f01 100644 --- a/x11/gnomecore/files/patch-ae +++ b/x11/gnomecore/files/patch-ae @@ -1,7 +1,18 @@ ---- applets/asclock/Makefile.in.orig Mon Feb 1 07:46:49 1999 -+++ applets/asclock/Makefile.in Tue Feb 2 05:58:39 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/Makefile.in.orig Tue Mar 2 01:53:28 1999 ++++ applets/Makefile.in Sat Mar 6 17:59:43 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ + l = @l@ + +-always_built_SUBDIRS = applet-dirs gen_util asclock fish dialer webcontrol drivemount clockmail fifteen battery charpick gnome-pager mini-commander gkb jbc ++always_built_SUBDIRS = applet-dirs gen_util asclock fish dialer webcontrol clockmail fifteen battery charpick gnome-pager mini-commander gkb jbc + + @FALSE_TRUE@@HAVE_LIBESD_TRUE@esdmanager = esd-manager + @FALSE_TRUE@@HAVE_LIBESD_FALSE@esdmanager = +--- applets/asclock/Makefile.in.orig Tue Mar 2 01:53:34 1999 ++++ applets/asclock/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" @@ -9,10 +20,10 @@ bin_PROGRAMS = asclock_applet ---- applets/battery/Makefile.in.orig Mon Feb 1 07:47:01 1999 -+++ applets/battery/Makefile.in Tue Feb 2 05:58:56 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/battery/Makefile.in.orig Tue Mar 2 01:54:01 1999 ++++ applets/battery/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -20,10 +31,10 @@ bin_PROGRAMS = battery_applet ---- applets/cdplayer/Makefile.in.orig Mon Feb 1 07:47:23 1999 -+++ applets/cdplayer/Makefile.in Tue Feb 2 05:59:18 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/cdplayer/Makefile.in.orig Tue Mar 2 01:54:53 1999 ++++ applets/cdplayer/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -31,10 +42,10 @@ bin_PROGRAMS = cdplayer_applet ---- applets/charpick/Makefile.in.orig Mon Feb 1 07:47:03 1999 -+++ applets/charpick/Makefile.in Tue Feb 2 05:59:36 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/charpick/Makefile.in.orig Tue Mar 2 01:54:05 1999 ++++ applets/charpick/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -42,10 +53,10 @@ bin_PROGRAMS = charpick_applet ---- applets/clockmail/Makefile.in.orig Mon Feb 1 07:46:58 1999 -+++ applets/clockmail/Makefile.in Tue Feb 2 05:59:54 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/clockmail/Makefile.in.orig Tue Mar 2 01:53:53 1999 ++++ applets/clockmail/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -53,10 +64,10 @@ bin_PROGRAMS = clockmail_applet ---- applets/cpumemusage/Makefile.in.orig Mon Feb 1 07:47:14 1999 -+++ applets/cpumemusage/Makefile.in Tue Feb 2 06:00:13 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/cpumemusage/Makefile.in.orig Tue Mar 2 01:54:37 1999 ++++ applets/cpumemusage/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I$(LIBGTOP_INCS) @@ -64,10 +75,10 @@ bin_PROGRAMS = cpumemusage_applet ---- applets/dialer/Makefile.in.orig Mon Feb 1 07:46:52 1999 -+++ applets/dialer/Makefile.in Tue Feb 2 06:00:34 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/dialer/Makefile.in.orig Tue Mar 2 01:53:41 1999 ++++ applets/dialer/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" @@ -75,10 +86,10 @@ bin_PROGRAMS = dialer_applet ---- applets/diskusage/Makefile.in.orig Mon Feb 1 07:47:15 1999 -+++ applets/diskusage/Makefile.in Tue Feb 2 06:00:51 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/diskusage/Makefile.in.orig Tue Mar 2 01:54:40 1999 ++++ applets/diskusage/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) @@ -86,10 +97,10 @@ bin_PROGRAMS = diskusage_applet ---- applets/drivemount/Makefile.in.orig Mon Feb 1 07:46:56 1999 -+++ applets/drivemount/Makefile.in Tue Feb 2 06:01:10 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/drivemount/Makefile.in.orig Tue Mar 2 01:53:49 1999 ++++ applets/drivemount/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -97,10 +108,10 @@ bin_PROGRAMS = drivemount_applet ---- applets/esd-manager/Makefile.in.orig Mon Feb 1 07:47:12 1999 -+++ applets/esd-manager/Makefile.in Tue Feb 2 06:01:26 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/esd-manager/Makefile.in.orig Tue Mar 2 01:54:35 1999 ++++ applets/esd-manager/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(shell esd-config --cflags) @@ -108,10 +119,10 @@ bin_PROGRAMS = esdmanager_applet ---- applets/fifteen/Makefile.in.orig Mon Feb 1 07:46:59 1999 -+++ applets/fifteen/Makefile.in Tue Feb 2 06:01:43 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/fifteen/Makefile.in.orig Tue Mar 2 01:53:57 1999 ++++ applets/fifteen/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -119,10 +130,10 @@ bin_PROGRAMS = fifteen_applet ---- applets/fish/Makefile.in.orig Mon Feb 1 07:46:51 1999 -+++ applets/fish/Makefile.in Tue Feb 2 06:01:58 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/fish/Makefile.in.orig Tue Mar 2 01:53:38 1999 ++++ applets/fish/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -130,21 +141,24 @@ #if DO_EXE ---- applets/fvwm-pager/Makefile.in.orig Mon Feb 1 07:47:32 1999 -+++ applets/fvwm-pager/Makefile.in Tue Feb 2 06:02:15 1999 -@@ -151,7 +151,7 @@ +--- applets/fvwm-pager/Makefile.in.orig Tue Mar 2 01:55:08 1999 ++++ applets/fvwm-pager/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -153,9 +153,9 @@ + cxxflags_set = @cxxflags_set@ + l = @l@ - Utilitiesdir = $(datadir)/apps/Utilities +-Utilitiesdir = $(datadir)/gnome/apps/Utilities ++Utilitiesdir = $(datadir)/apps/Utilities -INCLUDES = -Dsafemalloc=g_malloc -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) +INCLUDES = -Dsafemalloc=g_malloc -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = fvwm-pager ---- applets/gen_util/Makefile.in.orig Mon Feb 1 07:46:46 1999 -+++ applets/gen_util/Makefile.in Tue Feb 2 06:07:49 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/gen_util/Makefile.in.orig Tue Mar 2 01:53:32 1999 ++++ applets/gen_util/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -152,9 +166,9 @@ bin_PROGRAMS = gen_util_applet ---- applets/gkb/Makefile.in.orig Fri Feb 19 03:47:32 1999 -+++ applets/gkb/Makefile.in Fri Feb 19 03:47:52 1999 -@@ -152,7 +152,7 @@ +--- applets/gkb/Makefile.in.orig Tue Mar 2 01:54:21 1999 ++++ applets/gkb/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ cxxflags_set = @cxxflags_set@ l = @l@ @@ -163,10 +177,10 @@ #if DO_EXE ---- applets/gnome-pager/Makefile.in.orig Mon Feb 1 07:47:04 1999 -+++ applets/gnome-pager/Makefile.in Tue Feb 2 06:02:53 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/gnome-pager/Makefile.in.orig Tue Mar 2 01:54:08 1999 ++++ applets/gnome-pager/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" @@ -174,10 +188,30 @@ bin_PROGRAMS = gnomepager_applet ---- applets/mini-commander/src/Makefile.in.orig Tue Feb 2 06:03:17 1999 -+++ applets/mini-commander/src/Makefile.in Tue Feb 2 06:03:29 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/mini-commander/docs/Makefile.in.orig Tue Mar 2 01:54:17 1999 ++++ applets/mini-commander/docs/Makefile.in Sat Mar 6 17:59:43 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ + l = @l@ + +-docdir = $(datadir)/gnome/help/mini-commander_applet/C ++docdir = $(datadir)/help/mini-commander_applet/C + + # .html files which are generated by db2html; precompiled .html files + # are included, so people without db2html (the DocBook to HTML converter) +@@ -247,7 +247,7 @@ + install: install-am + uninstall-am: uninstall-docDATA + uninstall: uninstall-am +-all-am: Makefile $(DATA) ++all-am: Makefile + all-redirect: all-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +--- applets/mini-commander/src/Makefile.in.orig Tue Mar 2 01:54:14 1999 ++++ applets/mini-commander/src/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(top_srcdir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -185,10 +219,10 @@ bin_PROGRAMS = mini_commander_applet ---- applets/mixer/Makefile.in.orig Tue Feb 2 06:03:35 1999 -+++ applets/mixer/Makefile.in Tue Feb 2 06:03:45 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/mixer/Makefile.in.orig Tue Mar 2 01:54:57 1999 ++++ applets/mixer/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -196,10 +230,10 @@ bin_PROGRAMS = mixer_applet ---- applets/modemlights/Makefile.in.orig Tue Feb 2 06:03:50 1999 -+++ applets/modemlights/Makefile.in Tue Feb 2 06:04:01 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/modemlights/Makefile.in.orig Tue Mar 2 01:55:01 1999 ++++ applets/modemlights/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" @@ -207,10 +241,10 @@ bin_PROGRAMS = modemlights_applet ---- applets/multiload/Makefile.in.orig Tue Feb 2 06:04:06 1999 -+++ applets/multiload/Makefile.in Tue Feb 2 06:04:18 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/multiload/Makefile.in.orig Tue Mar 2 01:54:44 1999 ++++ applets/multiload/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_builddir)/panel -I$(srcdir)/../../panel -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) @@ -218,10 +252,10 @@ bin_PROGRAMS = multiload_applet ---- applets/netload/Makefile.in.orig Tue Feb 2 06:04:23 1999 -+++ applets/netload/Makefile.in Tue Feb 2 06:04:33 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/netload/Makefile.in.orig Tue Mar 2 01:54:46 1999 ++++ applets/netload/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) @@ -229,10 +263,10 @@ bin_PROGRAMS = netload_applet ---- applets/slashapp/Makefile.in.orig Tue Feb 2 06:04:37 1999 -+++ applets/slashapp/Makefile.in Tue Feb 2 06:04:51 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/slashapp/Makefile.in.orig Tue Mar 2 01:54:49 1999 ++++ applets/slashapp/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -240,10 +274,10 @@ bin_PROGRAMS = slash_applet ---- applets/webcontrol/Makefile.in.orig Tue Feb 2 06:04:56 1999 -+++ applets/webcontrol/Makefile.in Tue Feb 2 06:05:06 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/webcontrol/Makefile.in.orig Tue Mar 2 01:53:45 1999 ++++ applets/webcontrol/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -251,10 +285,10 @@ bin_PROGRAMS = webcontrol_applet ---- applets/winlist/Makefile.in.orig Tue Feb 2 06:05:11 1999 -+++ applets/winlist/Makefile.in Tue Feb 2 06:05:23 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/winlist/Makefile.in.orig Tue Mar 2 01:55:05 1999 ++++ applets/winlist/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -262,10 +296,32 @@ bin_PROGRAMS = winlist_applet ---- gmenu/Makefile.in.orig Tue Feb 2 06:11:35 1999 -+++ gmenu/Makefile.in Tue Feb 2 06:11:47 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- core-docs/Makefile.in.orig Tue Mar 2 01:52:59 1999 ++++ core-docs/Makefile.in Sat Mar 6 17:59:43 1999 +@@ -162,7 +162,7 @@ + cxxflags_set = @cxxflags_set@ + l = @l@ + +-gnome_intro_helpdir = $(datadir)/gnome/help/gnome-intro/C ++gnome_intro_helpdir = $(datadir)/help/gnome-intro/C + + GNOME_INTRO_HTML_FILES = gnome-intro/c93191.html gnome-intro/f13.html gnome-intro/a-sample-session.html gnome-intro/c93230.html gnome-intro/f1346.html gnome-intro/a-sample-session75.html gnome-intro/c93302.html gnome-intro/gnome-intro.html gnome-intro/c93.html gnome-intro/c93372.html gnome-intro/c93127.html gnome-intro/c93412.html gnome-intro/c93175.html gnome-intro/docbook.css + +--- desktop-links/Makefile.in.orig Tue Mar 2 01:52:28 1999 ++++ desktop-links/Makefile.in Sat Mar 6 17:59:43 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ + l = @l@ + +-appsdir = $(datadir)/gnome/apps ++appsdir = $(datadir)/apps + + Rootdir = $(appsdir) + Applicationsdir = $(appsdir)/Applications +--- gmenu/Makefile.in.orig Tue Mar 2 01:53:06 1999 ++++ gmenu/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(GNOME_INCLUDEDIR) @@ -273,21 +329,53 @@ bin_PROGRAMS = gmenu ---- gnome-terminal/Makefile.in.orig Tue Feb 2 06:12:12 1999 -+++ gnome-terminal/Makefile.in Tue Feb 2 06:12:21 1999 -@@ -153,7 +153,7 @@ +@@ -167,7 +167,7 @@ + + EXTRA_DIST = gmenu.desktop top.xpm folder.xpm unknown.xpm - SUBDIRS = C +-sysdir = $(datadir)/gnome/apps/Settings ++sysdir = $(datadir)/apps/Settings + sys_DATA = gmenu.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +--- gnome-terminal/C/Makefile.in.orig Tue Mar 2 01:52:56 1999 ++++ gnome-terminal/C/Makefile.in Sat Mar 6 17:59:43 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ + l = @l@ + +-gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/C ++gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/C + + gnome_terminal_help_DATA = index.html topic.dat + +--- gnome-terminal/Makefile.in.orig Tue Mar 2 01:52:55 1999 ++++ gnome-terminal/Makefile.in Sat Mar 6 18:05:08 1999 +@@ -155,9 +155,9 @@ + cxxflags_set = @cxxflags_set@ + l = @l@ + +-SUBDIRS = C ++# SUBDIRS = C -INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale\"" +INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" - LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) -lzvt $(INTLLIBS) ---- gsm/Makefile.in.orig Tue Feb 2 06:12:36 1999 -+++ gsm/Makefile.in Tue Feb 2 06:12:47 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ + LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(ZVT_LIBS) $(INTLLIBS) +@@ -174,7 +174,7 @@ + + CFLAGS = @CFLAGS@ -Wall + +-utildir = $(datadir)/gnome/apps/Utilities ++utildir = $(datadir)/apps/Utilities + util_DATA = gnome-terminal.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +--- gsm/Makefile.in.orig Tue Mar 2 01:52:17 1999 ++++ gsm/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DDEFAULTDIR="\"$(datadir)\"" @@ -295,9 +383,29 @@ LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) ---- help-browser/help/C/Makefile.in.orig Tue Feb 2 06:13:57 1999 -+++ help-browser/help/C/Makefile.in Tue Feb 2 06:14:14 1999 -@@ -153,7 +153,7 @@ +--- help-browser/Makefile.in.orig Tue Mar 2 01:52:32 1999 ++++ help-browser/Makefile.in Sat Mar 6 17:59:43 1999 +@@ -156,7 +156,7 @@ + + SUBDIRS = help gnome-man2html gnome-info2html + +-INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/gnome/help\"" -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DVERSION=\""$(VERSION)"\" ++INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/help\"" -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DVERSION=\""$(VERSION)"\" + + + LDADD = -lgnorba $(GNOMEUI_LIBS) $(GNOME_LIBDIR) $(ORBIT_LIBS) $(INTLLIBS) +@@ -197,7 +197,7 @@ + gnorbadir = $(sysconfdir)/CORBA/servers + gnorba_DATA = help-browser.gnorba + +-sysdir = $(datadir)/gnome/apps ++sysdir = $(datadir)/apps + sys_DATA = gnome-help.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +--- help-browser/help/C/Makefile.in.orig Tue Mar 2 01:52:38 1999 ++++ help-browser/help/C/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -157,7 +157,7 @@ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html gnome-logo-large.png sample-help.html sample-topic.dat @@ -306,9 +414,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- help-browser/help/es/Makefile.in.orig Tue Feb 2 06:14:18 1999 -+++ help-browser/help/es/Makefile.in Tue Feb 2 06:14:27 1999 -@@ -153,7 +153,7 @@ +--- help-browser/help/es/Makefile.in.orig Tue Mar 2 01:52:41 1999 ++++ help-browser/help/es/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -157,7 +157,7 @@ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html @@ -317,9 +425,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- help-browser/help/fr/Makefile.in.orig Tue Feb 2 06:14:31 1999 -+++ help-browser/help/fr/Makefile.in Tue Feb 2 06:14:40 1999 -@@ -153,7 +153,7 @@ +--- help-browser/help/fr/Makefile.in.orig Tue Mar 2 01:52:43 1999 ++++ help-browser/help/fr/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -157,7 +157,7 @@ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html @@ -328,9 +436,42 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- panel/Makefile.in.orig Tue Feb 2 06:15:25 1999 -+++ panel/Makefile.in Tue Feb 2 06:15:58 1999 -@@ -156,7 +156,7 @@ +--- help-browser/help/hu/Makefile.in.orig Tue Mar 2 01:52:44 1999 ++++ help-browser/help/hu/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -157,7 +157,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html gnome-logo-large.png sample-help.html sample-topic.dat + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/hu ++help_browser_helpdir = $(datadir)/help/help-browser/hu + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/it/Makefile.in.orig Tue Mar 2 01:52:46 1999 ++++ help-browser/help/it/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -157,7 +157,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/it ++help_browser_helpdir = $(datadir)/help/help-browser/it + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/no/Makefile.in.orig Tue Mar 2 01:52:47 1999 ++++ help-browser/help/no/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -157,7 +157,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/no ++help_browser_helpdir = $(datadir)/help/help-browser/no + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- panel/Makefile.in.orig Tue Mar 2 01:53:16 1999 ++++ panel/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -160,7 +160,7 @@ AUTOMAKE_OPTIONS = 1.3 @@ -339,7 +480,7 @@ bin_PROGRAMS = panel -@@ -176,7 +176,7 @@ +@@ -180,7 +180,7 @@ libpanel_appletinclude_HEADERS = applet-widget.h gnome-panel.h panel-types.h @@ -348,19 +489,19 @@ libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) BUILT_SOURCES = $(CORBA_SRCLIST) -@@ -198,7 +198,7 @@ +@@ -202,7 +202,7 @@ EXTRA_DIST = panelrc.in panel.in appletsConf.sh.in panel.gnorba panel.soundlist -confexecdir = $(libdir) -+confexecdir = $(datadir) ++confexecdir = $(sysconfdir) confexec_DATA = appletsConf.sh panelgnorbadir = $(sysconfdir)/CORBA/servers ---- smproxy/Makefile.in.orig Tue Feb 2 06:16:19 1999 -+++ smproxy/Makefile.in Tue Feb 2 06:16:30 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- smproxy/Makefile.in.orig Tue Mar 2 01:52:21 1999 ++++ smproxy/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale\"" @@ -368,108 +509,3 @@ LDADD = -lXt -lXmu $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) ---- core-docs/Makefile.in.orig Tue Feb 2 06:16:47 1999 -+++ core-docs/Makefile.in Tue Feb 2 06:16:58 1999 -@@ -158,7 +158,7 @@ - YACC = @YACC@ - l = @l@ - --gnome_intro_helpdir = $(datadir)/gnome/help/gnome-intro/C -+gnome_intro_helpdir = $(datadir)/help/gnome-intro/C - - GNOME_INTRO_HTML_FILES = gnome-intro/c93191.html gnome-intro/f13.html gnome-intro/a-sample-session.html gnome-intro/c93230.html gnome-intro/f1346.html gnome-intro/a-sample-session75.html gnome-intro/c93302.html gnome-intro/gnome-intro.html gnome-intro/c93.html gnome-intro/c93372.html gnome-intro/c93127.html gnome-intro/c93412.html gnome-intro/c93175.html gnome-intro/docbook.css - ---- po/Makefile.in.in.orig Tue Feb 2 06:17:12 1999 -+++ po/Makefile.in.in Tue Feb 2 06:17:23 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 ---- applets/mini-commander/docs/Makefile.in.orig Tue Feb 2 06:17:44 1999 -+++ applets/mini-commander/docs/Makefile.in Tue Feb 2 06:18:12 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ - l = @l@ - --docdir = $(datadir)/gnome/help/mini-commander_applet/C -+docdir = $(datadir)/help/mini-commander_applet/C - - # .html files which are generated by db2html; precompiled .html files - # are included, so people without db2html (the DocBook to HTML converter) -@@ -243,7 +243,7 @@ - install: install-am - uninstall-am: uninstall-docDATA - uninstall: uninstall-am --all-am: Makefile $(DATA) -+all-am: Makefile - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ---- help-browser/Makefile.in.orig Tue Feb 2 06:13:07 1999 -+++ help-browser/Makefile.in Tue Feb 2 06:19:22 1999 -@@ -152,7 +152,7 @@ - - SUBDIRS = help gnome-man2html gnome-info2html - --INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/gnome/help\"" -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DVERSION=\""$(VERSION)"\" -+INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/help\"" -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DVERSION=\""$(VERSION)"\" - - - LDADD = -lgnorba $(GNOMEUI_LIBS) $(GNOME_LIBDIR) $(ORBIT_LIBS) $(INTLLIBS) ---- gnome-terminal/C/Makefile.in.orig Tue Feb 2 07:21:51 1999 -+++ gnome-terminal/C/Makefile.in Tue Feb 2 07:22:07 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ - l = @l@ - --gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/C -+gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/C - - gnome_terminal_help_DATA = index.html topic.dat - ---- applets/cpumemusage/proc.c.orig Fri Feb 19 04:07:15 1999 -+++ applets/cpumemusage/proc.c Fri Feb 19 04:07:29 1999 -@@ -1,3 +1,4 @@ -+#include <sys/types.h> - #include <glibtop.h> - #include <glibtop/cpu.h> - #include <glibtop/mem.h> ---- applets/diskusage/diskusage_read.c.orig Fri Feb 19 04:09:00 1999 -+++ applets/diskusage/diskusage_read.c Fri Feb 19 04:09:13 1999 -@@ -1,3 +1,4 @@ -+#include <sys/types.h> - #include <glibtop.h> - #include <glibtop/fsusage.h> - #include <glibtop/mountlist.h> ---- applets/Makefile.in.orig Fri Feb 19 04:43:52 1999 -+++ applets/Makefile.in Fri Feb 19 04:44:40 1999 -@@ -152,13 +152,13 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --always_built_SUBDIRS = applet-dirs gen_util asclock fish dialer webcontrol drivemount clockmail fifteen battery charpick gnome-pager mini-commander gkb -+always_built_SUBDIRS = applet-dirs gen_util asclock fish dialer webcontrol clockmail fifteen battery charpick gnome-pager mini-commander gkb - - @FALSE_TRUE@@HAVE_LIBESD_TRUE@esdmanager = esd-manager - @FALSE_TRUE@@HAVE_LIBESD_FALSE@esdmanager = - - @FALSE_TRUE@@HAVE_FVWM_TRUE@fvwm = fvwm-pager --@HAVE_LIBGTOP_TRUE@libgtop_SUBDIRS = cpumemusage diskusage multiload netload -+@HAVE_LIBGTOP_TRUE@libgtop_SUBDIRS = cpumemusage diskusage multiload - @HAVE_LIBGTOP_FALSE@libgtop_SUBDIRS = - - @HAVE_LIBGHTTP_TRUE@slashapp = slashapp -@@ -174,7 +174,7 @@ - SUBDIRS = $(always_built_SUBDIRS) $(libgtop_SUBDIRS) $(cdplayer) $(mixer) $(modemlights) $(winlist) $(slashapp) $(esdmanager) $(fvwm) - - --DIST_SUBDIRS = $(always_built_SUBDIRS) esd-manager cpumemusage diskusage multiload netload slashapp cdplayer mixer modemlights winlist fvwm-pager -+DIST_SUBDIRS = $(always_built_SUBDIRS) esd-manager cpumemusage diskusage multiload slashapp cdplayer mixer modemlights winlist fvwm-pager - - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h diff --git a/x11/gnomecore/pkg-plist b/x11/gnomecore/pkg-plist index 1156beda4fd1..ec18080d5f2c 100644 --- a/x11/gnomecore/pkg-plist +++ b/x11/gnomecore/pkg-plist @@ -1,5 +1,6 @@ bin/asclock_applet bin/battery_applet +bin/cdplayer_applet bin/charpick_applet bin/clockmail_applet bin/cpumemusage_applet @@ -8,6 +9,7 @@ bin/diskusage_applet bin/fifteen_applet bin/gen_util_applet bin/gmenu +bin/gnome-edit bin/gnome-help-browser bin/gnome-help-caller bin/gnome-info2html @@ -16,17 +18,18 @@ bin/gnome-session bin/gnome-smproxy bin/gnome-terminal bin/gnomepager_applet +bin/jbc_applet bin/mini_commander_applet bin/mixer_applet bin/modemlights_applet bin/multiload_applet bin/panel bin/save-session -bin/session-properties bin/slash_applet bin/webcontrol_applet etc/CORBA/servers/asclock_applet.gnorba etc/CORBA/servers/battery_applet.gnorba +etc/CORBA/servers/cdplayer_applet.gnorba etc/CORBA/servers/charpick_applet.gnorba etc/CORBA/servers/clockmail_applet.gnorba etc/CORBA/servers/cpumemusage_applet.gnorba @@ -38,6 +41,7 @@ etc/CORBA/servers/gen_util.gnorba etc/CORBA/servers/gkb_applet.gnorba etc/CORBA/servers/gnomepager_applet.gnorba etc/CORBA/servers/help-browser.gnorba +etc/CORBA/servers/jbc_applet.gnorba etc/CORBA/servers/mini-commander_applet.gnorba etc/CORBA/servers/mixer_applet.gnorba etc/CORBA/servers/modemlights_applet.gnorba @@ -45,6 +49,7 @@ etc/CORBA/servers/multiload_applet.gnorba etc/CORBA/servers/panel.gnorba etc/CORBA/servers/slash_applet.gnorba etc/CORBA/servers/webcontrol_applet.gnorba +etc/appletsConf.sh etc/sound/events/panel.soundlist include/applet-widget.h include/gnome-panel.h @@ -63,7 +68,6 @@ lib/libpanel_applet.so lib/libpanel_applet.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -share/gnome/appletsConf.sh share/gnome/applets/Amusements/.directory share/gnome/applets/Amusements/fifteen_applet.desktop share/gnome/applets/Amusements/fish_applet.desktop @@ -76,6 +80,7 @@ share/gnome/applets/Monitors/diskusage_applet.desktop share/gnome/applets/Monitors/memload_applet.desktop share/gnome/applets/Monitors/swapload_applet.desktop share/gnome/applets/Multimedia/.directory +share/gnome/applets/Multimedia/cdplayer_applet.desktop share/gnome/applets/Multimedia/mixer_applet.desktop share/gnome/applets/Network/.directory share/gnome/applets/Network/dialer_applet.desktop @@ -89,26 +94,26 @@ share/gnome/applets/Utility/clock_applet.desktop share/gnome/applets/Utility/clockmail_applet.desktop share/gnome/applets/Utility/gkb_applet.desktop share/gnome/applets/Utility/gnomepager_applet.desktop +share/gnome/applets/Utility/jbc_applet.desktop share/gnome/applets/Utility/mini-commander_applet.desktop share/gnome/applets/Utility/printer.desktop share/gnome/apps/.order -share/gnome/apps/Administration/.directory share/gnome/apps/Applications/.directory share/gnome/apps/Applications/Emacs.desktop share/gnome/apps/Applications/Netscape.desktop -share/gnome/apps/Audio/.directory share/gnome/apps/Games/.directory share/gnome/apps/Gmc.desktop share/gnome/apps/Graphics/.directory share/gnome/apps/Graphics/GIMP.desktop -share/gnome/apps/Network/.directory -share/gnome/apps/Network/Balsa.desktop -share/gnome/apps/Network/Tkrat.desktop -share/gnome/apps/Productivity/.directory +share/gnome/apps/Internet/.directory +share/gnome/apps/Internet/Balsa.desktop +share/gnome/apps/Internet/Tkrat.desktop +share/gnome/apps/Multimedia/.directory +share/gnome/apps/Settings/.directory +share/gnome/apps/Settings/.order +share/gnome/apps/Settings/Imlib_config.desktop +share/gnome/apps/Settings/gmenu.desktop share/gnome/apps/System/.directory -share/gnome/apps/System/Imlib_config.desktop -share/gnome/apps/System/gmenu.desktop -share/gnome/apps/System/session.desktop share/gnome/apps/Utilities/.directory share/gnome/apps/Utilities/Eterm.desktop share/gnome/apps/Utilities/Kterm.desktop @@ -166,19 +171,6 @@ share/gnome/help/gnome-intro/C/pix/panel-menu.gif share/gnome/help/gnome-intro/C/pix/same-gnome.gif share/gnome/help/gnome-intro/C/pix/terminal.gif share/gnome/help/gnome-intro/C/topic.dat -share/gnome/help/gnome-terminal/C/authors.html -share/gnome/help/gnome-terminal/C/classes.html -share/gnome/help/gnome-terminal/C/config.html -share/gnome/help/gnome-terminal/C/docbook.css -share/gnome/help/gnome-terminal/C/emulation.html -share/gnome/help/gnome-terminal/C/enviroment.html -share/gnome/help/gnome-terminal/C/index.html -share/gnome/help/gnome-terminal/C/menus.html -share/gnome/help/gnome-terminal/C/options.html -share/gnome/help/gnome-terminal/C/pointerusage.html -share/gnome/help/gnome-terminal/C/terminal.html -share/gnome/help/gnome-terminal/C/termtech.html -share/gnome/help/gnome-terminal/C/topic.dat share/gnome/help/help-browser/C/default-page.html share/gnome/help/help-browser/C/gnome-logo-large.png share/gnome/help/help-browser/C/help-browser.html @@ -192,6 +184,19 @@ share/gnome/help/help-browser/fr/default-page.html share/gnome/help/help-browser/fr/help-browser.html share/gnome/help/help-browser/fr/index.html share/gnome/help/help-browser/fr/topic.dat +share/gnome/help/help-browser/hu/default-page.html +share/gnome/help/help-browser/hu/gnome-logo-large.png +share/gnome/help/help-browser/hu/help-browser.html +share/gnome/help/help-browser/hu/index.html +share/gnome/help/help-browser/hu/topic.dat +share/gnome/help/help-browser/it/default-page.html +share/gnome/help/help-browser/it/help-browser.html +share/gnome/help/help-browser/it/index.html +share/gnome/help/help-browser/it/topic.dat +share/gnome/help/help-browser/no/default-page.html +share/gnome/help/help-browser/no/help-browser.html +share/gnome/help/help-browser/no/index.html +share/gnome/help/help-browser/no/topic.dat share/gnome/help/mini-commander_applet/C/change-log.html share/gnome/help/mini-commander_applet/C/clock.html share/gnome/help/mini-commander_applet/C/command-completion.html @@ -352,6 +357,7 @@ share/gnome/xmodmap/xmodmap.nl share/gnome/xmodmap/xmodmap.no share/gnome/xmodmap/xmodmap.pl share/gnome/xmodmap/xmodmap.pt +share/gnome/xmodmap/xmodmap.pt-dead share/gnome/xmodmap/xmodmap.qc share/gnome/xmodmap/xmodmap.ru share/gnome/xmodmap/xmodmap.ru_koi8 @@ -372,13 +378,7 @@ share/locale/cs/LC_MESSAGES/gnome-core.mo share/locale/da/LC_MESSAGES/gnome-core.mo share/locale/de/LC_MESSAGES/gnome-core.mo share/locale/es/LC_MESSAGES/gnome-core.mo -share/locale/es_DO/LC_MESSAGES/gnome-core.mo -share/locale/es_GT/LC_MESSAGES/gnome-core.mo -share/locale/es_HN/LC_MESSAGES/gnome-core.mo share/locale/es_MX/LC_MESSAGES/gnome-core.mo -share/locale/es_PA/LC_MESSAGES/gnome-core.mo -share/locale/es_PE/LC_MESSAGES/gnome-core.mo -share/locale/es_SV/LC_MESSAGES/gnome-core.mo share/locale/fi/LC_MESSAGES/gnome-core.mo share/locale/fr/LC_MESSAGES/gnome-core.mo share/locale/ga/LC_MESSAGES/gnome-core.mo @@ -392,41 +392,41 @@ share/locale/pl/LC_MESSAGES/gnome-core.mo share/locale/pt/LC_MESSAGES/gnome-core.mo share/locale/ru/LC_MESSAGES/gnome-core.mo share/locale/sv/LC_MESSAGES/gnome-core.mo -@dirrm etc/CORBA/servers -@dirrm etc/CORBA -@dirrm share/gnome/applets/Amusements -@dirrm share/gnome/applets/Monitors -@dirrm share/gnome/applets/Multimedia -@dirrm share/gnome/applets/Network -@dirrm share/gnome/applets/Utility -@dirrm share/gnome/applets -@dirrm share/gnome/apps/Administration -@dirrm share/gnome/apps/Applications -@dirrm share/gnome/apps/Audio -@dirrm share/gnome/apps/Games -@dirrm share/gnome/apps/Graphics -@dirrm share/gnome/apps/Network -@dirrm share/gnome/apps/Productivity -@dirrm share/gnome/apps/System -@dirrm share/gnome/apps/Utilities -@dirrm share/gnome/apps +@dirrm share/gnome/xmodmap +@dirrm share/gnome/pixmaps/tiles +@dirrm share/gnome/pixmaps/mini-commander +@dirrm share/gnome/pixmaps/mailcheck +@dirrm share/gnome/pixmaps/gkb +@dirrm share/gnome/pixmaps/fish +@dirrm share/gnome/mc/templates +@dirrm share/gnome/mc +@dirrm share/gnome/help/mini-commander_applet/C +@dirrm share/gnome/help/mini-commander_applet +@dirrm share/gnome/help/help-browser/no +@dirrm share/gnome/help/help-browser/it +@dirrm share/gnome/help/help-browser/hu +@dirrm share/gnome/help/help-browser/fr +@dirrm share/gnome/help/help-browser/es +@dirrm share/gnome/help/help-browser/C +@dirrm share/gnome/help/help-browser @dirrm share/gnome/help/gnome-intro/C/pix @dirrm share/gnome/help/gnome-intro/C @dirrm share/gnome/help/gnome-intro -@dirrm share/gnome/help/gnome-terminal/C -@dirrm share/gnome/help/gnome-terminal -@dirrm share/gnome/help/help-browser/C -@dirrm share/gnome/help/help-browser/es -@dirrm share/gnome/help/help-browser/fr -@dirrm share/gnome/help/help-browser -@dirrm share/gnome/help/mini-commander_applet/C -@dirrm share/gnome/help/mini-commander_applet @dirrm share/gnome/help -@dirrm share/gnome/mc/templates -@dirrm share/gnome/mc -@dirrm share/gnome/pixmaps/gkb -@dirrm share/gnome/pixmaps/fish -@dirrm share/gnome/pixmaps/mailcheck -@dirrm share/gnome/pixmaps/mini-commander -@dirrm share/gnome/pixmaps/tiles -@dirrm share/gnome/xmodmap +@dirrm share/gnome/apps/Utilities +@dirrm share/gnome/apps/System +@dirrm share/gnome/apps/Settings +@dirrm share/gnome/apps/Multimedia +@dirrm share/gnome/apps/Internet +@dirrm share/gnome/apps/Graphics +@dirrm share/gnome/apps/Games +@dirrm share/gnome/apps/Applications +@dirrm share/gnome/apps +@dirrm share/gnome/applets/Utility +@dirrm share/gnome/applets/Network +@dirrm share/gnome/applets/Multimedia +@dirrm share/gnome/applets/Monitors +@dirrm share/gnome/applets/Amusements +@dirrm share/gnome/applets +@dirrm etc/CORBA/servers +@dirrm etc/CORBA diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile index 61e7c65fd0fd..39dccdb790ba 100644 --- a/x11/gnomelibs/Makefile +++ b/x11/gnomelibs/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: gnomelibs -# Version required: 0.99.8.1 +# Version required: 1.0.1 # Date created: 17 June 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.31 1999/02/01 20:58:45 vanilla Exp $ +# $Id: Makefile,v 1.32 1999/02/18 17:53:23 vanilla Exp $ # -DISTNAME= gnome-libs-0.99.8.1 -PKGNAME= gnomelibs-0.99.8.1 +DISTNAME= gnome-libs-1.0.1 +PKGNAME= gnomelibs-1.0.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-libs +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com @@ -20,7 +20,7 @@ LIB_DEPENDS= gdk_imlib.2:${PORTSDIR}/graphics/imlib \ esd.1:${PORTSDIR}/audio/esound # implicit dependencies: -# gettext, gtk11-devel, tiff34, jpeg, giflib, png +# gettext, gtk12, tiff34, jpeg, giflib, png USE_X_PREFIX= yes USE_PERL5= yes @@ -30,9 +30,9 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ --disable-gnome-hello \ --disable-test-gnome -CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \ - -I${X11BASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ + -I${LOCALBASE}/include/giflib" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: diff --git a/x11/gnomelibs/distinfo b/x11/gnomelibs/distinfo index f7e1fd302f48..455cc546ff06 100644 --- a/x11/gnomelibs/distinfo +++ b/x11/gnomelibs/distinfo @@ -1 +1 @@ -MD5 (gnome-libs-0.99.8.1.tar.gz) = 1f11250f9fd5c9632e1b0e920d250d31 +MD5 (gnome-libs-1.0.1.tar.gz) = ec15a4281426ea664d501edc3fdba47f diff --git a/x11/gnomelibs/files/patch-aa b/x11/gnomelibs/files/patch-aa index cfa5a37c0dc2..02ba2b3b8c3c 100644 --- a/x11/gnomelibs/files/patch-aa +++ b/x11/gnomelibs/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Tue Feb 16 00:40:19 1999 -+++ configure Fri Feb 19 00:19:26 1999 -@@ -5137,7 +5137,7 @@ +--- configure.orig Mon Mar 1 21:51:08 1999 ++++ configure Sat Mar 6 13:33:05 1999 +@@ -5149,7 +5149,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo @@ -9,59 +9,17 @@ fi rm -f conftest* INSTOBJEXT=.mo -@@ -6747,7 +6747,7 @@ +@@ -7233,7 +7233,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 6753 "configure" + #line 7239 "configure" #include "confdefs.h" -@@ -7001,16 +7001,16 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 --echo "configure:7007: checking for gif_lib.h" >&5 -+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6 -+echo "configure:7007: checking for giflib/gif_lib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF - #line 7012 "configure" - #include "confdefs.h" --#include <gif_lib.h> -+#include <giflib/gif_lib.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:7017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -7077,16 +7077,16 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 --echo "configure:7083: checking for gif_lib.h" >&5 -+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6 -+echo "configure:7083: checking for giflib/gif_lib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF - #line 7088 "configure" - #include "confdefs.h" --#include <gif_lib.h> -+#include <giflib/gif_lib.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:7093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -10218,7 +10218,7 @@ - ZVT_LIBS="-lzvt $GTK_LIBS" +@@ -10704,7 +10704,7 @@ + ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS" GNOME_LIBDIR='-L${libdir}' -GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include' @@ -69,3 +27,14 @@ GNOME_IDLDIR='-I${datadir}/idl' +@@ -11548,10 +11548,6 @@ + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. diff --git a/x11/gnomelibs/files/patch-ac b/x11/gnomelibs/files/patch-ac index 91dbb7fa8ed8..be621cf51bcc 100644 --- a/x11/gnomelibs/files/patch-ac +++ b/x11/gnomelibs/files/patch-ac @@ -1,42 +1,49 @@ ---- gnome-config.in.orig Wed Jan 13 07:42:48 1999 -+++ gnome-config.in Fri Jan 15 00:02:56 1999 -@@ -41,18 +41,18 @@ +--- gnome-config.in.orig Mon Feb 15 20:05:33 1999 ++++ gnome-config.in Tue Mar 2 09:00:51 1999 +@@ -43,25 +43,25 @@ Known values for LIBRARY are: - glib (calls glib-config) -+ glib11d (calls glib11d-config) ++ glib (calls glib12-config) idl (to be used with orbit-idl) gnome gnomeui gnorba - gtk (calls gtk-config) -+ gtk11d (calls gtk11d-config) ++ gtk (calls gtk12-config) gtkxmhtml (only --libs) zvt (only --libs) If LIBRARY is none of these, - ${libdir}/<LIBRARY>Conf.sh -+ ${datadir}/<LIBRARY>Conf.sh ++ ${sysconfdir}/<LIBRARY>Conf.sh + + is looked in for the necessary information. Those currently installed + appear to be: - is looked in for the necessary information. EOF -@@ -114,33 +114,33 @@ + +- conf_shs=`cd ${libdir}; echo *Conf.sh` ++ conf_shs=`cd ${sysconfdir}; echo *Conf.sh` + + if test "x$conf_shs" = x || test "x$conf_shs" = 'x*Conf.sh'; then + echo " <NONE>" +@@ -146,36 +146,36 @@ usage 1 ;; glib) - the_libs="$the_libs `glib-config --libs`" - the_flags="$the_flags `glib-config --cflags`" -+ the_libs="$the_libs `glib11d-config --libs`" -+ the_flags="$the_flags `glib11d-config --cflags`" ++ the_libs="$the_libs `glib12-config --libs`" ++ the_flags="$the_flags `glib12-config --cflags`" ;; -- gtk) + gtk) - the_libs="$the_libs `gtk-config --libs`" - the_flags="$the_flags `gtk-config --cflags`" -+ gtk11) -+ the_libs="$the_libs `gtk11d-config --libs`" -+ the_flags="$the_flags `gtk11d-config --cflags`" ++ the_libs="$the_libs `gtk12-config --libs`" ++ the_flags="$the_flags `gtk12-config --cflags`" ;; gnome) - the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@" @@ -65,4 +72,8 @@ + the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@ -lintl" ;; *) - cnf_sh=${libdir}/${1}Conf.sh +- cnf_sh=${libdir}/${1}Conf.sh ++ cnf_sh=${sysconfdir}/${1}Conf.sh + if test -f ${cnf_sh}; then + . ${cnf_sh} + up_name=`echo $1 | tr a-z A-Z` diff --git a/x11/gnomelibs/pkg-plist b/x11/gnomelibs/pkg-plist index 5ac61c20790c..021e4eabd18b 100644 --- a/x11/gnomelibs/pkg-plist +++ b/x11/gnomelibs/pkg-plist @@ -9,6 +9,8 @@ bin/goad-browser bin/libart-config bin/loadshlib bin/new-object +etc/gnomeConf.sh +etc/libartConf.sh etc/mime-magic etc/mime-magic.dat etc/paper.config @@ -16,7 +18,6 @@ etc/sound/events/gnome.soundlist etc/sound/events/gtk-events.soundlist include/gnome.h include/gnomesupport.h -include/popt-gnome.h include/gtk-xmhtml/HTML.h include/gtk-xmhtml/XmHTML.h include/gtk-xmhtml/XmHTMLI.h @@ -32,8 +33,8 @@ include/libart_lgpl/art_filterlevel.h include/libart_lgpl/art_gray_svp.h include/libart_lgpl/art_misc.h include/libart_lgpl/art_pathcode.h -include/libart_lgpl/art_point.h include/libart_lgpl/art_pixbuf.h +include/libart_lgpl/art_point.h include/libart_lgpl/art_rect.h include/libart_lgpl/art_rect_svp.h include/libart_lgpl/art_rect_uta.h @@ -152,6 +153,7 @@ include/libgnomeui/gtkpixmapmenuitem.h include/libgnomeui/libgnomeui.h include/libgnorba/gnome-factory.h include/libgnorba/gnorba.h +include/popt-gnome.h include/zvt/lists.h include/zvt/vt.h include/zvt/vtx.h @@ -190,15 +192,14 @@ lib/libzvt.so lib/libzvt.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -share/gnome/gnomeConf.sh share/gnome/gtkrc share/gnome/gtkrc.ja share/gnome/gtkrc.ko +share/gnome/gtkrc.ru share/gnome/idl/Table.idl share/gnome/idl/base.idl share/gnome/idl/gnome-factory.idl share/gnome/idl/name-service.idl -share/gnome/libartConf.sh share/gnome/mime-info/gnome.mime share/gnome/pixmaps/calculator-font.png share/gnome/pixmaps/gnome-default-dlg.png @@ -208,6 +209,8 @@ share/gnome/pixmaps/gnome-question.png share/gnome/pixmaps/gnome-warning.png share/gnome/pixmaps/no.xpm share/gnome/pixmaps/yes.xpm +share/gnome/type-convert/gnome-make-postscript-mimes +share/gnome/type-convert/postscript.convert share/gnome/type-convert/type.convert share/locale/ca/LC_MESSAGES/gnome-libs.mo share/locale/cs/LC_MESSAGES/gnome-libs.mo @@ -227,17 +230,18 @@ share/locale/pl/LC_MESSAGES/gnome-libs.mo share/locale/pt/LC_MESSAGES/gnome-libs.mo share/locale/ru/LC_MESSAGES/gnome-libs.mo share/locale/sv/LC_MESSAGES/gnome-libs.mo -@dirrm etc/sound/events -@dirrm etc/sound -@dirrm include/gtk-xmhtml -@dirrm include/libart_lgpl -@dirrm include/libgnome -@dirrm include/libgnomeui -@dirrm include/libgnorba -@dirrm include/zvt -@dirrm share/gnome/games -@dirrm share/gnome/idl -@dirrm share/gnome/mime-info -@dirrm share/gnome/pixmaps +@exec mkdir -p %D/share/gnome/games @dirrm share/gnome/type-convert +@dirrm share/gnome/pixmaps +@dirrm share/gnome/mime-info +@dirrm share/gnome/idl +@dirrm share/gnome/games @dirrm share/gnome +@dirrm include/zvt +@dirrm include/libgnorba +@dirrm include/libgnomeui +@dirrm include/libgnome +@dirrm include/libart_lgpl +@dirrm include/gtk-xmhtml +@dirrm etc/sound/events +@dirrm etc/sound diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 61e7c65fd0fd..39dccdb790ba 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: gnomelibs -# Version required: 0.99.8.1 +# Version required: 1.0.1 # Date created: 17 June 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.31 1999/02/01 20:58:45 vanilla Exp $ +# $Id: Makefile,v 1.32 1999/02/18 17:53:23 vanilla Exp $ # -DISTNAME= gnome-libs-0.99.8.1 -PKGNAME= gnomelibs-0.99.8.1 +DISTNAME= gnome-libs-1.0.1 +PKGNAME= gnomelibs-1.0.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-libs +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com @@ -20,7 +20,7 @@ LIB_DEPENDS= gdk_imlib.2:${PORTSDIR}/graphics/imlib \ esd.1:${PORTSDIR}/audio/esound # implicit dependencies: -# gettext, gtk11-devel, tiff34, jpeg, giflib, png +# gettext, gtk12, tiff34, jpeg, giflib, png USE_X_PREFIX= yes USE_PERL5= yes @@ -30,9 +30,9 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ --disable-gnome-hello \ --disable-test-gnome -CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \ - -I${X11BASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ + -I${LOCALBASE}/include/giflib" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo index f7e1fd302f48..455cc546ff06 100644 --- a/x11/libgnome/distinfo +++ b/x11/libgnome/distinfo @@ -1 +1 @@ -MD5 (gnome-libs-0.99.8.1.tar.gz) = 1f11250f9fd5c9632e1b0e920d250d31 +MD5 (gnome-libs-1.0.1.tar.gz) = ec15a4281426ea664d501edc3fdba47f diff --git a/x11/libgnome/files/patch-aa b/x11/libgnome/files/patch-aa index cfa5a37c0dc2..02ba2b3b8c3c 100644 --- a/x11/libgnome/files/patch-aa +++ b/x11/libgnome/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Tue Feb 16 00:40:19 1999 -+++ configure Fri Feb 19 00:19:26 1999 -@@ -5137,7 +5137,7 @@ +--- configure.orig Mon Mar 1 21:51:08 1999 ++++ configure Sat Mar 6 13:33:05 1999 +@@ -5149,7 +5149,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo @@ -9,59 +9,17 @@ fi rm -f conftest* INSTOBJEXT=.mo -@@ -6747,7 +6747,7 @@ +@@ -7233,7 +7233,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 6753 "configure" + #line 7239 "configure" #include "confdefs.h" -@@ -7001,16 +7001,16 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 --echo "configure:7007: checking for gif_lib.h" >&5 -+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6 -+echo "configure:7007: checking for giflib/gif_lib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF - #line 7012 "configure" - #include "confdefs.h" --#include <gif_lib.h> -+#include <giflib/gif_lib.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:7017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -7077,16 +7077,16 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 --echo "configure:7083: checking for gif_lib.h" >&5 -+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6 -+echo "configure:7083: checking for giflib/gif_lib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF - #line 7088 "configure" - #include "confdefs.h" --#include <gif_lib.h> -+#include <giflib/gif_lib.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:7093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -10218,7 +10218,7 @@ - ZVT_LIBS="-lzvt $GTK_LIBS" +@@ -10704,7 +10704,7 @@ + ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS" GNOME_LIBDIR='-L${libdir}' -GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include' @@ -69,3 +27,14 @@ GNOME_IDLDIR='-I${datadir}/idl' +@@ -11548,10 +11548,6 @@ + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. diff --git a/x11/libgnome/files/patch-ac b/x11/libgnome/files/patch-ac index 91dbb7fa8ed8..be621cf51bcc 100644 --- a/x11/libgnome/files/patch-ac +++ b/x11/libgnome/files/patch-ac @@ -1,42 +1,49 @@ ---- gnome-config.in.orig Wed Jan 13 07:42:48 1999 -+++ gnome-config.in Fri Jan 15 00:02:56 1999 -@@ -41,18 +41,18 @@ +--- gnome-config.in.orig Mon Feb 15 20:05:33 1999 ++++ gnome-config.in Tue Mar 2 09:00:51 1999 +@@ -43,25 +43,25 @@ Known values for LIBRARY are: - glib (calls glib-config) -+ glib11d (calls glib11d-config) ++ glib (calls glib12-config) idl (to be used with orbit-idl) gnome gnomeui gnorba - gtk (calls gtk-config) -+ gtk11d (calls gtk11d-config) ++ gtk (calls gtk12-config) gtkxmhtml (only --libs) zvt (only --libs) If LIBRARY is none of these, - ${libdir}/<LIBRARY>Conf.sh -+ ${datadir}/<LIBRARY>Conf.sh ++ ${sysconfdir}/<LIBRARY>Conf.sh + + is looked in for the necessary information. Those currently installed + appear to be: - is looked in for the necessary information. EOF -@@ -114,33 +114,33 @@ + +- conf_shs=`cd ${libdir}; echo *Conf.sh` ++ conf_shs=`cd ${sysconfdir}; echo *Conf.sh` + + if test "x$conf_shs" = x || test "x$conf_shs" = 'x*Conf.sh'; then + echo " <NONE>" +@@ -146,36 +146,36 @@ usage 1 ;; glib) - the_libs="$the_libs `glib-config --libs`" - the_flags="$the_flags `glib-config --cflags`" -+ the_libs="$the_libs `glib11d-config --libs`" -+ the_flags="$the_flags `glib11d-config --cflags`" ++ the_libs="$the_libs `glib12-config --libs`" ++ the_flags="$the_flags `glib12-config --cflags`" ;; -- gtk) + gtk) - the_libs="$the_libs `gtk-config --libs`" - the_flags="$the_flags `gtk-config --cflags`" -+ gtk11) -+ the_libs="$the_libs `gtk11d-config --libs`" -+ the_flags="$the_flags `gtk11d-config --cflags`" ++ the_libs="$the_libs `gtk12-config --libs`" ++ the_flags="$the_flags `gtk12-config --cflags`" ;; gnome) - the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@" @@ -65,4 +72,8 @@ + the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@ -lintl" ;; *) - cnf_sh=${libdir}/${1}Conf.sh +- cnf_sh=${libdir}/${1}Conf.sh ++ cnf_sh=${sysconfdir}/${1}Conf.sh + if test -f ${cnf_sh}; then + . ${cnf_sh} + up_name=`echo $1 | tr a-z A-Z` diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index 5ac61c20790c..021e4eabd18b 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -9,6 +9,8 @@ bin/goad-browser bin/libart-config bin/loadshlib bin/new-object +etc/gnomeConf.sh +etc/libartConf.sh etc/mime-magic etc/mime-magic.dat etc/paper.config @@ -16,7 +18,6 @@ etc/sound/events/gnome.soundlist etc/sound/events/gtk-events.soundlist include/gnome.h include/gnomesupport.h -include/popt-gnome.h include/gtk-xmhtml/HTML.h include/gtk-xmhtml/XmHTML.h include/gtk-xmhtml/XmHTMLI.h @@ -32,8 +33,8 @@ include/libart_lgpl/art_filterlevel.h include/libart_lgpl/art_gray_svp.h include/libart_lgpl/art_misc.h include/libart_lgpl/art_pathcode.h -include/libart_lgpl/art_point.h include/libart_lgpl/art_pixbuf.h +include/libart_lgpl/art_point.h include/libart_lgpl/art_rect.h include/libart_lgpl/art_rect_svp.h include/libart_lgpl/art_rect_uta.h @@ -152,6 +153,7 @@ include/libgnomeui/gtkpixmapmenuitem.h include/libgnomeui/libgnomeui.h include/libgnorba/gnome-factory.h include/libgnorba/gnorba.h +include/popt-gnome.h include/zvt/lists.h include/zvt/vt.h include/zvt/vtx.h @@ -190,15 +192,14 @@ lib/libzvt.so lib/libzvt.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -share/gnome/gnomeConf.sh share/gnome/gtkrc share/gnome/gtkrc.ja share/gnome/gtkrc.ko +share/gnome/gtkrc.ru share/gnome/idl/Table.idl share/gnome/idl/base.idl share/gnome/idl/gnome-factory.idl share/gnome/idl/name-service.idl -share/gnome/libartConf.sh share/gnome/mime-info/gnome.mime share/gnome/pixmaps/calculator-font.png share/gnome/pixmaps/gnome-default-dlg.png @@ -208,6 +209,8 @@ share/gnome/pixmaps/gnome-question.png share/gnome/pixmaps/gnome-warning.png share/gnome/pixmaps/no.xpm share/gnome/pixmaps/yes.xpm +share/gnome/type-convert/gnome-make-postscript-mimes +share/gnome/type-convert/postscript.convert share/gnome/type-convert/type.convert share/locale/ca/LC_MESSAGES/gnome-libs.mo share/locale/cs/LC_MESSAGES/gnome-libs.mo @@ -227,17 +230,18 @@ share/locale/pl/LC_MESSAGES/gnome-libs.mo share/locale/pt/LC_MESSAGES/gnome-libs.mo share/locale/ru/LC_MESSAGES/gnome-libs.mo share/locale/sv/LC_MESSAGES/gnome-libs.mo -@dirrm etc/sound/events -@dirrm etc/sound -@dirrm include/gtk-xmhtml -@dirrm include/libart_lgpl -@dirrm include/libgnome -@dirrm include/libgnomeui -@dirrm include/libgnorba -@dirrm include/zvt -@dirrm share/gnome/games -@dirrm share/gnome/idl -@dirrm share/gnome/mime-info -@dirrm share/gnome/pixmaps +@exec mkdir -p %D/share/gnome/games @dirrm share/gnome/type-convert +@dirrm share/gnome/pixmaps +@dirrm share/gnome/mime-info +@dirrm share/gnome/idl +@dirrm share/gnome/games @dirrm share/gnome +@dirrm include/zvt +@dirrm include/libgnorba +@dirrm include/libgnomeui +@dirrm include/libgnome +@dirrm include/libart_lgpl +@dirrm include/gtk-xmhtml +@dirrm etc/sound/events +@dirrm etc/sound |