Update to GConf-1.0.7, from maintainer
* Better compability for installing gconf 1 & 2 side by side * Better UTF8 handling * Lots of compilation and configuring fixes * Some portability fixes * Plus a lot of other fixes, see Changelog for full description
This commit is contained in:
parent
3e85978f60
commit
485c52a7d5
@ -1,19 +1,16 @@
|
||||
# $OpenBSD: Makefile,v 1.7 2001/10/07 20:55:10 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.8 2001/11/13 14:04:41 wilfried Exp $
|
||||
|
||||
COMMENT= "configuration database system written for GNOME"
|
||||
V= 1.0.1
|
||||
V= 1.0.7
|
||||
DISTNAME= GConf-${V}
|
||||
CATEGORIES= devel
|
||||
NEED_VERSION= 1.473
|
||||
NEED_VERSION= 1.490
|
||||
HOMEPAGE= http://www.gnome.org
|
||||
MAINTAINER= Nils Nordman <nino@nforced.com>
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_GNOME}
|
||||
MASTER_SITE_SUBDIR= stable/sources/GConf
|
||||
|
||||
PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig \
|
||||
${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh \
|
||||
patch-*
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
LIB_DEPENDS= oaf.::x11/gnome/oaf \
|
||||
gnome.36::x11/gnome/libs
|
||||
@ -21,11 +18,13 @@ LIB_DEPENDS= oaf.::x11/gnome/oaf \
|
||||
FLAVORS= guile db3
|
||||
FLAVOR?=
|
||||
|
||||
# GPL
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
SEPARATE_BUILD= concurrent
|
||||
USE_X11= Yes
|
||||
CONFIGURE_STYLE= autoconf
|
||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||
@ -42,11 +41,30 @@ CONFIGURE_ENV+= GUILE_CONFIG=/usr/bin/false
|
||||
.if ${FLAVOR:L:Mdb3}
|
||||
LIB_DEPENDS+= db::databases/db
|
||||
CONFIGURE_ARGS+= --enable-db3
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-db3
|
||||
.endif
|
||||
|
||||
pre-extract:
|
||||
@if pkg dependencies check GConf-\*; then \
|
||||
if pkg dependencies check ${DISTNAME}; then \
|
||||
:; \
|
||||
else \
|
||||
echo 1>&2 "Error: you must remove your old GConf first"; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
fi;
|
||||
|
||||
post-install:
|
||||
@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gconf; \
|
||||
cp -rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/gconf; \
|
||||
mv ${PREFIX}/share/examples/gconf/gconf/1/path.example ${PREFIX}/share/examples/gconf/gconf/1/path
|
||||
cp -Rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/gconf;
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
.if ${FLAVOR:L:Mdb3}
|
||||
.if !defined(NO_SHARED_LIBS)
|
||||
SED_PLIST+=-e '/%%SHARED-db3%%/r${PKGDIR}/PFRAG.db3.shared' -e '//d'
|
||||
.else
|
||||
SED_PLIST+=-e '/%%SHARED-db3%%/d'
|
||||
.endif
|
||||
.endif
|
||||
|
3
devel/gconf/distinfo
Normal file
3
devel/gconf/distinfo
Normal file
@ -0,0 +1,3 @@
|
||||
MD5 (GConf-1.0.7.tar.bz2) = c392fe95a148f327bef98108f936e145
|
||||
RMD160 (GConf-1.0.7.tar.bz2) = 63aa68a731847336e6209fcdbe1559b10a19b53e
|
||||
SHA1 (GConf-1.0.7.tar.bz2) = d4ad1064accbd1dc12e6c6d53204a0a38fc596f6
|
@ -1,3 +0,0 @@
|
||||
MD5 (GConf-1.0.1.tar.gz) = dd8abf58d3c13db1751d64cc1d30d763
|
||||
RMD160 (GConf-1.0.1.tar.gz) = 0a7a98ce349dfd4c0a7d31025b2df0d0585c59a7
|
||||
SHA1 (GConf-1.0.1.tar.gz) = a0585d21a0e3b6dfbad88f9207ce6bdaaa5064e6
|
106
devel/gconf/patches/patch-aclocal_m4
Normal file
106
devel/gconf/patches/patch-aclocal_m4
Normal file
@ -0,0 +1,106 @@
|
||||
$OpenBSD: patch-aclocal_m4,v 1.3 2001/11/13 14:04:41 wilfried Exp $
|
||||
--- aclocal.m4.orig Mon Oct 29 19:55:11 2001
|
||||
+++ aclocal.m4 Sun Nov 11 22:53:02 2001
|
||||
@@ -1003,6 +1003,7 @@ if test "X${PATH_SEPARATOR+set}" != Xset
|
||||
*-DOS) lt_cv_sys_path_separator=';' ;;
|
||||
*) lt_cv_sys_path_separator=':' ;;
|
||||
esac
|
||||
+ PATH_SEPARATOR=$lt_cv_sys_path_separator
|
||||
fi
|
||||
])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
|
||||
|
||||
@@ -1420,8 +1421,15 @@ old_postinstall_cmds='chmod 644 $oldlib'
|
||||
old_postuninstall_cmds=
|
||||
|
||||
if test -n "$RANLIB"; then
|
||||
+ case $host_os in
|
||||
+ openbsd*)
|
||||
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
|
||||
+ ;;
|
||||
+ *)
|
||||
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
|
||||
+ ;;
|
||||
+ esac
|
||||
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
|
||||
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
|
||||
fi
|
||||
|
||||
# Allow CC to be a program name with arguments.
|
||||
@@ -1824,7 +1832,9 @@ cygwin* | mingw* | pw32* )
|
||||
with_gnu_ld=no
|
||||
fi
|
||||
;;
|
||||
-
|
||||
+openbsd*)
|
||||
+ with_gnu_ld=no
|
||||
+ ;;
|
||||
esac
|
||||
|
||||
ld_shlibs=yes
|
||||
@@ -2228,10 +2238,24 @@ else
|
||||
;;
|
||||
|
||||
openbsd*)
|
||||
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
||||
- hardcode_libdir_flag_spec='-R$libdir'
|
||||
hardcode_direct=yes
|
||||
hardcode_shlibpath_var=no
|
||||
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
|
||||
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
+ export_dynamic_flag_spec='${wl}-E'
|
||||
+ else
|
||||
+ case "$host_os" in
|
||||
+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
|
||||
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
||||
+ hardcode_libdir_flag_spec='-R$libdir'
|
||||
+ ;;
|
||||
+ *)
|
||||
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
|
||||
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
+ ;;
|
||||
+ esac
|
||||
+ fi
|
||||
;;
|
||||
|
||||
os2*)
|
||||
@@ -2705,9 +2729,19 @@ newsos6)
|
||||
|
||||
openbsd*)
|
||||
version_type=sunos
|
||||
- if test "$with_gnu_ld" = yes; then
|
||||
- need_lib_prefix=no
|
||||
- need_version=no
|
||||
+ need_lib_prefix=no
|
||||
+ need_version=no
|
||||
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
+ case "$host_os" in
|
||||
+ openbsd2.[[89]] | openbsd2.[[89]].*)
|
||||
+ shlibpath_overrides_runpath=no
|
||||
+ ;;
|
||||
+ *)
|
||||
+ shlibpath_overrides_runpath=yes
|
||||
+ ;;
|
||||
+ esac
|
||||
+ else
|
||||
+ shlibpath_overrides_runpath=yes
|
||||
fi
|
||||
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
@@ -3838,6 +3872,16 @@ newos6*)
|
||||
[lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
|
||||
lt_cv_file_magic_cmd=/usr/bin/file
|
||||
lt_cv_file_magic_test_file=/usr/lib/libnls.so
|
||||
+ ;;
|
||||
+
|
||||
+openbsd*)
|
||||
+ lt_cv_file_magic_cmd=/usr/bin/file
|
||||
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
|
||||
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
|
||||
+ else
|
||||
+ lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
|
||||
+ fi
|
||||
;;
|
||||
|
||||
osf3* | osf4* | osf5*)
|
@ -1,12 +1,24 @@
|
||||
$OpenBSD: patch-backends_bdb_h,v 1.1.1.1 2001/09/13 20:52:08 todd Exp $
|
||||
--- backends/bdb.h.orig Mon Aug 27 14:59:17 2001
|
||||
+++ backends/bdb.h Mon Aug 27 14:59:27 2001
|
||||
@@ -116,7 +116,7 @@
|
||||
$OpenBSD: patch-backends_bdb_h,v 1.2 2001/11/13 14:04:41 wilfried Exp $
|
||||
--- backends/bdb.h.orig Fri Oct 12 20:51:36 2001
|
||||
+++ backends/bdb.h Mon Nov 12 22:25:56 2001
|
||||
@@ -116,11 +116,18 @@
|
||||
|
||||
#ifndef BDB_H
|
||||
|
||||
+#include <config.h>
|
||||
+
|
||||
#ifdef HAVE_DB3_DB_H
|
||||
-#include <db3/db.h>
|
||||
+# include <db3/db.h>
|
||||
#else
|
||||
-#include <db.h>
|
||||
+#include <db3.h>
|
||||
+# ifdef HAVE_DB3_H
|
||||
+# include <db3.h>
|
||||
+# else
|
||||
+# include <db.h>
|
||||
+# endif
|
||||
#endif
|
||||
+
|
||||
#include <glib.h>
|
||||
#include <gconf/gconf.h>
|
||||
|
||||
|
12
devel/gconf/patches/patch-backends_val-encode_c
Normal file
12
devel/gconf/patches/patch-backends_val-encode_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-backends_val-encode_c,v 1.1 2001/11/13 14:04:41 wilfried Exp $
|
||||
--- backends/val-encode.c.orig Mon Nov 12 23:10:51 2001
|
||||
+++ backends/val-encode.c Mon Nov 12 23:16:24 2001
|
||||
@@ -19,6 +19,8 @@
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
+#include <stdlib.h>
|
||||
+#include <stdio.h>
|
||||
|
||||
#include <gconf/gconf.h>
|
||||
|
31
devel/gconf/patches/patch-backends_xml-backend_c
Normal file
31
devel/gconf/patches/patch-backends_xml-backend_c
Normal file
@ -0,0 +1,31 @@
|
||||
$OpenBSD: patch-backends_xml-backend_c,v 1.1 2001/11/13 14:04:41 wilfried Exp $
|
||||
--- backends/xml-backend.c.orig Fri Oct 12 21:30:26 2001
|
||||
+++ backends/xml-backend.c Mon Nov 12 20:33:43 2001
|
||||
@@ -18,6 +18,7 @@
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
+#include <config.h>
|
||||
|
||||
#include <gconf/gconf-backend.h>
|
||||
#include <gconf/gconf-internals.h>
|
||||
@@ -25,9 +26,17 @@
|
||||
|
||||
#include "xml-cache.h"
|
||||
|
||||
+#ifdef HAVE_GNOME_XML_TREE_H
|
||||
+# include <gnome-xml/tree.h>
|
||||
+#else
|
||||
+# include <libxml/tree.h>
|
||||
+#endif
|
||||
|
||||
-#include <libxml/tree.h>
|
||||
-#include <libxml/parser.h>
|
||||
+#ifdef HAVE_GNOME_XML_PARSER_H
|
||||
+# include <gnome-xml/parser.h>
|
||||
+#else
|
||||
+# include <libxml/parser.h>
|
||||
+#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <time.h>
|
18
devel/gconf/patches/patch-backends_xml-cache_h
Normal file
18
devel/gconf/patches/patch-backends_xml-cache_h
Normal file
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-backends_xml-cache_h,v 1.1 2001/11/13 14:04:41 wilfried Exp $
|
||||
--- backends/xml-cache.h.orig Mon Nov 12 12:40:44 2001
|
||||
+++ backends/xml-cache.h Mon Nov 12 12:41:02 2001
|
||||
@@ -21,7 +21,13 @@
|
||||
#define GCONF_XML_CACHE_H
|
||||
|
||||
#include <gconf/gconf.h>
|
||||
-#include <libxml/tree.h>
|
||||
+
|
||||
+#ifdef HAVE_GNOME_XML_TREE_H
|
||||
+# include <gnome-xml/tree.h>
|
||||
+#else
|
||||
+# include <libxml/tree.h>
|
||||
+#endif
|
||||
+
|
||||
#include "xml-dir.h"
|
||||
|
||||
typedef struct _Cache Cache;
|
21
devel/gconf/patches/patch-backends_xml-dir_c
Normal file
21
devel/gconf/patches/patch-backends_xml-dir_c
Normal file
@ -0,0 +1,21 @@
|
||||
$OpenBSD: patch-backends_xml-dir_c,v 1.1 2001/11/13 14:04:41 wilfried Exp $
|
||||
--- backends/xml-dir.c.orig Fri Oct 12 21:01:25 2001
|
||||
+++ backends/xml-dir.c Mon Nov 12 20:35:08 2001
|
||||
@@ -17,10 +17,16 @@
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
+#include <config.h>
|
||||
+
|
||||
#include "xml-dir.h"
|
||||
#include "xml-entry.h"
|
||||
|
||||
-#include <libxml/parser.h>
|
||||
+#ifdef HAVE_GNOME_XML_PARSER_H
|
||||
+# include <gnome-xml/parser.h>
|
||||
+#else
|
||||
+# include <libxml/parser.h>
|
||||
+#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <time.h>
|
20
devel/gconf/patches/patch-backends_xml-dir_h
Normal file
20
devel/gconf/patches/patch-backends_xml-dir_h
Normal file
@ -0,0 +1,20 @@
|
||||
$OpenBSD: patch-backends_xml-dir_h,v 1.1 2001/11/13 14:04:41 wilfried Exp $
|
||||
--- backends/xml-dir.h.orig Fri Oct 12 21:01:30 2001
|
||||
+++ backends/xml-dir.h Mon Nov 12 20:36:58 2001
|
||||
@@ -20,8 +20,15 @@
|
||||
#ifndef GCONF_XML_DIR_H
|
||||
#define GCONF_XML_DIR_H
|
||||
|
||||
+#include <config.h>
|
||||
+
|
||||
#include <gconf/gconf.h>
|
||||
-#include <libxml/tree.h>
|
||||
+
|
||||
+#ifdef HAVE_GNOME_XML_TREE_H
|
||||
+# include <gnome-xml/tree.h>
|
||||
+#else
|
||||
+# include <libxml/tree.h>
|
||||
+#endif
|
||||
|
||||
/* Dir stores the information about a given directory */
|
||||
|
29
devel/gconf/patches/patch-backends_xml-entry_c
Normal file
29
devel/gconf/patches/patch-backends_xml-entry_c
Normal file
@ -0,0 +1,29 @@
|
||||
$OpenBSD: patch-backends_xml-entry_c,v 1.1 2001/11/13 14:04:41 wilfried Exp $
|
||||
--- backends/xml-entry.c.orig Fri Oct 12 21:30:58 2001
|
||||
+++ backends/xml-entry.c Mon Nov 12 20:34:53 2001
|
||||
@@ -17,11 +17,23 @@
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
+#include <config.h>
|
||||
+
|
||||
#include "xml-entry.h"
|
||||
#include <gconf/gconf-internals.h>
|
||||
#include <stdlib.h>
|
||||
-#include <libxml/entities.h>
|
||||
-#include <libxml/xmlmemory.h>
|
||||
+
|
||||
+#ifdef HAVE_GNOME_XML_ENTITIES_H
|
||||
+# include <gnome-xml/entities.h>
|
||||
+#else
|
||||
+# include <libxml/entities.h>
|
||||
+#endif
|
||||
+
|
||||
+#ifdef HAVE_GNOME_XML_XMLMEMORY_H
|
||||
+# include <gnome-xml/xmlmemory.h>
|
||||
+#else
|
||||
+# include <libxml/xmlmemory.h>
|
||||
+#endif
|
||||
|
||||
static void
|
||||
entry_sync_if_needed(Entry* e, GConfValue* val);
|
36
devel/gconf/patches/patch-config_h_in
Normal file
36
devel/gconf/patches/patch-config_h_in
Normal file
@ -0,0 +1,36 @@
|
||||
$OpenBSD: patch-config_h_in,v 1.1 2001/11/13 14:04:41 wilfried Exp $
|
||||
--- config.h.in.orig Thu Oct 4 19:22:03 2001
|
||||
+++ config.h.in Tue Nov 13 11:27:53 2001
|
||||
@@ -49,7 +49,6 @@
|
||||
#undef ENABLE_NLS
|
||||
#undef HAVE_PTHREAD_H
|
||||
#undef GETTEXT_PACKAGE
|
||||
-#undef HAVE_DB3_DB_H
|
||||
|
||||
/* Define if you have the __argz_count function. */
|
||||
#undef HAVE___ARGZ_COUNT
|
||||
@@ -107,6 +106,24 @@
|
||||
|
||||
/* Define if you have the <db3/db.h> header file. */
|
||||
#undef HAVE_DB3_DB_H
|
||||
+
|
||||
+/* Define if you have the <db3.h> header file. */
|
||||
+#undef HAVE_DB3_H
|
||||
+
|
||||
+/* Define if you have the <sys/socket.h> header file. */
|
||||
+#undef HAVE_SYS_SOCKET_H
|
||||
+
|
||||
+/* Define if you have the <gnome-xml/entities.h> header file. */
|
||||
+#undef HAVE_GNOME_XML_ENTITIES_H
|
||||
+
|
||||
+/* Define if you have the <gnome-xml/parser.h> header file. */
|
||||
+#undef HAVE_GNOME_XML_PARSER_H
|
||||
+
|
||||
+/* Define if you have the <gnome-xml/tree.h> header file. */
|
||||
+#undef HAVE_GNOME_XML_TREE_H
|
||||
+
|
||||
+/* Define if you have the <gnome-xml/xmlmemory.h> header file. */
|
||||
+#undef HAVE_GNOME_XML_XMLMEMORY_H
|
||||
|
||||
/* Define if you have the <dlfcn.h> header file. */
|
||||
#undef HAVE_DLFCN_H
|
@ -1,21 +1,58 @@
|
||||
$OpenBSD: patch-configure_in,v 1.1 2001/09/18 14:22:14 naddy Exp $
|
||||
--- configure.in.orig Tue Sep 18 15:28:19 2001
|
||||
+++ configure.in Tue Sep 18 15:37:25 2001
|
||||
@@ -167,11 +167,14 @@ AC_SUBST(GNOME_CFLAGS)
|
||||
$OpenBSD: patch-configure_in,v 1.2 2001/11/13 14:04:41 wilfried Exp $
|
||||
--- configure.in.orig Mon Oct 29 19:53:48 2001
|
||||
+++ configure.in Tue Nov 13 14:18:40 2001
|
||||
@@ -140,6 +140,13 @@ if test "x$docs_only" = "xyes"; then
|
||||
AC_FYI("Only building documentation")
|
||||
else
|
||||
|
||||
+AC_CHECK_HEADERS(sys/socket.h)
|
||||
+
|
||||
+dnl use xml headers from gnome-xml if they exist
|
||||
+AC_CHECK_HEADERS(gnome-xml/tree.h gnome-xml/parser.h gnome-xml/entities.h gnome-xml/xmlmemory.h )
|
||||
+
|
||||
+AC_CHECK_HEADERS(sys/socket.h)
|
||||
+
|
||||
AC_CHECK_LIB(popt, poptGetArg, POPT_LIBS=-lpopt,
|
||||
[AC_CHECK_HEADER(popt.h, , AC_MSG_ERROR([[
|
||||
*** Couldn't find popt. Please download and install from
|
||||
@@ -167,19 +174,30 @@ AC_SUBST(XML_CFLAGS)
|
||||
BDB_LIBS=
|
||||
BDB_CFLAGS=
|
||||
|
||||
-AC_CHECK_LIB(db-3, db_env_create, BDB_LIBS=-ldb-3)
|
||||
-
|
||||
-for dblib in db-3.3 db-3.2 db-3.1 db-3; do
|
||||
- AC_CHECK_LIB($dblib, db_env_create, BDB_LIBS=-l$dblib)
|
||||
- if test "x$BDB_LIBS" != x; then
|
||||
- break
|
||||
+AC_ARG_ENABLE(db3,
|
||||
+ [ --enable-db3=[no/yes] build bdb backend],[
|
||||
+ if test "x$enable_db3" = "xyes"; then
|
||||
+ for dblib in db-3.3 db-3.2 db-3.1 db-3 db; do
|
||||
+ AC_CHECK_LIB($dblib, db_env_create, BDB_LIBS=-l$dblib)
|
||||
+ if test "x$BDB_LIBS" != x; then
|
||||
+ break
|
||||
+ fi
|
||||
+ done
|
||||
+ if test "x$BDB_LIBS" = x; then
|
||||
+ AC_MSG_WARN(No db3 library found. Not building bdb backend.)
|
||||
+ else
|
||||
+ for dbheader in "db3/db.h db3.h"; do
|
||||
+ AC_CHECK_HEADERS($dbheader, [
|
||||
+ HAVE_BDBHEADER=yes
|
||||
+ break
|
||||
+ ], )
|
||||
+ done
|
||||
+ if test "x$HAVE_BDBHEADER" = x; then
|
||||
+ AC_MSG_ERROR(Found db3 lib but no db3 header)
|
||||
+ fi
|
||||
fi
|
||||
-done
|
||||
-
|
||||
-if test "x$BDB_LIBS" = x; then
|
||||
- AC_MSG_WARN(No db3 library found. Not building bdb backend.)
|
||||
-else
|
||||
- AC_CHECK_HEADERS(db3/db.h, , AC_MSG_ERROR([db3 library found but db3/db.h not found]))
|
||||
-fi
|
||||
+AC_ARG_ENABLE(db3,
|
||||
+ [ --enable-db3=[no/yes] build bdb backend],[
|
||||
+ AC_CHECK_LIB(db, db_env_create, BDB_LIBS=-ldb,
|
||||
+ AC_CHECK_LIB(db-3, db_env_create, BDB_LIBS=-ldb-3))
|
||||
+ if test "x$BDB_LIBS" = x; then
|
||||
+ AC_MSG_WARN(No db3 library found. Not building bdb backend.)
|
||||
+ fi
|
||||
+ ],)
|
||||
|
||||
|
14
devel/gconf/patches/patch-gconf_gconf-internals_c
Normal file
14
devel/gconf/patches/patch-gconf_gconf-internals_c
Normal file
@ -0,0 +1,14 @@
|
||||
$OpenBSD: patch-gconf_gconf-internals_c,v 1.1 2001/11/13 14:04:41 wilfried Exp $
|
||||
--- gconf/gconf-internals.c.orig Mon Oct 29 19:42:49 2001
|
||||
+++ gconf/gconf-internals.c Sun Nov 11 23:07:50 2001
|
||||
@@ -38,6 +38,10 @@
|
||||
#include <time.h>
|
||||
#include <math.h>
|
||||
|
||||
+#ifdef HAVE_SYS_SOCKET_H
|
||||
+# include <sys/socket.h>
|
||||
+#endif
|
||||
+
|
||||
#define g_utf8_skip gconf_g_utf8_skip
|
||||
|
||||
typedef void (* GSpawnChildSetupFunc) (gpointer user_data);
|
16
devel/gconf/patches/patch-gconf_gconftool_c
Normal file
16
devel/gconf/patches/patch-gconf_gconftool_c
Normal file
@ -0,0 +1,16 @@
|
||||
$OpenBSD: patch-gconf_gconftool_c,v 1.1 2001/11/13 14:04:41 wilfried Exp $
|
||||
--- gconf/gconftool.c.orig Sun Nov 11 23:50:31 2001
|
||||
+++ gconf/gconftool.c Sun Nov 11 23:56:28 2001
|
||||
@@ -22,9 +22,9 @@
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <popt.h>
|
||||
-#include <libxml/tree.h>
|
||||
-#include <libxml/parser.h>
|
||||
-#include <libxml/xmlmemory.h>
|
||||
+#include <gnome-xml/tree.h>
|
||||
+#include <gnome-xml/parser.h>
|
||||
+#include <gnome-xml/xmlmemory.h>
|
||||
#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
|
72
devel/gconf/patches/patch-ltmain_sh
Normal file
72
devel/gconf/patches/patch-ltmain_sh
Normal file
@ -0,0 +1,72 @@
|
||||
$OpenBSD: patch-ltmain_sh,v 1.1 2001/11/13 14:04:41 wilfried Exp $
|
||||
--- ltmain.sh.orig Mon Oct 29 19:55:11 2001
|
||||
+++ ltmain.sh Sun Nov 11 21:28:38 2001
|
||||
@@ -1031,6 +1031,17 @@ compiler."
|
||||
# These systems don't actually have a C library (as such)
|
||||
test "X$arg" = "X-lc" && continue
|
||||
;;
|
||||
+ *-*-openbsd*)
|
||||
+ # Do not include libc due to us having libc/libc_r.
|
||||
+ test "X$arg" = "X-lc" && continue
|
||||
+ ;;
|
||||
+ esac
|
||||
+ elif test "$arg" = "-lc_r"; then
|
||||
+ case "$host" in
|
||||
+ *-*-openbsd*)
|
||||
+ # Do not include libc_r directly, use -pthread flag.
|
||||
+ continue
|
||||
+ ;;
|
||||
esac
|
||||
fi
|
||||
deplibs="$deplibs $arg"
|
||||
@@ -2408,6 +2419,9 @@ compiler."
|
||||
*-*-netbsd*)
|
||||
# Don't link with libc until the a.out ld.so is fixed.
|
||||
;;
|
||||
+ *-*-openbsd*)
|
||||
+ # Do not include libc due to us having libc/libc_r.
|
||||
+ ;;
|
||||
*)
|
||||
# Add libc to deplibs on all other systems if necessary.
|
||||
if test "$build_libtool_need_lc" = "yes"; then
|
||||
@@ -4412,40 +4426,6 @@ relink_command=\"$relink_command\""
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = ":" && exit 0
|
||||
|
||||
- echo "----------------------------------------------------------------------"
|
||||
- echo "Libraries have been installed in:"
|
||||
- for libdir in $libdirs; do
|
||||
- echo " $libdir"
|
||||
- done
|
||||
- echo
|
||||
- echo "If you ever happen to want to link against installed libraries"
|
||||
- echo "in a given directory, LIBDIR, you must either use libtool, and"
|
||||
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
|
||||
- echo "flag during linking and do at least one of the following:"
|
||||
- if test -n "$shlibpath_var"; then
|
||||
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
|
||||
- echo " during execution"
|
||||
- fi
|
||||
- if test -n "$runpath_var"; then
|
||||
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
|
||||
- echo " during linking"
|
||||
- fi
|
||||
- if test -n "$hardcode_libdir_flag_spec"; then
|
||||
- libdir=LIBDIR
|
||||
- eval flag=\"$hardcode_libdir_flag_spec\"
|
||||
-
|
||||
- echo " - use the \`$flag' linker flag"
|
||||
- fi
|
||||
- if test -n "$admincmds"; then
|
||||
- echo " - have your system administrator run these commands:$admincmds"
|
||||
- fi
|
||||
- if test -f /etc/ld.so.conf; then
|
||||
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
|
||||
- fi
|
||||
- echo
|
||||
- echo "See any operating system documentation about shared libraries for"
|
||||
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
|
||||
- echo "----------------------------------------------------------------------"
|
||||
exit 0
|
||||
;;
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-po_Makefile_in_in,v 1.1 2001/09/18 14:22:14 naddy Exp $
|
||||
$OpenBSD: patch-po_Makefile_in_in,v 1.2 2001/11/13 14:04:41 wilfried Exp $
|
||||
--- po/Makefile.in.in.orig Fri Sep 15 06:30:24 2000
|
||||
+++ po/Makefile.in.in Tue Sep 18 15:41:36 2001
|
||||
@@ -24,6 +24,8 @@ gnulocaledir = $(prefix)/share/locale
|
||||
|
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $OpenBSD: INSTALL,v 1.2 2001/09/20 19:23:32 naddy Exp $
|
||||
# $OpenBSD: INSTALL,v 1.3 2001/11/13 14:04:41 wilfried Exp $
|
||||
|
||||
set -e
|
||||
PATH=/bin:/usr/bin:/sbin:/usr/sbin
|
||||
@ -16,6 +16,8 @@ do_post() {
|
||||
|
||||
install -d ${DEST_PFX}/gconf/1
|
||||
install -d ${DEST_PFX}/gconf/schemas
|
||||
install -d ${DEST_PFX}/gconf/gconf.xml.mandatory
|
||||
install -d ${DEST_PFX}/gconf/gconf.xml.defaults
|
||||
|
||||
# install or take note of existing config files
|
||||
for f in \
|
||||
|
4
devel/gconf/pkg/PFRAG.db3
Normal file
4
devel/gconf/pkg/PFRAG.db3
Normal file
@ -0,0 +1,4 @@
|
||||
@comment $OpenBSD: PFRAG.db3,v 1.1 2001/11/13 14:04:41 wilfried Exp $
|
||||
lib/GConf/1/libgconfbackend-bdb.a
|
||||
lib/GConf/1/libgconfbackend-bdb.la
|
||||
%%SHARED-db3%%
|
2
devel/gconf/pkg/PFRAG.db3.shared
Normal file
2
devel/gconf/pkg/PFRAG.db3.shared
Normal file
@ -0,0 +1,2 @@
|
||||
@comment $OpenBSD: PFRAG.db3.shared,v 1.1 2001/11/13 14:04:41 wilfried Exp $
|
||||
lib/GConf/1/libgconfbackend-bdb.so
|
@ -1,5 +1,5 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.2 2001/09/18 17:27:44 naddy Exp $
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.3 2001/11/13 14:04:41 wilfried Exp $
|
||||
lib/GConf/1/libgconfbackend-xml.so
|
||||
lib/libgconf-1.so.1.0
|
||||
lib/libgconf-1.so.1.2
|
||||
lib/libgconf-gtk-1.so.1.0
|
||||
DYNLIBDIR(%B)
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.3 2001/09/20 19:23:32 naddy Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.4 2001/11/13 14:04:41 wilfried Exp $
|
||||
bin/gconf-config
|
||||
bin/gconf-config-1
|
||||
bin/gconfd-1
|
||||
@ -19,6 +19,8 @@ lib/libgconf-1.a
|
||||
lib/libgconf-1.la
|
||||
lib/libgconf-gtk-1.a
|
||||
lib/libgconf-gtk-1.la
|
||||
%%SHARED%%
|
||||
%%db3%%
|
||||
lib/pkgconfig/gconf.pc
|
||||
lib/pkgconfig/gconfgtk.pc
|
||||
share/aclocal/gconf-1.m4
|
||||
@ -34,12 +36,16 @@ 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
|
||||
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
|
||||
@ -48,10 +54,8 @@ share/locale/sv/LC_MESSAGES/GConf.mo
|
||||
share/locale/tr/LC_MESSAGES/GConf.mo
|
||||
share/locale/uk/LC_MESSAGES/GConf.mo
|
||||
share/locale/zh_CN.GB2312/LC_MESSAGES/GConf.mo
|
||||
share/oaf/gconfd-1.oafinfo
|
||||
%%SHARED%%
|
||||
@dirrm share/examples/gconf/gconf/1
|
||||
@dirrm share/examples/gconf/gconf/schemas
|
||||
@dirrm share/examples/gconf/gconf/1
|
||||
@dirrm share/examples/gconf/gconf
|
||||
@dirrm share/examples/gconf
|
||||
@dirrm lib/GConf/1
|
||||
|
Loading…
x
Reference in New Issue
Block a user