Remove db3 dependency. From maintainer Nils Nordman <nino@nforced.com>.
This commit is contained in:
naddy
parent
11d4c5b370
commit
7286abb806
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.11 2001/10/17 13:17:00 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.12 2001/10/29 17:45:44 naddy Exp $
|
||||
|
||||
COMMENT= "libraries for the GNOME project"
|
||||
V= 1.2.13
|
||||
@ -17,7 +17,6 @@ PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltconfi
|
||||
|
||||
LIB_DEPENDS= Imlib,gdk_imlib.19::graphics/imlib \
|
||||
esd.2::audio/esound \
|
||||
db::databases/db \
|
||||
ORBit.5,ORBitutil.5,IIOP.5,ORBitCosNaming.5::devel/ORBit
|
||||
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
@ -29,17 +28,17 @@ USE_X11= Yes
|
||||
CONFIGURE_STYLE= autoconf
|
||||
|
||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||
CONFIGURE_ARGS+= --enable-prefer-db1
|
||||
CONFIGURE_ARGS+= --with-kde-datadir=${LOCALBASE}/share
|
||||
CONFIGURE_ARGS+= --localstatedir=/var/run
|
||||
CONFIGURE_ARGS+= --disable-test-gnome
|
||||
CONFIGURE_ARGS+= --disable-gtk-doc
|
||||
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib" \
|
||||
DB_LIB="-ldb"
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
|
||||
post-install:
|
||||
@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gnome-libs; \
|
||||
cp -rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/gnome-libs/
|
||||
cp -Rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/gnome-libs/
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,54 +1,18 @@
|
||||
$OpenBSD: patch-configure_in,v 1.1 2001/09/17 23:01:00 naddy Exp $
|
||||
--- configure.in.orig Mon Sep 17 23:42:00 2001
|
||||
+++ configure.in Mon Sep 17 23:43:21 2001
|
||||
@@ -305,46 +305,6 @@ AC_CHECK_HEADERS(utime.h)
|
||||
AC_FUNC_MMAP
|
||||
AC_CHECK_TYPE(umode_t, int)
|
||||
$OpenBSD: patch-configure_in,v 1.2 2001/10/29 17:45:44 naddy Exp $
|
||||
--- configure.in.orig Fri Mar 16 20:45:53 2001
|
||||
+++ configure.in Fri Oct 26 21:00:33 2001
|
||||
@@ -332,8 +332,8 @@ fi
|
||||
|
||||
-AC_ARG_ENABLE(prefer-db1, [ --enable-prefer-db1 Prefer Berkeley DB 1.x] [default=no]],[prefer_db1="$enableval"],[prefer_db1=no])
|
||||
-dnl
|
||||
-dnl Check for db stuff (gnome-metadata)
|
||||
-dnl
|
||||
-DB_LIB=
|
||||
-AC_CHECK_FUNC(dbopen, [],
|
||||
-if test "$prefer_db1" = "yes"; then
|
||||
- AC_CHECK_LIB(db1, dbopen, DB_LIB="-ldb1",
|
||||
- AC_CHECK_LIB(db, dbopen, DB_LIB="-ldb",
|
||||
- AC_CHECK_LIB(db-3, __db185_open, DB_LIB="-ldb-3",
|
||||
- AC_MSG_ERROR([Your db library is missing db 1.85 compatibility mode])
|
||||
- )
|
||||
- )
|
||||
- )
|
||||
-else
|
||||
- AC_CHECK_LIB(db, dbopen, DB_LIB="-ldb",
|
||||
- AC_CHECK_LIB(db1, dbopen, DB_LIB="-ldb1",
|
||||
- AC_CHECK_LIB(db-3, __db185_open, DB_LIB="-ldb-3",
|
||||
- AC_MSG_ERROR([Your db library is missing db 1.85 compatibility mode])
|
||||
- )
|
||||
- )
|
||||
- )
|
||||
-fi
|
||||
-)
|
||||
-
|
||||
-dnl look for db headers
|
||||
-if test "$prefer_db1" = "yes"; then
|
||||
dnl look for db headers
|
||||
if test "$prefer_db1" = "yes"; then
|
||||
- AC_CHECK_HEADERS(db_185.h db1/db.h)
|
||||
- if test "$ac_cv_header_db_185_h$ac_cv_header_db1_db_h" = nono; then
|
||||
- AC_MSG_ERROR([Berkeley db library required for Gnome])
|
||||
- fi
|
||||
- AC_DEFINE(PREFER_DB1)
|
||||
-else
|
||||
- AC_CHECK_HEADERS(db.h db_185.h db1/db.h)
|
||||
-
|
||||
- if test "$ac_cv_header_db_h$ac_cv_header_db_185_h$ac_cv_header_db1_db_h" = nonono; then
|
||||
- AC_MSG_ERROR([Berkeley db library required for Gnome])
|
||||
- fi
|
||||
-fi
|
||||
-
|
||||
dnl
|
||||
dnl This is needed for the gnome-moz-remote program. It doesn't use GDK,
|
||||
dnl since some of the code in it was written before GDK existed.
|
||||
@@ -431,7 +391,7 @@ else
|
||||
+ AC_CHECK_HEADERS(db.h db1/db.h)
|
||||
+ if test "$ac_cv_header_db_h$ac_cv_header_db1_db_h" = nono; then
|
||||
AC_MSG_ERROR([Berkeley db library required for Gnome])
|
||||
fi
|
||||
AC_DEFINE(PREFER_DB1)
|
||||
@@ -431,7 +431,7 @@ else
|
||||
kde_datadir=$with_kde_datadir
|
||||
fi
|
||||
|
||||
|
||||
@ -1,36 +1,17 @@
|
||||
$OpenBSD: patch-libgnome_gnome-dump_c,v 1.1.1.1 2001/09/13 20:27:19 todd Exp $
|
||||
--- libgnome/gnome-dump.c.orig Thu Sep 6 23:03:20 2001
|
||||
+++ libgnome/gnome-dump.c Thu Sep 6 23:04:17 2001
|
||||
@@ -25,31 +25,7 @@
|
||||
#endif
|
||||
#include <sys/types.h>
|
||||
|
||||
-#ifdef PREFER_DB1
|
||||
-#ifdef HAVE_DB1_DB_H
|
||||
-# include <db1/db.h>
|
||||
-#else
|
||||
$OpenBSD: patch-libgnome_gnome-dump_c,v 1.2 2001/10/29 17:45:44 naddy Exp $
|
||||
--- libgnome/gnome-dump.c.orig Fri Oct 26 20:01:24 2001
|
||||
+++ libgnome/gnome-dump.c Fri Oct 26 20:05:06 2001
|
||||
@@ -29,10 +29,10 @@
|
||||
#ifdef HAVE_DB1_DB_H
|
||||
# include <db1/db.h>
|
||||
#else
|
||||
-# ifdef HAVE_DB_185_H
|
||||
-# include <db_185.h>
|
||||
-# else
|
||||
-# include <db.h>
|
||||
-# endif
|
||||
-#endif
|
||||
-
|
||||
-#else
|
||||
-
|
||||
-#ifdef HAVE_DB_185_H
|
||||
-# include <db_185.h>
|
||||
-#else
|
||||
-# ifdef HAVE_DB_H
|
||||
-# include <db.h>
|
||||
-# else
|
||||
-# include <db1/db.h>
|
||||
-# endif
|
||||
-#endif
|
||||
-
|
||||
-#endif
|
||||
-
|
||||
+#include <db_185.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
+# ifdef HAVE_DB_H
|
||||
# include <db.h>
|
||||
+# else
|
||||
+# include <db_185.h>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
||||
@ -1,33 +1,17 @@
|
||||
$OpenBSD: patch-libgnome_gnome-metadata_c,v 1.1.1.1 2001/09/13 20:27:19 todd Exp $
|
||||
--- libgnome/gnome-metadata.c.orig Thu Sep 6 23:03:13 2001
|
||||
+++ libgnome/gnome-metadata.c Thu Sep 6 23:03:49 2001
|
||||
@@ -51,28 +51,7 @@ char *alloca ();
|
||||
#include <dirent.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
-
|
||||
-#ifdef PREFER_DB1
|
||||
-#ifdef HAVE_DB1_DB_H
|
||||
-# include <db1/db.h>
|
||||
-#else
|
||||
$OpenBSD: patch-libgnome_gnome-metadata_c,v 1.2 2001/10/29 17:45:44 naddy Exp $
|
||||
--- libgnome/gnome-metadata.c.orig Fri Oct 26 20:01:32 2001
|
||||
+++ libgnome/gnome-metadata.c Fri Oct 26 20:05:46 2001
|
||||
@@ -56,10 +56,10 @@ char *alloca ();
|
||||
#ifdef HAVE_DB1_DB_H
|
||||
# include <db1/db.h>
|
||||
#else
|
||||
-# ifdef HAVE_DB_185_H
|
||||
-# include <db_185.h>
|
||||
-# else
|
||||
-# include <db.h>
|
||||
-# endif
|
||||
-#endif
|
||||
-#else
|
||||
-#ifdef HAVE_DB_185_H
|
||||
-# include <db_185.h>
|
||||
-#else
|
||||
-# ifdef HAVE_DB_H
|
||||
-# include <db.h>
|
||||
-# else
|
||||
-# include <db1/db.h>
|
||||
-# endif
|
||||
-#endif
|
||||
-#endif
|
||||
+#include <db_185.h>
|
||||
|
||||
#include "libgnomeP.h"
|
||||
#include "gnome-mime.h"
|
||||
+# ifdef HAVE_DB_H
|
||||
# include <db.h>
|
||||
+# else
|
||||
+# include <db_185.h>
|
||||
# endif
|
||||
#endif
|
||||
#else
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.10 2001/10/24 12:50:10 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.11 2001/10/29 17:45:44 naddy Exp $
|
||||
|
||||
COMMENT= "GNOME Virtual File System"
|
||||
V= 1.0.1
|
||||
@ -17,7 +17,7 @@ PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfi
|
||||
|
||||
LIB_DEPENDS= gnome.36::x11/gnome/libs \
|
||||
xml.9::textproc/libxml1 \
|
||||
gconf-1,gconf-gtk-1::devel/gconf,db3 \
|
||||
gconf-1,gconf-gtk-1::devel/gconf \
|
||||
cdda_paranoia,cdda_interface::audio/cdparanoia \
|
||||
bz2::archivers/bzip2 \
|
||||
gthread::devel/glib
|
||||
|
||||
Loading…
Reference in New Issue
Block a user