summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorJacques Vidrine <nectar@FreeBSD.org>1999-03-25 02:39:28 +0000
committerJacques Vidrine <nectar@FreeBSD.org>1999-03-25 02:39:28 +0000
commitdddb6be03cd3dd1516694eff85bc156c9b00ca54 (patch)
tree45c856705f6c90c973a6f4aa383f7196c237ee82 /x11
parentUpdate 0.99.2 -> 1.0.2 (diff)
Update 1.0.1 -> 1.0.3
Notes
Notes: svn path=/head/; revision=17391
Diffstat (limited to 'x11')
-rw-r--r--x11/gnomecore/Makefile10
-rw-r--r--x11/gnomecore/distinfo2
-rw-r--r--x11/gnomecore/files/patch-aa19
-rw-r--r--x11/gnomecore/files/patch-ae10
4 files changed, 26 insertions, 15 deletions
diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile
index 074755689656..227d80396230 100644
--- a/x11/gnomecore/Makefile
+++ b/x11/gnomecore/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: gnomecore
-# Version required: 1.0.1
+# Version required: 1.0.3
# Date created: 17 March 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
-# $Id: Makefile,v 1.18 1999/02/19 04:26:33 vanilla Exp $
+# $Id: Makefile,v 1.19 1999/03/09 01:09:04 nectar Exp $
#
-DISTNAME= gnome-core-1.0.1
-PKGNAME= gnomecore-1.0.1
+DISTNAME= gnome-core-1.0.3
+PKGNAME= gnomecore-1.0.3
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= gnome-1.0/sources
@@ -16,7 +16,7 @@ MAINTAINER= nacai@iname.com
RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio
LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop \
- ghttp.0:${PORTSDIR}/www/libghttp
+ ghttp.1:${PORTSDIR}/www/libghttp
# implicit dependencies
# gettext, esound, gnomelibs
diff --git a/x11/gnomecore/distinfo b/x11/gnomecore/distinfo
index 01226fad42fa..887522f39685 100644
--- a/x11/gnomecore/distinfo
+++ b/x11/gnomecore/distinfo
@@ -1 +1 @@
-MD5 (gnome-core-1.0.1.tar.gz) = 9ce27fa72576f0dc3291ec8d5c71b96f
+MD5 (gnome-core-1.0.3.tar.gz) = e382a51aae8071844901090c6f6a98a1
diff --git a/x11/gnomecore/files/patch-aa b/x11/gnomecore/files/patch-aa
index b46bf15f1c0b..f3d5a45f400e 100644
--- a/x11/gnomecore/files/patch-aa
+++ b/x11/gnomecore/files/patch-aa
@@ -1,6 +1,15 @@
---- configure.orig Sun Feb 28 23:24:44 1999
-+++ configure Tue Mar 2 19:12:49 1999
-@@ -5076,7 +5076,7 @@
+--- configure.orig Sat Mar 13 17:32:41 1999
++++ configure Wed Mar 24 20:02:38 1999
+@@ -2578,7 +2578,7 @@
+ CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+ LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
+ DLLTOOL="$DLLTOOL" AS="$AS" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
++${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+
+@@ -5096,7 +5096,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
@@ -9,7 +18,7 @@
fi
rm -f conftest*
INSTOBJEXT=.mo
-@@ -5338,7 +5338,7 @@
+@@ -5358,7 +5358,7 @@
USE_INCLUDED_LIBINTL=yes
CATOBJEXT=.cat
INSTOBJEXT=.cat
@@ -18,7 +27,7 @@
INTLDEPS='$(top_builddir)/intl/libintl.a'
INTLLIBS=$INTLDEPS
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-@@ -6247,6 +6247,7 @@
+@@ -6267,6 +6267,7 @@
case "$host" in
*linux*) CDROM_HOST=linux;;
*solaris*) CDROM_HOST=solaris;;
diff --git a/x11/gnomecore/files/patch-ae b/x11/gnomecore/files/patch-ae
index 464ef2979f01..7c5b9b37684b 100644
--- a/x11/gnomecore/files/patch-ae
+++ b/x11/gnomecore/files/patch-ae
@@ -355,8 +355,8 @@
cxxflags_set = @cxxflags_set@
l = @l@
--SUBDIRS = C
-+# SUBDIRS = C
+-SUBDIRS = C no
++# SUBDIRS = C no
-INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale\""
+INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale\""
@@ -374,11 +374,13 @@
CONFIG_HEADER = ../config.h
--- gsm/Makefile.in.orig Tue Mar 2 01:52:17 1999
+++ gsm/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
+@@ -154,9 +154,9 @@
cxxflags_set = @cxxflags_set@
l = @l@
+
+ defaultdir = $(datadir)/gnome
--INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DDEFAULTDIR="\"$(datadir)\""
+-INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DDEFAULTDIR="\"$(defaultdir)\""
+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DDEFAULTDIR="\"$(datadir)\""