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>
This commit is contained in:
Jacques Vidrine 1999-03-09 01:13:40 +00:00
parent f642b1eef5
commit f4442a7aa7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=17091
236 changed files with 4697 additions and 4667 deletions

View file

@ -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/

View file

@ -1 +1 @@
MD5 (esound-0.2.7.tar.gz) = 3a530a942880268f8b9aaf3df38fd478
MD5 (esound-0.2.8.tar.gz) = fa22beaa64d9da82858762cf1fc76de3

View file

@ -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

View file

@ -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

View file

@ -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'

View file

@ -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>

View file

@ -1 +1 @@
MD5 (gnome-audio-0.99.8.tar.gz) = 68dc71c2317fc5ac5ba9dbfc7ac0f121
MD5 (gnome-audio-1.0.0.tar.gz) = 3ae217dfa20fc8fbb67595a32d6beeec

View file

@ -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

View file

@ -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

View file

@ -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>

View file

@ -1 +1 @@
MD5 (gnome-audio-0.99.8.tar.gz) = 68dc71c2317fc5ac5ba9dbfc7ac0f121
MD5 (gnome-audio-1.0.0.tar.gz) = 3ae217dfa20fc8fbb67595a32d6beeec

View file

@ -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

View file

@ -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

View file

@ -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>

View file

@ -1 +1 @@
MD5 (gnome-audio-0.99.8.tar.gz) = 68dc71c2317fc5ac5ba9dbfc7ac0f121
MD5 (gnome-audio-1.0.0.tar.gz) = 3ae217dfa20fc8fbb67595a32d6beeec

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -1 +1 @@
MD5 (libaudiofile-0.1.5.tar.gz) = 9eaf6631b47750c2c9cdedaa8da5546c
MD5 (audiofile-0.1.6.tar.gz) = 787c59576393dfb7bdc1a2d2da67441e

View file

@ -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:

View file

@ -1 +1 @@
MD5 (gnome-pim-0.99.8.1.tar.gz) = 7abb905be1b2018e6ee5053f294b7194
MD5 (gnome-pim-1.0.1.tar.gz) = 1f299e994a4fceb0f520bf03385510c5

View file

@ -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
SUBDIRS = help
-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
-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

View file

@ -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

View file

@ -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

View file

@ -1 +1 @@
MD5 (gnome-utils-0.99.5.tar.gz) = 9eac5326842d1027edf2b959cbb23583
MD5 (gnome-utils-1.0.1.tar.gz) = c267d32ddf310b3e9f70a2d915cccf5a

View file

@ -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

View file

@ -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

View file

@ -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:

View file

@ -1 +1 @@
MD5 (gnome-pim-0.99.8.1.tar.gz) = 7abb905be1b2018e6ee5053f294b7194
MD5 (gnome-pim-1.0.1.tar.gz) = 1f299e994a4fceb0f520bf03385510c5

View file

@ -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
SUBDIRS = help
-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
-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

View file

@ -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

View file

@ -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

View file

@ -1 +1 @@
MD5 (gnome-utils-0.99.5.tar.gz) = 9eac5326842d1027edf2b959cbb23583
MD5 (gnome-utils-1.0.1.tar.gz) = c267d32ddf310b3e9f70a2d915cccf5a

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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:

View file

@ -1 +1 @@
MD5 (ORBit-0.3.98.tar.gz) = 3c3368d25d2dd154130ec882d63ce602
MD5 (ORBit-0.4.0.tar.gz) = 41182664df08b1a5c4a9a7e46823d0cc

View file

@ -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

View file

@ -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=*)

View file

@ -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.

View file

@ -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

View file

@ -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:

View file

@ -1 +1 @@
MD5 (ORBit-0.3.98.tar.gz) = 3c3368d25d2dd154130ec882d63ce602
MD5 (ORBit-0.4.0.tar.gz) = 41182664df08b1a5c4a9a7e46823d0cc

View file

@ -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

View file

@ -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=*)

View file

@ -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.

View file

@ -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

View file

@ -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>

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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>

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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>

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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 \

View file

@ -1 +1 @@
MD5 (glib-1.1.16.tar.gz) = f1b32a51becffdad18193b84656989b0
MD5 (glib-1.2.0.tar.gz) = b19f308dbbd393b6199e743cb1c648a1

View file

@ -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_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info 1:0: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_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)

View file

@ -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

View file

@ -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 ****************************************

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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 \

View file

@ -1 +1 @@
MD5 (glib-1.1.16.tar.gz) = f1b32a51becffdad18193b84656989b0
MD5 (glib-1.2.0.tar.gz) = b19f308dbbd393b6199e743cb1c648a1

View file

@ -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_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info 1:0: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_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)

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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 \

View file

@ -1 +1 @@
MD5 (glib-1.1.16.tar.gz) = f1b32a51becffdad18193b84656989b0
MD5 (glib-1.2.0.tar.gz) = b19f308dbbd393b6199e743cb1c648a1

View file

@ -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_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info 1:0: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_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)

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -1 +1 @@
MD5 (libgtop-0.99.8.tar.gz) = 3cae59e8e94912483373561abf4937c4
MD5 (libgtop-1.0.1.tar.gz) = f9b1c3c6f6eb178016a5213ab43a0219

View file

@ -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
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@
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
@@ -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
include_HEADERS = glibtop.h
@@ -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

View file

@ -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

View file

@ -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

View file

@ -1 +1 @@
MD5 (libgtop-0.99.8.tar.gz) = 3cae59e8e94912483373561abf4937c4
MD5 (libgtop-1.0.1.tar.gz) = f9b1c3c6f6eb178016a5213ab43a0219

View file

@ -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
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@
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
@@ -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
include_HEADERS = glibtop.h
@@ -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

View file

@ -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

View file

@ -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:

View file

@ -1 +1 @@
MD5 (gnome-games-0.99.8.tar.gz) = c54271158b7b440539c8334793734f2e
MD5 (gnome-games-1.0.1.tar.gz) = 4bd48e4912eb8eb52226fcb713351de6

View file

@ -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

View file

@ -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/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/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/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/pixmaps/cards/slots
@dirrm share/gnome/pixmaps/cards/suits
@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/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

View file

@ -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:

View file

@ -1 +1 @@
MD5 (gnome-games-0.99.8.tar.gz) = c54271158b7b440539c8334793734f2e
MD5 (gnome-games-1.0.1.tar.gz) = 4bd48e4912eb8eb52226fcb713351de6

View file

@ -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

View file

@ -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/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/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/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/pixmaps/cards/slots
@dirrm share/gnome/pixmaps/cards/suits
@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/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

View file

@ -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:

View file

@ -1 +1 @@
MD5 (gnome-games-0.99.8.tar.gz) = c54271158b7b440539c8334793734f2e
MD5 (gnome-games-1.0.1.tar.gz) = 4bd48e4912eb8eb52226fcb713351de6

View file

@ -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

View file

@ -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/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/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/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/pixmaps/cards/slots
@dirrm share/gnome/pixmaps/cards/suits
@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/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

Some files were not shown because too many files have changed in this diff Show more