Update to 1.0.7.

5 files changed, 29 insertions, 30 deletions

diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index 48542d648542..d337709fb8b3 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gconf
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.7
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/GConf
diff --git a/devel/gconf/distinfo b/devel/gconf/distinfo
index a6edb3511d38..f321c67ce971 100644
--- a/devel/gconf/distinfo
+++ b/devel/gconf/distinfo
@@ -1 +1 @@
-MD5 (GConf-1.0.4.tar.gz) = 6eb7072552d8d9a02bdca38376f58863
+MD5 (GConf-1.0.7.tar.gz) = eec527bd1590c175dd400ec5482a4b1c
diff --git a/devel/gconf/files/patch-configure b/devel/gconf/files/patch-configure
index c3381fcb8680..3f2e41b97fe0 100644
--- a/devel/gconf/files/patch-configure
+++ b/devel/gconf/files/patch-configure
@@ -1,32 +1,14 @@
 
 $FreeBSD$
 
---- configure.orig	Thu Aug  2 20:52:33 2001
-+++ configure	Thu Aug  2 20:53:12 2001
-@@ -6497,14 +6497,14 @@
- BDB_LIBS=
+--- configure.orig	Wed Nov  7 13:24:42 2001
++++ configure	Wed Nov  7 13:25:30 2001
+@@ -6627,7 +6627,7 @@
  BDB_CFLAGS=
  
--echo $ac_n "checking for db_env_create in -ldb-3""... $ac_c" 1>&6
--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:6502: checking for db_env_create in -ldb3" >&5
- ac_lib_var=`echo db-3'_'db_env_create | sed 'y%./+-%__p_%'`
- 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 <<EOF
- #line 6510 "configure"
- #include "confdefs.h"
-@@ -6532,7 +6532,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  BDB_LIBS=-ldb-3
-+  BDB_LIBS=-ldb3
- else
-   echo "$ac_t""no" 1>&6
- fi
+ 
+-for dblib in db-3.3 db-3.2 db-3.1 db-3; do
++for dblib in db-3.3 db-3.2 db-3.1 db-3 db3; do
+   echo $ac_n "checking for db_env_create in -l$dblib""... $ac_c" 1>&6
+ echo "configure:6633: checking for db_env_create in -l$dblib" >&5
+ ac_lib_var=`echo $dblib'_'db_env_create | sed 'y%./+-%__p_%'`
diff --git a/devel/gconf/files/patch-gconf::gconf-internals.c b/devel/gconf/files/patch-gconf::gconf-internals.c
new file mode 100644
index 000000000000..db4e8c961980
--- /dev/null
+++ b/devel/gconf/files/patch-gconf::gconf-internals.c
@@ -0,0 +1,15 @@
+
+$FreeBSD$
+
+--- gconf/gconf-internals.c	2001/11/07 11:27:13	1.1
++++ gconf/gconf-internals.c	2001/11/07 11:27:52
+@@ -28,6 +28,9 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <stdio.h>
diff --git a/devel/gconf/pkg-plist b/devel/gconf/pkg-plist
index cd619d1a453d..8c9bb4683a71 100644
--- a/devel/gconf/pkg-plist
+++ b/devel/gconf/pkg-plist
@@ -27,7 +27,6 @@ lib/libgconf-gtk-1.so.1
 libdata/pkgconfig/gconf.pc
 libdata/pkgconfig/gconfgtk.pc
 share/aclocal/gconf-1.m4
-share/gnome/oaf/gconfd-1.oafinfo
 share/locale/az/LC_MESSAGES/GConf.mo
 share/locale/ca/LC_MESSAGES/GConf.mo
 share/locale/cs/LC_MESSAGES/GConf.mo
@@ -38,6 +37,7 @@ share/locale/es/LC_MESSAGES/GConf.mo
 share/locale/fi/LC_MESSAGES/GConf.mo
 share/locale/fr/LC_MESSAGES/GConf.mo
 share/locale/ga/LC_MESSAGES/GConf.mo
+share/locale/gl/LC_MESSAGES/GConf.mo
 share/locale/hu/LC_MESSAGES/GConf.mo
 share/locale/it/LC_MESSAGES/GConf.mo
 share/locale/ja/LC_MESSAGES/GConf.mo
@@ -45,6 +45,8 @@ 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/pl/LC_MESSAGES/GConf.mo
+share/locale/pt/LC_MESSAGES/GConf.mo
 share/locale/pt_BR/LC_MESSAGES/GConf.mo
 share/locale/ru/LC_MESSAGES/GConf.mo
 share/locale/sk/LC_MESSAGES/GConf.mo