From ea26e179b6d4fbda13b5a25f2a56eeda8280b669 Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Fri, 3 Aug 2001 07:17:43 +0000 Subject: [PATCH] Update to 1.0.3. --- devel/gconf/Makefile | 5 ++-- devel/gconf/distinfo | 2 +- .../gconf/files/patch-backends::bdb-backend.c | 17 ++++++++++++ devel/gconf/files/patch-configure | 27 ++++++++++++++----- devel/gconf/files/patch-ltmain.sh | 18 +++++++++++++ devel/gconf/pkg-plist | 3 +++ devel/gconf2/Makefile | 5 ++-- devel/gconf2/distinfo | 2 +- .../files/patch-backends::bdb-backend.c | 17 ++++++++++++ devel/gconf2/files/patch-configure | 27 ++++++++++++++----- devel/gconf2/files/patch-ltmain.sh | 18 +++++++++++++ devel/gconf2/pkg-plist | 3 +++ 12 files changed, 122 insertions(+), 22 deletions(-) create mode 100644 devel/gconf/files/patch-backends::bdb-backend.c create mode 100644 devel/gconf/files/patch-ltmain.sh create mode 100644 devel/gconf2/files/patch-backends::bdb-backend.c create mode 100644 devel/gconf2/files/patch-ltmain.sh diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile index 455ba709bfa0..d0df4e2cc78a 100644 --- a/devel/gconf/Makefile +++ b/devel/gconf/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gconf -PORTVERSION= 1.0.1 -PORTREVISION= 4 +PORTVERSION= 1.0.3 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/GConf @@ -21,9 +20,9 @@ LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile \ USE_GMAKE= yes USE_X_PREFIX= yes -USE_LIBTOOL= yes USE_GNOMELIBS= yes INSTALLS_SHLIB= yes +GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/devel/gconf/distinfo b/devel/gconf/distinfo index 3d94217c5588..6763c65a6cd2 100644 --- a/devel/gconf/distinfo +++ b/devel/gconf/distinfo @@ -1 +1 @@ -MD5 (GConf-1.0.1.tar.gz) = dd8abf58d3c13db1751d64cc1d30d763 +MD5 (GConf-1.0.3.tar.gz) = 26a0e13976ed005fab57aa9f2ccb80d9 diff --git a/devel/gconf/files/patch-backends::bdb-backend.c b/devel/gconf/files/patch-backends::bdb-backend.c new file mode 100644 index 000000000000..bb839b4e4f52 --- /dev/null +++ b/devel/gconf/files/patch-backends::bdb-backend.c @@ -0,0 +1,17 @@ + +$FreeBSD$ + +--- backends/bdb-backend.c 2001/08/02 17:59:13 1.1 ++++ backends/bdb-backend.c 2001/08/02 18:03:23 +@@ -25,10 +25,9 @@ + #include + #include + ++#include "config.h" + #include "bdb.h" + #include "dir-utils.h" +- +-#include + + #include + #include diff --git a/devel/gconf/files/patch-configure b/devel/gconf/files/patch-configure index 53addfa8dd89..c3381fcb8680 100644 --- a/devel/gconf/files/patch-configure +++ b/devel/gconf/files/patch-configure @@ -1,19 +1,32 @@ ---- configure.orig Mon May 14 12:54:14 2001 -+++ configure Fri Jun 1 14:34:58 2001 -@@ -3003,4 +3003,4 @@ + +$FreeBSD$ + +--- configure.orig Thu Aug 2 20:52:33 2001 ++++ configure Thu Aug 2 20:53:12 2001 +@@ -6497,14 +6497,14 @@ + BDB_LIBS= + BDB_CFLAGS= -echo $ac_n "checking for db_env_create in -ldb-3""... $ac_c" 1>&6 --echo "configure:3006: checking for db_env_create in -ldb-3" >&5 +-echo "configure:6502: checking for db_env_create in -ldb-3" >&5 +echo $ac_n "checking for db_env_create in -ldb3""... $ac_c" 1>&6 -+echo "configure:3006: checking for db_env_create in -ldb3" >&5 ++echo "configure:6502: checking for db_env_create in -ldb3" >&5 ac_lib_var=`echo db-3'_'db_env_create | sed 'y%./+-%__p_%'` -@@ -3010,3 +3010,3 @@ + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else ac_save_LIBS="$LIBS" -LIBS="-ldb-3 $LIBS" +LIBS="-ldb3 $LIBS" cat > conftest.$ac_ext <&6 - BDB_LIBS=-ldb-3 + BDB_LIBS=-ldb3 else + echo "$ac_t""no" 1>&6 + fi diff --git a/devel/gconf/files/patch-ltmain.sh b/devel/gconf/files/patch-ltmain.sh new file mode 100644 index 000000000000..0c594216b0e1 --- /dev/null +++ b/devel/gconf/files/patch-ltmain.sh @@ -0,0 +1,18 @@ + +$FreeBSD$ + +--- ltmain.sh 2001/07/23 09:45:58 1.1 ++++ ltmain.sh 2001/07/23 09:46:28 +@@ -4175,10 +4175,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/devel/gconf/pkg-plist b/devel/gconf/pkg-plist index 5b283ffc6a95..4846a71e5619 100644 --- a/devel/gconf/pkg-plist +++ b/devel/gconf/pkg-plist @@ -16,7 +16,9 @@ include/gconf/1/gconf/gconf-listeners.h include/gconf/1/gconf/gconf-schema.h include/gconf/1/gconf/gconf-value.h include/gconf/1/gconf/gconf.h +lib/GConf/1/libgconfbackend-bdb.a lib/GConf/1/libgconfbackend-bdb.so +lib/GConf/1/libgconfbackend-xml.a lib/GConf/1/libgconfbackend-xml.so lib/libgconf-1.a lib/libgconf-1.so @@ -43,6 +45,7 @@ share/locale/it/LC_MESSAGES/GConf.mo share/locale/ja/LC_MESSAGES/GConf.mo share/locale/ko/LC_MESSAGES/GConf.mo share/locale/nl/LC_MESSAGES/GConf.mo +share/locale/nn/LC_MESSAGES/GConf.mo share/locale/no/LC_MESSAGES/GConf.mo share/locale/pt_BR/LC_MESSAGES/GConf.mo share/locale/ru/LC_MESSAGES/GConf.mo diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index 455ba709bfa0..d0df4e2cc78a 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gconf -PORTVERSION= 1.0.1 -PORTREVISION= 4 +PORTVERSION= 1.0.3 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/GConf @@ -21,9 +20,9 @@ LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile \ USE_GMAKE= yes USE_X_PREFIX= yes -USE_LIBTOOL= yes USE_GNOMELIBS= yes INSTALLS_SHLIB= yes +GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo index 3d94217c5588..6763c65a6cd2 100644 --- a/devel/gconf2/distinfo +++ b/devel/gconf2/distinfo @@ -1 +1 @@ -MD5 (GConf-1.0.1.tar.gz) = dd8abf58d3c13db1751d64cc1d30d763 +MD5 (GConf-1.0.3.tar.gz) = 26a0e13976ed005fab57aa9f2ccb80d9 diff --git a/devel/gconf2/files/patch-backends::bdb-backend.c b/devel/gconf2/files/patch-backends::bdb-backend.c new file mode 100644 index 000000000000..bb839b4e4f52 --- /dev/null +++ b/devel/gconf2/files/patch-backends::bdb-backend.c @@ -0,0 +1,17 @@ + +$FreeBSD$ + +--- backends/bdb-backend.c 2001/08/02 17:59:13 1.1 ++++ backends/bdb-backend.c 2001/08/02 18:03:23 +@@ -25,10 +25,9 @@ + #include + #include + ++#include "config.h" + #include "bdb.h" + #include "dir-utils.h" +- +-#include + + #include + #include diff --git a/devel/gconf2/files/patch-configure b/devel/gconf2/files/patch-configure index 53addfa8dd89..c3381fcb8680 100644 --- a/devel/gconf2/files/patch-configure +++ b/devel/gconf2/files/patch-configure @@ -1,19 +1,32 @@ ---- configure.orig Mon May 14 12:54:14 2001 -+++ configure Fri Jun 1 14:34:58 2001 -@@ -3003,4 +3003,4 @@ + +$FreeBSD$ + +--- configure.orig Thu Aug 2 20:52:33 2001 ++++ configure Thu Aug 2 20:53:12 2001 +@@ -6497,14 +6497,14 @@ + BDB_LIBS= + BDB_CFLAGS= -echo $ac_n "checking for db_env_create in -ldb-3""... $ac_c" 1>&6 --echo "configure:3006: checking for db_env_create in -ldb-3" >&5 +-echo "configure:6502: checking for db_env_create in -ldb-3" >&5 +echo $ac_n "checking for db_env_create in -ldb3""... $ac_c" 1>&6 -+echo "configure:3006: checking for db_env_create in -ldb3" >&5 ++echo "configure:6502: checking for db_env_create in -ldb3" >&5 ac_lib_var=`echo db-3'_'db_env_create | sed 'y%./+-%__p_%'` -@@ -3010,3 +3010,3 @@ + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else ac_save_LIBS="$LIBS" -LIBS="-ldb-3 $LIBS" +LIBS="-ldb3 $LIBS" cat > conftest.$ac_ext <&6 - BDB_LIBS=-ldb-3 + BDB_LIBS=-ldb3 else + echo "$ac_t""no" 1>&6 + fi diff --git a/devel/gconf2/files/patch-ltmain.sh b/devel/gconf2/files/patch-ltmain.sh new file mode 100644 index 000000000000..0c594216b0e1 --- /dev/null +++ b/devel/gconf2/files/patch-ltmain.sh @@ -0,0 +1,18 @@ + +$FreeBSD$ + +--- ltmain.sh 2001/07/23 09:45:58 1.1 ++++ ltmain.sh 2001/07/23 09:46:28 +@@ -4175,10 +4175,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist index 5b283ffc6a95..4846a71e5619 100644 --- a/devel/gconf2/pkg-plist +++ b/devel/gconf2/pkg-plist @@ -16,7 +16,9 @@ include/gconf/1/gconf/gconf-listeners.h include/gconf/1/gconf/gconf-schema.h include/gconf/1/gconf/gconf-value.h include/gconf/1/gconf/gconf.h +lib/GConf/1/libgconfbackend-bdb.a lib/GConf/1/libgconfbackend-bdb.so +lib/GConf/1/libgconfbackend-xml.a lib/GConf/1/libgconfbackend-xml.so lib/libgconf-1.a lib/libgconf-1.so @@ -43,6 +45,7 @@ share/locale/it/LC_MESSAGES/GConf.mo share/locale/ja/LC_MESSAGES/GConf.mo share/locale/ko/LC_MESSAGES/GConf.mo share/locale/nl/LC_MESSAGES/GConf.mo +share/locale/nn/LC_MESSAGES/GConf.mo share/locale/no/LC_MESSAGES/GConf.mo share/locale/pt_BR/LC_MESSAGES/GConf.mo share/locale/ru/LC_MESSAGES/GConf.mo