diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-03-12 10:39:38 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-03-12 10:39:38 +0000 |
| commit | 190418a078b1eb7ea3c5d38a08bdab3cbd422086 (patch) | |
| tree | bb336ccecde7052d26d3d8d8c97238744a373aad /databases | |
| parent | 6b0c40606cac591d75b88d05c7276bd16c369035 (diff) | |
| download | ports-190418a078b1eb7ea3c5d38a08bdab3cbd422086.tar.gz ports-190418a078b1eb7ea3c5d38a08bdab3cbd422086.zip | |
Notes
Diffstat (limited to 'databases')
65 files changed, 1287 insertions, 987 deletions
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index e3265639e59b..f7a5fde2ecf1 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -6,38 +6,50 @@ # PORTNAME= evolution-data-server -PORTVERSION= 1.0.4 +PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= The data backends for the Evolution integrated mail/PIM suite -LIB_DEPENDS= soup-2.2.7:${PORTSDIR}/devel/libsoup +LIB_DEPENDS= soup-2.2.7:${PORTSDIR}/devel/libsoup \ + nss3.1:${PORTSDIR}/security/nss USE_BZIP2= yes USE_GMAKE= yes USE_BISON= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnometarget libgnome +USE_GNOME= gnomeprefix gnomehack intlhack gnometarget libgnomeui USE_REINPLACE= yes USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --enable-static -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -PLIST_SUB= VERSION="1.0" EVO_VERSION="1.0" +CONFIGURE_ARGS= --enable-static \ + --enable-nss=yes \ + --with-nss-includes=${LOCALBASE}/include/nss/nss \ + --with-nss-libs=${LOCALBASE}/lib \ + --with-nspr-includes=${LOCALBASE}/include/nspr \ + --with-nspr-libs=${LOCALBASE}/lib \ + --with-krb5=/usr +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" + +PLIST_SUB= VERSION="1.2" EVO_VERSION="1.2" + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 600012 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libedataserver_e-msgport.c +.endif .if !defined(WITHOUT_LDAP) USE_OPENLDAP= yes CONFIGURE_ARGS+=--with-openldap=yes -PLIST_SUB+= LDAP="" .else CONFIGURE_ARGS+=--with-openldap=no -PLIST_SUB+= LDAP="@comment " .endif pre-everything:: @@ -46,4 +58,4 @@ pre-everything:: @${ECHO_MSG} " WITHOUT_LDAP Disable LDAP support" @${ECHO_MSG} "" -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo index fc9fd81d63a0..6ac9d80baf96 100644 --- a/databases/evolution-data-server/distinfo +++ b/databases/evolution-data-server/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/evolution-data-server-1.0.4.tar.bz2) = 5c9c6cac9b65d392e50ea3214022cb5b -SIZE (gnome2/evolution-data-server-1.0.4.tar.bz2) = 4792220 +MD5 (gnome2/evolution-data-server-1.2.0.tar.bz2) = 9a34499dc8e65af768ab1582803015ef +SIZE (gnome2/evolution-data-server-1.2.0.tar.bz2) = 7427456 diff --git a/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c b/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c new file mode 100644 index 000000000000..7383f939f4cd --- /dev/null +++ b/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c @@ -0,0 +1,52 @@ +--- libedataserver/e-msgport.c.orig Thu Dec 2 22:33:06 2004 ++++ libedataserver/e-msgport.c Wed Mar 9 14:31:46 2005 +@@ -921,9 +921,18 @@ + void e_thread_put(EThread *e, EMsg *msg) + { + pthread_t id; ++ pthread_attr_t attr; + EMsg *dmsg = NULL; + + pthread_mutex_lock(&e->mutex); ++ pthread_attr_init(&attr); ++ /* Give us a 1 MB thread stacksize on 32-bit architectures, and ++ * a 2 MB thread stacksize on 64-bit architectures. */ ++ if (sizeof (void *) == 8) { ++ pthread_attr_setstacksize(&attr, 0x200000); ++ } else { ++ pthread_attr_setstacksize(&attr, 0x100000); ++ } + + /* the caller forgot to tell us what to do, well, we can't do anything can we */ + if (e->received == NULL) { +@@ -962,13 +971,14 @@ + e_msgport_put(e->server_port, msg); + if (e->waiting == 0 + && g_list_length(e->id_list) < e->queue_limit +- && pthread_create(&id, NULL, thread_dispatch, e) == 0) { ++ && pthread_create(&id, &attr, thread_dispatch, e) == 0) { + struct _thread_info *info = g_malloc0(sizeof(*info)); + t(printf("created NEW thread %ld\n", id)); + info->id = id; + info->busy = TRUE; + e->id_list = g_list_append(e->id_list, info); + } ++ pthread_attr_destroy(&attr); + pthread_mutex_unlock(&e->mutex); + return; + } +@@ -977,12 +987,13 @@ + if (e->id == E_THREAD_NONE) { + int err; + +- if ((err = pthread_create(&e->id, NULL, thread_dispatch, e)) != 0) { ++ if ((err = pthread_create(&e->id, &attr, thread_dispatch, e)) != 0) { + g_warning("Could not create dispatcher thread, message queued?: %s", strerror(err)); + e->id = E_THREAD_NONE; + } + } + ++ pthread_attr_destroy(&attr); + pthread_mutex_unlock(&e->mutex); + + if (dmsg) { diff --git a/databases/evolution-data-server/files/patch-calendar_libical_configure b/databases/evolution-data-server/files/patch-calendar_libical_configure new file mode 100644 index 000000000000..19028e5d49fc --- /dev/null +++ b/databases/evolution-data-server/files/patch-calendar_libical_configure @@ -0,0 +1,11 @@ +--- calendar/libical/configure.orig Sun Dec 26 16:54:57 2004 ++++ calendar/libical/configure Sun Dec 26 16:55:23 2004 +@@ -19736,7 +19736,7 @@ + + + +-if test "x$USE_MAINTAINER_MODE" == xyes; then ++if test "x$USE_MAINTAINER_MODE" = xyes; then + DEV="yes" + echo "$as_me:$LINENO: result: Setting up for development: -Wall, flex, bison" >&5 + echo "${ECHO_T}Setting up for development: -Wall, flex, bison" >&6 diff --git a/databases/evolution-data-server/files/patch-camel_Makefile.in b/databases/evolution-data-server/files/patch-camel_Makefile.in new file mode 100644 index 000000000000..dfd4f33f61e2 --- /dev/null +++ b/databases/evolution-data-server/files/patch-camel_Makefile.in @@ -0,0 +1,11 @@ +--- camel/Makefile.in.orig Tue Dec 21 13:46:00 2004 ++++ camel/Makefile.in Tue Dec 21 13:46:01 2004 +@@ -299,7 +299,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + +-SUBDIRS = . providers tests ++SUBDIRS = . providers + + pkgconfigdir = $(prefix)/libdata/pkgconfig + pkgconfig_in_files = camel.pc.in camel-provider.pc.in diff --git a/databases/evolution-data-server/files/patch-camel_camel-net-utils.c b/databases/evolution-data-server/files/patch-camel_camel-net-utils.c new file mode 100644 index 000000000000..17bddca39e31 --- /dev/null +++ b/databases/evolution-data-server/files/patch-camel_camel-net-utils.c @@ -0,0 +1,24 @@ +--- camel/camel-net-utils.c.orig Tue Dec 21 13:38:52 2004 ++++ camel/camel-net-utils.c Tue Dec 21 13:40:34 2004 +@@ -143,12 +143,21 @@ + case EAI_SERVICE: + return NO_DATA; + break; ++#ifdef EAI_ADDRFAMILY + case EAI_ADDRFAMILY: + return NO_ADDRESS; + break; ++#endif ++#if defined(EAI_NODATA) && EAI_NODATA != EAI_NONAME + case EAI_NODATA: + return NO_DATA; + break; ++#endif ++#ifdef EAI_NOFAMILY ++ case EAI_NOFAMILY: ++ return NO_ADDRESS; ++ break; ++#endif + case EAI_MEMORY: + return ENOMEM; + break; diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure index 4959297daf85..7bc7a9cdfb65 100644 --- a/databases/evolution-data-server/files/patch-configure +++ b/databases/evolution-data-server/files/patch-configure @@ -1,6 +1,36 @@ ---- configure.orig Thu Jan 29 16:02:10 2004 -+++ configure Thu Jan 29 16:02:39 2004 -@@ -23783,7 +23783,7 @@ +--- configure.orig Tue Dec 21 13:46:01 2004 ++++ configure Tue Dec 21 13:50:02 2004 +@@ -7894,10 +7894,10 @@ + Example: --with-nspr-libs=/usr/lib" >&2;} + { (exit 1); exit 1; }; } + else +- nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" ++ nsprlibs="$with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" + fi + else +- nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" ++ nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" + fi + + echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5 +@@ -10011,6 +10011,7 @@ + #include <sys/socket.h> + #include <netinet/in.h> + #include <netdb.h> ++ #include <stdio.h> + + + int +@@ -10777,7 +10778,7 @@ + LDFLAGS_save="$LDFLAGS" + + mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" +- heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi" ++ heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt" + echo "$as_me:$LINENO: checking for Kerberos 5" >&5 + echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6 + if test "${ac_cv_lib_kerberos5+set}" = set; then +@@ -29833,7 +29834,7 @@ idldir="$datadir/idl/evolution-data-server-$BASE_VERSION" @@ -8,4 +38,4 @@ +serverdir="$prefix/libdata/bonobo/servers" - + extensiondir='${privlibdir}'/extensions diff --git a/databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c b/databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c new file mode 100644 index 000000000000..62532da02471 --- /dev/null +++ b/databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c @@ -0,0 +1,11 @@ +--- libedataserverui/e-source-option-menu.c.orig Tue Nov 23 13:50:14 2004 ++++ libedataserverui/e-source-option-menu.c Tue Nov 23 13:50:33 2004 +@@ -24,6 +24,8 @@ + #include <config.h> + #endif + ++#include <sys/types.h> ++ + #include <gtk/gtkmenu.h> + #include <gtk/gtkmenuitem.h> + diff --git a/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-connection.c b/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-connection.c new file mode 100644 index 000000000000..576ecea6ae3c --- /dev/null +++ b/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-connection.c @@ -0,0 +1,12 @@ +--- servers/groupwise/e-gw-connection.c.orig Tue Mar 8 03:50:29 2005 ++++ servers/groupwise/e-gw-connection.c Tue Mar 8 03:50:40 2005 +@@ -1764,8 +1764,8 @@ + EGwConnectionPrivate *priv; + SoupSoapParameter *param, *subparam, *second_level_child; + char *id, *name; +- g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT); + static GStaticMutex connecting = G_STATIC_MUTEX_INIT; ++ g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT); + + priv = cnc->priv; + g_static_mutex_lock (&connecting); diff --git a/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-item.c b/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-item.c new file mode 100644 index 000000000000..c865775dae15 --- /dev/null +++ b/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-item.c @@ -0,0 +1,22 @@ +--- servers/groupwise/e-gw-item.c.orig Tue Jan 25 20:31:45 2005 ++++ servers/groupwise/e-gw-item.c Tue Jan 25 20:32:28 2005 +@@ -2604,8 +2604,8 @@ + + /*attachments*/ + if (priv->attach_list) { +- soup_soap_message_start_element (msg, "attachments", NULL, NULL) ; + GSList *al ; ++ soup_soap_message_start_element (msg, "attachments", NULL, NULL) ; + for (al = priv->attach_list ; al != NULL ; al = al->next) { + EGwItemAttachment *attachment = (EGwItemAttachment *)al->data ; + add_attachment_to_soap_message (attachment, msg) ; +@@ -2669,8 +2669,8 @@ + + /*attachments*/ + if (priv->attach_list) { +- soup_soap_message_start_element (msg, "attachments", NULL, NULL) ; + GSList *al ; ++ soup_soap_message_start_element (msg, "attachments", NULL, NULL) ; + for (al = priv->attach_list ; al != NULL ; al = al->next) { + EGwItemAttachment *attachment = (EGwItemAttachment *)al->data ; + add_attachment_to_soap_message (attachment, msg) ; diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist index 39bfa12d14fc..fdb7596355ec 100644 --- a/databases/evolution-data-server/pkg-plist +++ b/databases/evolution-data-server/pkg-plist @@ -1,8 +1,119 @@ +include/evolution-data-server-%%VERSION%%/camel/broken-date-parser.h +include/evolution-data-server-%%VERSION%%/camel/camel-address.h +include/evolution-data-server-%%VERSION%%/camel/camel-arg.h +include/evolution-data-server-%%VERSION%%/camel/camel-block-file.h +include/evolution-data-server-%%VERSION%%/camel/camel-certdb.h +include/evolution-data-server-%%VERSION%%/camel/camel-charset-map.h +include/evolution-data-server-%%VERSION%%/camel/camel-cipher-context.h +include/evolution-data-server-%%VERSION%%/camel/camel-data-cache.h +include/evolution-data-server-%%VERSION%%/camel/camel-data-wrapper.h +include/evolution-data-server-%%VERSION%%/camel/camel-debug.h +include/evolution-data-server-%%VERSION%%/camel/camel-digest-folder.h +include/evolution-data-server-%%VERSION%%/camel/camel-digest-store.h +include/evolution-data-server-%%VERSION%%/camel/camel-digest-summary.h +include/evolution-data-server-%%VERSION%%/camel/camel-disco-diary.h +include/evolution-data-server-%%VERSION%%/camel/camel-disco-folder.h +include/evolution-data-server-%%VERSION%%/camel/camel-disco-store.h +include/evolution-data-server-%%VERSION%%/camel/camel-exception-list.def +include/evolution-data-server-%%VERSION%%/camel/camel-exception.h +include/evolution-data-server-%%VERSION%%/camel/camel-file-utils.h +include/evolution-data-server-%%VERSION%%/camel/camel-filter-driver.h +include/evolution-data-server-%%VERSION%%/camel/camel-filter-search.h +include/evolution-data-server-%%VERSION%%/camel/camel-folder-search.h +include/evolution-data-server-%%VERSION%%/camel/camel-folder-summary.h +include/evolution-data-server-%%VERSION%%/camel/camel-folder-thread.h +include/evolution-data-server-%%VERSION%%/camel/camel-folder.h +include/evolution-data-server-%%VERSION%%/camel/camel-gpg-context.h +include/evolution-data-server-%%VERSION%%/camel/camel-http-stream.h +include/evolution-data-server-%%VERSION%%/camel/camel-i18n.h +include/evolution-data-server-%%VERSION%%/camel/camel-index.h +include/evolution-data-server-%%VERSION%%/camel/camel-internet-address.h +include/evolution-data-server-%%VERSION%%/camel/camel-junk-plugin.h +include/evolution-data-server-%%VERSION%%/camel/camel-list-utils.h +include/evolution-data-server-%%VERSION%%/camel/camel-lock-client.h +include/evolution-data-server-%%VERSION%%/camel/camel-lock.h +include/evolution-data-server-%%VERSION%%/camel/camel-nntp-address.h +include/evolution-data-server-%%VERSION%%/camel/camel-medium.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-basic.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-bestenc.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-canon.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-charset.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-crlf.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-enriched.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-from.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-gzip.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-html.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-index.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-linewrap.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-save.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-tohtml.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-windows.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-yenc.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-message.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-parser.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-part-utils.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-part.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-utils.h +include/evolution-data-server-%%VERSION%%/camel/camel-movemail.h +include/evolution-data-server-%%VERSION%%/camel/camel-multipart-encrypted.h +include/evolution-data-server-%%VERSION%%/camel/camel-multipart-signed.h +include/evolution-data-server-%%VERSION%%/camel/camel-multipart.h +include/evolution-data-server-%%VERSION%%/camel/camel-net-utils.h +include/evolution-data-server-%%VERSION%%/camel/camel-object.h +include/evolution-data-server-%%VERSION%%/camel/camel-offline-folder.h +include/evolution-data-server-%%VERSION%%/camel/camel-offline-journal.h +include/evolution-data-server-%%VERSION%%/camel/camel-offline-store.h +include/evolution-data-server-%%VERSION%%/camel/camel-operation.h +include/evolution-data-server-%%VERSION%%/camel/camel-partition-table.h +include/evolution-data-server-%%VERSION%%/camel/camel-provider.h +include/evolution-data-server-%%VERSION%%/camel/camel-sasl-anonymous.h +include/evolution-data-server-%%VERSION%%/camel/camel-sasl-cram-md5.h +include/evolution-data-server-%%VERSION%%/camel/camel-sasl-digest-md5.h +include/evolution-data-server-%%VERSION%%/camel/camel-sasl-gssapi.h +include/evolution-data-server-%%VERSION%%/camel/camel-sasl-kerberos4.h +include/evolution-data-server-%%VERSION%%/camel/camel-sasl-login.h +include/evolution-data-server-%%VERSION%%/camel/camel-sasl-ntlm.h +include/evolution-data-server-%%VERSION%%/camel/camel-sasl-plain.h +include/evolution-data-server-%%VERSION%%/camel/camel-sasl-popb4smtp.h +include/evolution-data-server-%%VERSION%%/camel/camel-sasl.h +include/evolution-data-server-%%VERSION%%/camel/camel-search-private.h +include/evolution-data-server-%%VERSION%%/camel/camel-seekable-stream.h +include/evolution-data-server-%%VERSION%%/camel/camel-seekable-substream.h +include/evolution-data-server-%%VERSION%%/camel/camel-service.h +include/evolution-data-server-%%VERSION%%/camel/camel-session.h +include/evolution-data-server-%%VERSION%%/camel/camel-smime-context.h +include/evolution-data-server-%%VERSION%%/camel/camel-store-summary.h +include/evolution-data-server-%%VERSION%%/camel/camel-store.h +include/evolution-data-server-%%VERSION%%/camel/camel-stream-buffer.h +include/evolution-data-server-%%VERSION%%/camel/camel-stream-filter.h +include/evolution-data-server-%%VERSION%%/camel/camel-stream-fs.h +include/evolution-data-server-%%VERSION%%/camel/camel-stream-mem.h +include/evolution-data-server-%%VERSION%%/camel/camel-stream-null.h +include/evolution-data-server-%%VERSION%%/camel/camel-stream-process.h +include/evolution-data-server-%%VERSION%%/camel/camel-stream.h +include/evolution-data-server-%%VERSION%%/camel/camel-string-utils.h +include/evolution-data-server-%%VERSION%%/camel/camel-tcp-stream-raw.h +include/evolution-data-server-%%VERSION%%/camel/camel-tcp-stream-ssl.h +include/evolution-data-server-%%VERSION%%/camel/camel-tcp-stream.h +include/evolution-data-server-%%VERSION%%/camel/camel-text-index.h +include/evolution-data-server-%%VERSION%%/camel/camel-transport.h +include/evolution-data-server-%%VERSION%%/camel/camel-types.h +include/evolution-data-server-%%VERSION%%/camel/camel-uid-cache.h +include/evolution-data-server-%%VERSION%%/camel/camel-url-scanner.h +include/evolution-data-server-%%VERSION%%/camel/camel-url.h +include/evolution-data-server-%%VERSION%%/camel/camel-utf8.h +include/evolution-data-server-%%VERSION%%/camel/camel-vee-folder.h +include/evolution-data-server-%%VERSION%%/camel/camel-vee-store.h +include/evolution-data-server-%%VERSION%%/camel/camel-vee-summary.h +include/evolution-data-server-%%VERSION%%/camel/camel-vtrash-folder.h +include/evolution-data-server-%%VERSION%%/camel/camel.h include/evolution-data-server-%%VERSION%%/groupwise/e-gw-connection.h include/evolution-data-server-%%VERSION%%/groupwise/e-gw-container.h include/evolution-data-server-%%VERSION%%/groupwise/e-gw-filter.h include/evolution-data-server-%%VERSION%%/groupwise/e-gw-item.h include/evolution-data-server-%%VERSION%%/groupwise/e-gw-message.h +include/evolution-data-server-%%VERSION%%/groupwise/e-gw-sendoptions.h include/evolution-data-server-%%VERSION%%/libebook/Evolution-DataServer-Addressbook.h include/evolution-data-server-%%VERSION%%/libebook/e-address-western.h include/evolution-data-server-%%VERSION%%/libebook/e-book-listener.h @@ -12,6 +123,7 @@ include/evolution-data-server-%%VERSION%%/libebook/e-book-view-listener.h include/evolution-data-server-%%VERSION%%/libebook/e-book-view.h include/evolution-data-server-%%VERSION%%/libebook/e-book.h include/evolution-data-server-%%VERSION%%/libebook/e-contact.h +include/evolution-data-server-%%VERSION%%/libebook/e-destination.h include/evolution-data-server-%%VERSION%%/libebook/e-name-western-tables.h include/evolution-data-server-%%VERSION%%/libebook/e-name-western.h include/evolution-data-server-%%VERSION%%/libebook/e-vcard.h @@ -26,6 +138,8 @@ include/evolution-data-server-%%VERSION%%/libecal/e-cal-view-listener.h include/evolution-data-server-%%VERSION%%/libecal/e-cal-view.h include/evolution-data-server-%%VERSION%%/libecal/e-cal.h include/evolution-data-server-%%VERSION%%/libedata-book/Evolution-DataServer-Addressbook.h +include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-cache.h +include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-factory.h include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-sexp.h include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-summary.h include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-sync.h @@ -36,6 +150,7 @@ include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book-view.h include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book.h include/evolution-data-server-%%VERSION%%/libedata-cal/Evolution-DataServer-Calendar.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-cache.h +include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-factory.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sexp.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sync.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-util.h @@ -46,23 +161,42 @@ include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal-view.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal.h include/evolution-data-server-%%VERSION%%/libedataserver/e-account-list.h include/evolution-data-server-%%VERSION%%/libedataserver/e-account.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-categories.h include/evolution-data-server-%%VERSION%%/libedataserver/e-component-listener.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-data-server-module.h include/evolution-data-server-%%VERSION%%/libedataserver/e-db3-utils.h include/evolution-data-server-%%VERSION%%/libedataserver/e-dbhash.h include/evolution-data-server-%%VERSION%%/libedataserver/e-file-cache.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-iconv.h include/evolution-data-server-%%VERSION%%/libedataserver/e-iterator.h include/evolution-data-server-%%VERSION%%/libedataserver/e-list-iterator.h include/evolution-data-server-%%VERSION%%/libedataserver/e-list.h include/evolution-data-server-%%VERSION%%/libedataserver/e-memory.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-msgport.h include/evolution-data-server-%%VERSION%%/libedataserver/e-sexp.h include/evolution-data-server-%%VERSION%%/libedataserver/e-source-group.h include/evolution-data-server-%%VERSION%%/libedataserver/e-source-list.h include/evolution-data-server-%%VERSION%%/libedataserver/e-source.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-time-utils.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-trie.h include/evolution-data-server-%%VERSION%%/libedataserver/e-uid.h include/evolution-data-server-%%VERSION%%/libedataserver/e-url.h include/evolution-data-server-%%VERSION%%/libedataserver/e-util.h include/evolution-data-server-%%VERSION%%/libedataserver/e-xml-hash-utils.h include/evolution-data-server-%%VERSION%%/libedataserver/md5-utils.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-book-auth-util.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-categories-dialog.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-contact-store.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-destination-store.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-dialog.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-entry.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-model.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-passwords.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-option-menu.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector-dialog.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-tree-model-generator.h include/evolution-data-server-%%VERSION%%/libical/ical.h include/evolution-data-server-%%VERSION%%/libical/icalarray.h include/evolution-data-server-%%VERSION%%/libical/icalattach.h @@ -107,32 +241,71 @@ include/evolution-data-server-%%VERSION%%/libical/sspm.h include/evolution-data-server-%%VERSION%%/libical/vcaltmp.h include/evolution-data-server-%%VERSION%%/libical/vcc.h include/evolution-data-server-%%VERSION%%/libical/vobject.h -lib/libebook.a -lib/libebook.so -lib/libebook.so.8 -lib/libecal.a -lib/libecal.so -lib/libecal.so.9 -lib/libedata-book.a -lib/libedata-book.so -lib/libedata-book.so.1 -lib/libedata-cal.a -lib/libedata-cal.so -lib/libedata-cal.so.6 -lib/libedataserver.a -lib/libedataserver.so -lib/libedataserver.so.5 -lib/libegroupwise.a -lib/libegroupwise.so -lib/libegroupwise.so.7 +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelgroupwise.so +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelgroupwise.urls +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap.so +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap.urls +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap4.so +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap4.urls +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamellocal.so +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamellocal.urls +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelnntp.so +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelnntp.urls +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelpop3.so +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelpop3.urls +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsendmail.so +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsendmail.urls +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsmtp.so +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsmtp.urls +lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendfile.so +lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendgroupwise.so +lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendldap.so +lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendvcf.so +lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendcontacts.so +lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendfile.so +lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendgroupwise.so +lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendhttp.so +lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendweather.so +lib/libcamel-%%VERSION%%.a +lib/libcamel-%%VERSION%%.so +lib/libcamel-%%VERSION%%.so.0 +lib/libcamel-provider-%%VERSION%%.a +lib/libcamel-provider-%%VERSION%%.so +lib/libcamel-provider-%%VERSION%%.so.4 +lib/libebook-%%VERSION%%.a +lib/libebook-%%VERSION%%.so +lib/libebook-%%VERSION%%.so.4 +lib/libecal-%%VERSION%%.a +lib/libecal-%%VERSION%%.so +lib/libecal-%%VERSION%%.so.2 +lib/libedata-book-%%VERSION%%.a +lib/libedata-book-%%VERSION%%.so +lib/libedata-book-%%VERSION%%.so.2 +lib/libedata-cal-%%VERSION%%.a +lib/libedata-cal-%%VERSION%%.so +lib/libedata-cal-%%VERSION%%.so.3 +lib/libedataserver-%%VERSION%%.a +lib/libedataserver-%%VERSION%%.so +lib/libedataserver-%%VERSION%%.so.4 +lib/libedataserverui-%%VERSION%%.a +lib/libedataserverui-%%VERSION%%.so +lib/libedataserverui-%%VERSION%%.so.5 +lib/libegroupwise-%%VERSION%%.a +lib/libegroupwise-%%VERSION%%.so +lib/libegroupwise-%%VERSION%%.so.5 libdata/bonobo/servers/GNOME_Evolution_DataServer_%%VERSION%%.server +libdata/pkgconfig/camel-%%VERSION%%.pc +libdata/pkgconfig/camel-provider-%%VERSION%%.pc libdata/pkgconfig/evolution-data-server-%%VERSION%%.pc libdata/pkgconfig/libebook-%%VERSION%%.pc libdata/pkgconfig/libecal-%%VERSION%%.pc libdata/pkgconfig/libedata-book-%%VERSION%%.pc libdata/pkgconfig/libedata-cal-%%VERSION%%.pc libdata/pkgconfig/libedataserver-%%VERSION%%.pc +libdata/pkgconfig/libedataserverui-%%VERSION%%.pc libdata/pkgconfig/libegroupwise-%%VERSION%%.pc +libexec/camel-index-control-%%VERSION%% +libexec/camel-lock-helper-%%VERSION%% libexec/evolution-data-server-%%VERSION%% share/doc/libebook/EBook.html share/doc/libebook/EBookListener.html @@ -172,7 +345,10 @@ share/doc/libecal/libecal.devhelp share/doc/libecal/right.png share/doc/libecal/style.css share/doc/libecal/up.png -%%LDAP%%share/gnome/evolution-data-server-%%VERSION%%/evolutionperson.schema +share/gnome/evolution-data-server-%%VERSION%%/evolutionperson.schema +share/gnome/evolution-data-server-%%VERSION%%/glade/e-categories-dialog.glade +share/gnome/evolution-data-server-%%VERSION%%/glade/e-name-selector-dialog.glade +share/gnome/evolution-data-server-%%VERSION%%/weather/Locations.xml share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Abidjan.ics share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Accra.ics share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Addis_Ababa.ics @@ -555,12 +731,31 @@ share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/zones.tab share/gnome/idl/evolution-data-server-%%VERSION%%/Evolution-DataServer-Addressbook.idl share/gnome/idl/evolution-data-server-%%VERSION%%/Evolution-DataServer-Calendar.idl share/gnome/idl/evolution-data-server-%%VERSION%%/Evolution-DataServer.idl +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_birthday_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_business_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_favorites_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_gifts_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_goals_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_holiday-cards_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_holiday_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_hot-contacts_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_ideas_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_international_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_key-customer_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_miscellaneous_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_personal_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_phonecalls_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_status_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_strategies_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_suppliers_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_time-and-expenses_16.png share/locale/am/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/ar/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/az/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/be/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/bg/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/bn/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/bs/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/ca/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/cs/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/cy/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo @@ -579,14 +774,19 @@ share/locale/fr/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/ga/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/gl/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/gu/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/he/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/hi/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/hr/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/hu/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/id/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/is/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/it/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/ja/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/ko/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/lt/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/lv/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/mk/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/ml/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/mn/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/ms/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/nb/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo @@ -608,8 +808,10 @@ share/locale/sv/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/tr/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/uk/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/vi/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/wa/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/zh_CN/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +@dirrm share/gnome/pixmaps/evolution-data-server-%%VERSION%% @dirrm share/gnome/idl/evolution-data-server-%%VERSION%% @dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific @dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian @@ -625,14 +827,21 @@ share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo @dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America @dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa @dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo +@dirrm share/gnome/evolution-data-server-%%VERSION%%/weather +@dirrm share/gnome/evolution-data-server-%%VERSION%%/glade @dirrm share/gnome/evolution-data-server-%%VERSION%% @dirrm share/doc/libecal @dirrm share/doc/libebook +@dirrm lib/evolution-data-server-%%VERSION%%/extensions +@dirrm lib/evolution-data-server-%%VERSION%%/camel-providers +@dirrm lib/evolution-data-server-%%VERSION%% @dirrm include/evolution-data-server-%%VERSION%%/libical +@dirrm include/evolution-data-server-%%VERSION%%/libedataserverui @dirrm include/evolution-data-server-%%VERSION%%/libedataserver @dirrm include/evolution-data-server-%%VERSION%%/libedata-cal @dirrm include/evolution-data-server-%%VERSION%%/libedata-book @dirrm include/evolution-data-server-%%VERSION%%/libecal @dirrm include/evolution-data-server-%%VERSION%%/libebook @dirrm include/evolution-data-server-%%VERSION%%/groupwise +@dirrm include/evolution-data-server-%%VERSION%%/camel @dirrm include/evolution-data-server-%%VERSION%% diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile index 9028bea115c0..6045013e614a 100644 --- a/databases/libgda2/Makefile +++ b/databases/libgda2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libgda2 -PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTVERSION= 1.2.1 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/1.2 DISTNAME= libgda-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -24,11 +23,12 @@ RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier glib20 libxslt +USE_GNOME= gnomeprefix gnomehack glib20 libxslt INSTALLS_OMF= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL_VER=15 USE_REINPLACE= yes +CONFIGURE_ARGS= --without-bdb CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lintl" @@ -47,10 +47,6 @@ post-patch: WITH_MYSQL= yes .endif -.if exists(${LOCALBASE}/lib/libpq.so.3) -WITH_PGSQL= yes -.endif - .if exists(${LOCALBASE}/lib/libldap.so.2) WITH_LDAP=yes .endif @@ -111,7 +107,7 @@ LIB_DEPENDS+= gds.1:${PORTSDIR}/databases/firebird CONFIGURE_ARGS+= --with-firebird=${LOCALBASE}/firebird PLIST_SUB+= FIREBIRD:="" .else -CONFIGURE_ARGS+= --without-firebird +CONFIGURE_ARGS+= --without-interbase PLIST_SUB+= FIREBIRD:="@comment " .endif @@ -152,7 +148,7 @@ PLIST_SUB+= ODBC:="@comment " .endif .if !defined(WITHOUT_SQLITE) && defined(WITH_SQLITE) -LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 +LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE} PLIST_SUB+= SQLITE:="" .else @@ -164,9 +160,6 @@ pre-everything:: .if !defined(WITH_MYSQL) @${ECHO_MSG} "You can enable support for MySQL databases by defining WITH_MYSQL." .endif -.if !defined(WITH_PGSQL) - @${ECHO_MSG} "You can enable support for PostgreSQL databases by defining WITH_PGSQL." -.endif .if !defined(WITH_LDAP) @${ECHO_MSG} "You can enable support for LDAP databases by defining WITH_LDAP." .endif diff --git a/databases/libgda2/distinfo b/databases/libgda2/distinfo index c0592ec3808a..d03935fd78c2 100644 --- a/databases/libgda2/distinfo +++ b/databases/libgda2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgda-1.0.4.tar.bz2) = c13d884dc61a3819c91422880147864d -SIZE (gnome2/libgda-1.0.4.tar.bz2) = 1112201 +MD5 (gnome2/libgda-1.2.1.tar.bz2) = 513a3b7adb66fa5641bae5394f60c017 +SIZE (gnome2/libgda-1.2.1.tar.bz2) = 1223001 diff --git a/databases/libgda2/files/patch-doc::libgda-C.omf.in b/databases/libgda2/files/patch-doc::libgda-C.omf.in index cc83c742bedd..f98b540c5562 100644 --- a/databases/libgda2/files/patch-doc::libgda-C.omf.in +++ b/databases/libgda2/files/patch-doc::libgda-C.omf.in @@ -1,11 +1,11 @@ ---- doc/libgda-C.omf.in.orig Thu Oct 2 11:54:08 2003 -+++ doc/libgda-C.omf.in Thu Oct 2 11:54:58 2003 +--- doc/libgda-C.omf.in.orig Mon Feb 28 05:30:59 2005 ++++ doc/libgda-C.omf.in Thu Mar 3 14:07:24 2005 @@ -16,7 +16,7 @@ </description> <type>user's guide</type> <format mime="text/html"/> -- <identifier url="file:/@prefix@/share/gtk-doc/html/libgda/index.html"/> -+ <identifier url="file:/@prefix@/share/doc/libgda/index.html"/> +- <identifier url="file:@prefix@/share/gtk-doc/html/libgda/index.html"/> ++ <identifier url="file:@prefix@/share/doc/libgda/index.html"/> <language code="C"/> <relation seriesid="ebe4f574-a94d-11d6-8bc3-bd1f202a92f8"/> <rights type="GNU FDL" license.version="1.1"/> diff --git a/databases/libgda2/files/patch-doc_C_Makefile.in b/databases/libgda2/files/patch-doc_C_Makefile.in index 718a4a1ebe6f..ef37c3190b54 100644 --- a/databases/libgda2/files/patch-doc_C_Makefile.in +++ b/databases/libgda2/files/patch-doc_C_Makefile.in @@ -1,11 +1,11 @@ ---- doc/C/Makefile.in.orig Sun Jun 2 22:17:05 2002 -+++ doc/C/Makefile.in Sun Jun 2 22:17:27 2002 -@@ -152,7 +152,7 @@ - cxxflags_set = @cxxflags_set@ - - DOC_MODULE = libgda +--- doc/C/Makefile.in.orig Thu Jul 22 10:35:19 2004 ++++ doc/C/Makefile.in Thu Jul 22 10:35:48 2004 +@@ -116,7 +116,7 @@ + HISTORY_LIB = @HISTORY_LIB@ + HISTORY_LIB_FALSE = @HISTORY_LIB_FALSE@ + HISTORY_LIB_TRUE = @HISTORY_LIB_TRUE@ -HTML_DIR = $(datadir)/gtk-doc/html +HTML_DIR = $(prefix)/share/doc - - # The top-level SGML file. Change it if you want. - DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml + IBMDB2_CFLAGS = @IBMDB2_CFLAGS@ + IBMDB2_FALSE = @IBMDB2_FALSE@ + IBMDB2_LIBS = @IBMDB2_LIBS@ diff --git a/databases/libgda2/files/patch-libgda_gda-util.c b/databases/libgda2/files/patch-libgda_gda-util.c deleted file mode 100644 index 61a7cded1fdb..000000000000 --- a/databases/libgda2/files/patch-libgda_gda-util.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgda/gda-util.c.orig Sat Jul 17 11:02:21 2004 -+++ libgda/gda-util.c Sat Jul 17 11:03:07 2004 -@@ -60,7 +60,7 @@ - case GDA_VALUE_TYPE_TIME : return "time"; - case GDA_VALUE_TYPE_TIMESTAMP : return "timestamp"; - case GDA_VALUE_TYPE_TINYINT : return "tinyint"; -- default: -+ default: ; - } - - return "string"; diff --git a/databases/libgda2/files/patch-ltmain.sh b/databases/libgda2/files/patch-ltmain.sh deleted file mode 100644 index 860ddda642f7..000000000000 --- a/databases/libgda2/files/patch-ltmain.sh +++ /dev/null @@ -1,51 +0,0 @@ ---- ltmain.sh.orig Tue Aug 5 18:08:30 2003 -+++ ltmain.sh Wed Aug 6 08:18:27 2003 -@@ -1278,7 +1278,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1288,8 +1288,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -3008,6 +3016,9 @@ - # problems, so we reset it completely - verstring= - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - verstring="0.0" - ;; -@@ -5457,10 +5468,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/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/databases/libgda2/files/patch-po_Makefile.in.in b/databases/libgda2/files/patch-po_Makefile.in.in new file mode 100644 index 000000000000..1e6984b6bbca --- /dev/null +++ b/databases/libgda2/files/patch-po_Makefile.in.in @@ -0,0 +1,10 @@ +--- po/Makefile.in.in.orig Sat Aug 14 00:43:46 2004 ++++ po/Makefile.in.in Sat Aug 14 00:45:54 2004 +@@ -35,6 +35,7 @@ + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + + CC = @CC@ + GENCAT = @GENCAT@ diff --git a/databases/libgda2/files/patch-providers_ldap_gda-ldap-provider.c b/databases/libgda2/files/patch-providers_ldap_gda-ldap-provider.c deleted file mode 100644 index 182c120967dc..000000000000 --- a/databases/libgda2/files/patch-providers_ldap_gda-ldap-provider.c +++ /dev/null @@ -1,20 +0,0 @@ ---- providers/ldap/gda-ldap-provider.c.orig Sat Jul 17 11:06:48 2004 -+++ providers/ldap/gda-ldap-provider.c Sat Jul 17 11:06:57 2004 -@@ -275,7 +275,7 @@ - switch (feature) { - case GDA_CONNECTION_FEATURE_SQL : - return TRUE; -- default : -+ default : ; - } - - return FALSE; -@@ -466,7 +466,7 @@ - return get_ldap_tables (cnc, params); - case GDA_CONNECTION_SCHEMA_TYPES : - return get_ldap_types (cnc, params); -- default : -+ default : ; - } - - return NULL; diff --git a/databases/libgda2/files/patch-providers_mdb_gda-mdb-provider.c b/databases/libgda2/files/patch-providers_mdb_gda-mdb-provider.c deleted file mode 100644 index a56a2df2a1a0..000000000000 --- a/databases/libgda2/files/patch-providers_mdb_gda-mdb-provider.c +++ /dev/null @@ -1,20 +0,0 @@ ---- providers/mdb/gda-mdb-provider.c.orig Sat Jul 17 11:05:48 2004 -+++ providers/mdb/gda-mdb-provider.c Sat Jul 17 11:06:12 2004 -@@ -389,7 +389,7 @@ - g_strfreev (arr); - } - break; -- default : -+ default : ; - } - - return reclist; -@@ -438,7 +438,7 @@ - case GDA_CONNECTION_FEATURE_PROCEDURES : - case GDA_CONNECTION_FEATURE_SQL : - return TRUE; -- default : -+ default : ; - } - - return FALSE; diff --git a/databases/libgda2/files/patch-providers_mysql_gda-mysql-provider.c b/databases/libgda2/files/patch-providers_mysql_gda-mysql-provider.c deleted file mode 100644 index 4b13d3f74cb5..000000000000 --- a/databases/libgda2/files/patch-providers_mysql_gda-mysql-provider.c +++ /dev/null @@ -1,30 +0,0 @@ ---- patch-providers_mysql_gda-mysql-provider.c begins here --- ---- providers/mysql/gda-mysql-provider.c.orig Sat Aug 14 22:14:57 2004 -+++ providers/mysql/gda-mysql-provider.c Sat Aug 14 22:15:59 2004 -@@ -510,7 +510,7 @@ - - g_free (str); - break; -- default: -+ default: ; - } - - return reclist; -@@ -655,7 +655,7 @@ - case GDA_CONNECTION_FEATURE_SQL : - case GDA_CONNECTION_FEATURE_TRANSACTIONS : - return TRUE; -- default : -+ default : ; - } - - return FALSE; -@@ -1187,7 +1187,7 @@ - return get_mysql_tables (cnc, params); - case GDA_CONNECTION_SCHEMA_TYPES : - return get_mysql_types (cnc, params); -- default : -+ default : ; - } - - return NULL; diff --git a/databases/libgda2/files/patch-providers_mysql_gda-mysql-recordset.c b/databases/libgda2/files/patch-providers_mysql_gda-mysql-recordset.c index 758d31ca4869..b0d7ad4862b1 100644 --- a/databases/libgda2/files/patch-providers_mysql_gda-mysql-recordset.c +++ b/databases/libgda2/files/patch-providers_mysql_gda-mysql-recordset.c @@ -1,11 +1,13 @@ ---- providers/mysql/gda-mysql-recordset.c.orig Mon Feb 17 21:42:16 2003 -+++ providers/mysql/gda-mysql-recordset.c Mon Feb 17 21:42:57 2003 -@@ -102,7 +102,7 @@ - break; - case FIELD_TYPE_LONGLONG : - case FIELD_TYPE_INT24 : -- gda_value_set_bigint (field, thevalue ? atoll (thevalue) : 0); -+ gda_value_set_bigint (field, thevalue ? strtoll(thevalue, &thevalue, 10) : 0); - break; - case FIELD_TYPE_SHORT : - gda_value_set_smallint (field, thevalue ? atoi (thevalue) : 0); +--- providers/mysql/gda-mysql-recordset.c.orig Thu Jul 22 10:40:31 2004 ++++ providers/mysql/gda-mysql-recordset.c Thu Jul 22 10:42:51 2004 +@@ -67,8 +67,8 @@ + case FIELD_TYPE_LONGLONG : + case FIELD_TYPE_INT24 : + if (is_unsigned) +- gda_value_set_biguint (gda_value, atoll (value)); +- gda_value_set_bigint (gda_value, atoll (value)); ++ gda_value_set_biguint (gda_value, strtoll (value, &value, 10)); ++ gda_value_set_bigint (gda_value, strtoll (value, &value, 10)); + break; + case FIELD_TYPE_SHORT : + if (is_unsigned) diff --git a/databases/libgda2/files/patch-providers_oracle_utils.c b/databases/libgda2/files/patch-providers_oracle_utils.c deleted file mode 100644 index a38974770e24..000000000000 --- a/databases/libgda2/files/patch-providers_oracle_utils.c +++ /dev/null @@ -1,11 +0,0 @@ ---- providers/oracle/utils.c.orig Sat Jul 17 11:07:46 2004 -+++ providers/oracle/utils.c Sat Jul 17 11:08:12 2004 -@@ -110,7 +110,7 @@ - break; - case OCI_HTYPE_ENV: - gda_connection_add_error (cnc, gda_oracle_make_error (priv_data->henv, type, file, line)); -- default: -+ default: ; - } - break; - default: diff --git a/databases/libgda2/files/patch-providers_sqlite_gda-sqlite-provider.c b/databases/libgda2/files/patch-providers_sqlite_gda-sqlite-provider.c deleted file mode 100644 index 66454f222810..000000000000 --- a/databases/libgda2/files/patch-providers_sqlite_gda-sqlite-provider.c +++ /dev/null @@ -1,20 +0,0 @@ ---- providers/sqlite/gda-sqlite-provider.c.orig Sat Jul 17 11:09:00 2004 -+++ providers/sqlite/gda-sqlite-provider.c Sat Jul 17 11:09:07 2004 -@@ -623,7 +623,7 @@ - case GDA_CONNECTION_FEATURE_TRIGGERS : - case GDA_CONNECTION_FEATURE_VIEWS : - return TRUE; -- default: -+ default: ; - } - - return FALSE; -@@ -809,7 +809,7 @@ - return get_tables (cnc); - case GDA_CONNECTION_SCHEMA_TYPES : - return get_types (); -- default: -+ default: ; - } - - return NULL; diff --git a/databases/libgda2/files/patch-providers_xml_gda-xml-provider.c b/databases/libgda2/files/patch-providers_xml_gda-xml-provider.c deleted file mode 100644 index 487d19514fc6..000000000000 --- a/databases/libgda2/files/patch-providers_xml_gda-xml-provider.c +++ /dev/null @@ -1,11 +0,0 @@ ---- providers/xml/gda-xml-provider.c.orig Sat Jul 17 11:05:02 2004 -+++ providers/xml/gda-xml-provider.c Sat Jul 17 11:05:11 2004 -@@ -681,7 +681,7 @@ - return get_tables (cnc, xmldb); - case GDA_CONNECTION_SCHEMA_TYPES : - return get_types (cnc); -- default : -+ default : ; - } - - return NULL; diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist index 47a454eadc30..b2da31b8cbaa 100644 --- a/databases/libgda2/pkg-plist +++ b/databases/libgda2/pkg-plist @@ -2,79 +2,79 @@ bin/gda-config-tool bin/gda-report-test bin/gda-run etc/libgda/config -include/libgda-report/gda-report-document.h -include/libgda-report/gda-report-item-detail.h -include/libgda-report/gda-report-item-label.h -include/libgda-report/gda-report-item-pagefooter.h -include/libgda-report/gda-report-item-pageheader.h -include/libgda-report/gda-report-item-repfield.h -include/libgda-report/gda-report-item-report.h -include/libgda-report/gda-report-item-reportfooter.h -include/libgda-report/gda-report-item-reportheader.h -include/libgda-report/gda-report-item-sqlquery.h -include/libgda-report/gda-report-item.h -include/libgda-report/gda-report-result.h -include/libgda-report/gda-report-types.h -include/libgda-report/gda-report-valid.h -include/libgda-report/gda-report.h -include/libgda/gda-blob.h -include/libgda/gda-client.h -include/libgda/gda-command.h -include/libgda/gda-config.h -include/libgda/gda-connection.h -include/libgda/gda-data-model-array.h -include/libgda/gda-data-model-hash.h -include/libgda/gda-data-model-list.h -include/libgda/gda-data-model.h -include/libgda/gda-enum-types.h -include/libgda/gda-error.h -include/libgda/gda-export.h -include/libgda/gda-field.h -include/libgda/gda-log.h -include/libgda/gda-marshal.h -include/libgda/gda-parameter.h -include/libgda/gda-quark-list.h -include/libgda/gda-row.h -include/libgda/gda-select.h -include/libgda/gda-server-provider.h -include/libgda/gda-table.h -include/libgda/gda-transaction.h -include/libgda/gda-util.h -include/libgda/gda-value.h -include/libgda/gda-xml-connection.h -include/libgda/gda-xml-database.h -include/libgda/gda-xml-document.h -include/libgda/gda-xql-atom.h -include/libgda/gda-xql-bin.h -include/libgda/gda-xql-column.h -include/libgda/gda-xql-const.h -include/libgda/gda-xql-delete.h -include/libgda/gda-xql-dml.h -include/libgda/gda-xql-dual.h -include/libgda/gda-xql-field.h -include/libgda/gda-xql-func.h -include/libgda/gda-xql-insert.h -include/libgda/gda-xql-item.h -include/libgda/gda-xql-join.h -include/libgda/gda-xql-list.h -include/libgda/gda-xql-query.h -include/libgda/gda-xql-select.h -include/libgda/gda-xql-stack.h -include/libgda/gda-xql-target.h -include/libgda/gda-xql-update.h -include/libgda/gda-xql-utils.h -include/libgda/gda-xql-value.h -include/libgda/gda-xql-valueref.h -include/libgda/libgda.h +include/libgda-1.2/libgda-report/gda-report-document.h +include/libgda-1.2/libgda-report/gda-report-item-detail.h +include/libgda-1.2/libgda-report/gda-report-item-label.h +include/libgda-1.2/libgda-report/gda-report-item-pagefooter.h +include/libgda-1.2/libgda-report/gda-report-item-pageheader.h +include/libgda-1.2/libgda-report/gda-report-item-repfield.h +include/libgda-1.2/libgda-report/gda-report-item-report.h +include/libgda-1.2/libgda-report/gda-report-item-reportfooter.h +include/libgda-1.2/libgda-report/gda-report-item-reportheader.h +include/libgda-1.2/libgda-report/gda-report-item-sqlquery.h +include/libgda-1.2/libgda-report/gda-report-item.h +include/libgda-1.2/libgda-report/gda-report-result.h +include/libgda-1.2/libgda-report/gda-report-types.h +include/libgda-1.2/libgda-report/gda-report-valid.h +include/libgda-1.2/libgda-report/gda-report.h +include/libgda-1.2/libgda/gda-blob.h +include/libgda-1.2/libgda/gda-client.h +include/libgda-1.2/libgda/gda-command.h +include/libgda-1.2/libgda/gda-config.h +include/libgda-1.2/libgda/gda-connection.h +include/libgda-1.2/libgda/gda-data-model-array.h +include/libgda-1.2/libgda/gda-data-model-hash.h +include/libgda-1.2/libgda/gda-data-model-list.h +include/libgda-1.2/libgda/gda-data-model.h +include/libgda-1.2/libgda/gda-enum-types.h +include/libgda-1.2/libgda/gda-error.h +include/libgda-1.2/libgda/gda-field.h +include/libgda-1.2/libgda/gda-log.h +include/libgda-1.2/libgda/gda-marshal.h +include/libgda-1.2/libgda/gda-parameter.h +include/libgda-1.2/libgda/gda-quark-list.h +include/libgda-1.2/libgda/gda-row.h +include/libgda-1.2/libgda/gda-select.h +include/libgda-1.2/libgda/gda-server-provider.h +include/libgda-1.2/libgda/gda-table.h +include/libgda-1.2/libgda/gda-transaction.h +include/libgda-1.2/libgda/gda-util.h +include/libgda-1.2/libgda/gda-value.h +include/libgda-1.2/libgda/gda-xml-connection.h +include/libgda-1.2/libgda/gda-xml-database.h +include/libgda-1.2/libgda/gda-xml-document.h +include/libgda-1.2/libgda/gda-xql-atom.h +include/libgda-1.2/libgda/gda-xql-bin.h +include/libgda-1.2/libgda/gda-xql-column.h +include/libgda-1.2/libgda/gda-xql-const.h +include/libgda-1.2/libgda/gda-xql-delete.h +include/libgda-1.2/libgda/gda-xql-dml.h +include/libgda-1.2/libgda/gda-xql-dual.h +include/libgda-1.2/libgda/gda-xql-field.h +include/libgda-1.2/libgda/gda-xql-func.h +include/libgda-1.2/libgda/gda-xql-insert.h +include/libgda-1.2/libgda/gda-xql-item.h +include/libgda-1.2/libgda/gda-xql-join.h +include/libgda-1.2/libgda/gda-xql-list.h +include/libgda-1.2/libgda/gda-xql-query.h +include/libgda-1.2/libgda/gda-xql-select.h +include/libgda-1.2/libgda/gda-xql-stack.h +include/libgda-1.2/libgda/gda-xql-target.h +include/libgda-1.2/libgda/gda-xql-update.h +include/libgda-1.2/libgda/gda-xql-utils.h +include/libgda-1.2/libgda/gda-xql-value.h +include/libgda-1.2/libgda/gda-xql-valueref.h +include/libgda-1.2/libgda/libgda.h +include/libgda-1.2/sql/sql_parser.h lib/libgda-2.a lib/libgda-2.so -lib/libgda-2.so.2 +lib/libgda-2.so.3 lib/libgda-report-2.a lib/libgda-report-2.so -lib/libgda-report-2.so.2 +lib/libgda-report-2.so.3 lib/libgdasql.a lib/libgdasql.so -lib/libgdasql.so.0 +lib/libgdasql.so.3 %%FIREBIRD:%%lib/libgda/providers/libgda-firebird.so %%FREETDS:%%lib/libgda/providers/libgda-freetds.so %%LDAP:%%lib/libgda/providers/libgda-ldap.so @@ -87,7 +87,10 @@ lib/libgdasql.so.0 lib/libgda/providers/libgda-xml.so libdata/pkgconfig/libgda.pc %%DOCSDIR%%/architecture.html -%%DOCSDIR%%/c694.html +%%DOCSDIR%%/ch06.html +%%DOCSDIR%%/ch09s04.html +%%DOCSDIR%%/ch09s05.html +%%DOCSDIR%%/ch09s06.html %%DOCSDIR%%/compiling.html %%DOCSDIR%%/connecting.html %%DOCSDIR%%/connections.html @@ -104,13 +107,63 @@ libdata/pkgconfig/libgda.pc %%DOCSDIR%%/fdl-section9.html %%DOCSDIR%%/fdl-using.html %%DOCSDIR%%/fdl.html -%%DOCSDIR%%/gdavalue.html +%%DOCSDIR%%/home.png %%DOCSDIR%%/index.html %%DOCSDIR%%/index.sgml %%DOCSDIR%%/installation-configuring.html %%DOCSDIR%%/installation-installing.html %%DOCSDIR%%/installation.html %%DOCSDIR%%/introduction.html +%%DOCSDIR%%/left.png +%%DOCSDIR%%/libgda.devhelp +%%DOCSDIR%%/libgda-GdaClient.html +%%DOCSDIR%%/libgda-GdaConnection.html +%%DOCSDIR%%/libgda-GdaDataModel.html +%%DOCSDIR%%/libgda-GdaDataModelArray.html +%%DOCSDIR%%/libgda-GdaDataModelHash.html +%%DOCSDIR%%/libgda-GdaDataModelList.html +%%DOCSDIR%%/libgda-GdaError.html +%%DOCSDIR%%/libgda-GdaExport.html +%%DOCSDIR%%/libgda-GdaReportDocument.html +%%DOCSDIR%%/libgda-GdaReportItem.html +%%DOCSDIR%%/libgda-GdaReportItemDetail.html +%%DOCSDIR%%/libgda-GdaReportItemLabel.html +%%DOCSDIR%%/libgda-GdaReportItemPageFooter.html +%%DOCSDIR%%/libgda-GdaReportItemPageHeader.html +%%DOCSDIR%%/libgda-GdaReportItemRepField.html +%%DOCSDIR%%/libgda-GdaReportItemReport.html +%%DOCSDIR%%/libgda-GdaReportItemReportFooter.html +%%DOCSDIR%%/libgda-GdaReportItemReportHeader.html +%%DOCSDIR%%/libgda-GdaReportItemSqlQuery.html +%%DOCSDIR%%/libgda-GdaReportResult.html +%%DOCSDIR%%/libgda-GdaReportValid.html +%%DOCSDIR%%/libgda-GdaSelect.html +%%DOCSDIR%%/libgda-GdaServerProvider.html +%%DOCSDIR%%/libgda-GdaTable.html +%%DOCSDIR%%/libgda-GdaTransaction.html +%%DOCSDIR%%/libgda-GdaXmlConnection.html +%%DOCSDIR%%/libgda-GdaXmlDatabase.html +%%DOCSDIR%%/libgda-GdaXmlDocument.html +%%DOCSDIR%%/libgda-GdaXqlAtom.html +%%DOCSDIR%%/libgda-GdaXqlBin.html +%%DOCSDIR%%/libgda-GdaXqlColumn.html +%%DOCSDIR%%/libgda-GdaXqlConst.html +%%DOCSDIR%%/libgda-GdaXqlDelete.html +%%DOCSDIR%%/libgda-GdaXqlDml.html +%%DOCSDIR%%/libgda-GdaXqlDual.html +%%DOCSDIR%%/libgda-GdaXqlField.html +%%DOCSDIR%%/libgda-GdaXqlFunc.html +%%DOCSDIR%%/libgda-GdaXqlInsert.html +%%DOCSDIR%%/libgda-GdaXqlItem.html +%%DOCSDIR%%/libgda-GdaXqlJoin.html +%%DOCSDIR%%/libgda-GdaXqlList.html +%%DOCSDIR%%/libgda-GdaXqlQuery.html +%%DOCSDIR%%/libgda-GdaXqlSelect.html +%%DOCSDIR%%/libgda-GdaXqlStack.html +%%DOCSDIR%%/libgda-GdaXqlTarget.html +%%DOCSDIR%%/libgda-GdaXqlUpdate.html +%%DOCSDIR%%/libgda-GdaXqlValue.html +%%DOCSDIR%%/libgda-GdaXqlValueRef.html %%DOCSDIR%%/libgda-api.html %%DOCSDIR%%/libgda-gda-blob.html %%DOCSDIR%%/libgda-gda-command.html @@ -124,69 +177,23 @@ libdata/pkgconfig/libgda.pc %%DOCSDIR%%/libgda-gda-util.html %%DOCSDIR%%/libgda-gda-value.html %%DOCSDIR%%/libgda-gda-xql-utils.html -%%DOCSDIR%%/libgda-gdaclient.html -%%DOCSDIR%%/libgda-gdaconnection.html -%%DOCSDIR%%/libgda-gdadatamodel.html -%%DOCSDIR%%/libgda-gdadatamodelarray.html -%%DOCSDIR%%/libgda-gdadatamodelhash.html -%%DOCSDIR%%/libgda-gdadatamodellist.html -%%DOCSDIR%%/libgda-gdaerror.html -%%DOCSDIR%%/libgda-gdaexport.html -%%DOCSDIR%%/libgda-gdareportdocument.html -%%DOCSDIR%%/libgda-gdareportitem.html -%%DOCSDIR%%/libgda-gdareportitemdetail.html -%%DOCSDIR%%/libgda-gdareportitemlabel.html -%%DOCSDIR%%/libgda-gdareportitempagefooter.html -%%DOCSDIR%%/libgda-gdareportitempageheader.html -%%DOCSDIR%%/libgda-gdareportitemrepfield.html -%%DOCSDIR%%/libgda-gdareportitemreport.html -%%DOCSDIR%%/libgda-gdareportitemreportfooter.html -%%DOCSDIR%%/libgda-gdareportitemreportheader.html -%%DOCSDIR%%/libgda-gdareportitemsqlquery.html -%%DOCSDIR%%/libgda-gdareportresult.html -%%DOCSDIR%%/libgda-gdareportvalid.html -%%DOCSDIR%%/libgda-gdaselect.html -%%DOCSDIR%%/libgda-gdaserverprovider.html -%%DOCSDIR%%/libgda-gdatable.html -%%DOCSDIR%%/libgda-gdatransaction.html -%%DOCSDIR%%/libgda-gdaxmlconnection.html -%%DOCSDIR%%/libgda-gdaxmldatabase.html -%%DOCSDIR%%/libgda-gdaxmldocument.html -%%DOCSDIR%%/libgda-gdaxqlatom.html -%%DOCSDIR%%/libgda-gdaxqlbin.html -%%DOCSDIR%%/libgda-gdaxqlcolumn.html -%%DOCSDIR%%/libgda-gdaxqlconst.html -%%DOCSDIR%%/libgda-gdaxqldelete.html -%%DOCSDIR%%/libgda-gdaxqldml.html -%%DOCSDIR%%/libgda-gdaxqldual.html -%%DOCSDIR%%/libgda-gdaxqlfield.html -%%DOCSDIR%%/libgda-gdaxqlfunc.html -%%DOCSDIR%%/libgda-gdaxqlinsert.html -%%DOCSDIR%%/libgda-gdaxqlitem.html -%%DOCSDIR%%/libgda-gdaxqljoin.html -%%DOCSDIR%%/libgda-gdaxqllist.html -%%DOCSDIR%%/libgda-gdaxqlquery.html -%%DOCSDIR%%/libgda-gdaxqlselect.html -%%DOCSDIR%%/libgda-gdaxqlstack.html -%%DOCSDIR%%/libgda-gdaxqltarget.html -%%DOCSDIR%%/libgda-gdaxqlupdate.html -%%DOCSDIR%%/libgda-gdaxqlvalue.html -%%DOCSDIR%%/libgda-gdaxqlvalueref.html %%DOCSDIR%%/libgda-libgda.html %%DOCSDIR%%/libgda-provider-class.html %%DOCSDIR%%/libgda-provider-recordset.html %%DOCSDIR%%/libgda-providers.html %%DOCSDIR%%/libgda-reports.html +%%DOCSDIR%%/libgda-server-provider-details.html %%DOCSDIR%%/libgda-xql.html %%DOCSDIR%%/main_example.html +%%DOCSDIR%%/manage-gdavalue.html %%DOCSDIR%%/managing-errors.html %%DOCSDIR%%/migration-configuration.html %%DOCSDIR%%/migration-executing-commands.html %%DOCSDIR%%/migration.html %%DOCSDIR%%/processing-queries.html -%%DOCSDIR%%/x863.html -%%DOCSDIR%%/x892.html -%%DOCSDIR%%/x897.html +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png share/gnome/libgda/xml/gda-report.dtd share/gnome/libgda/xml/gda-report-result.dtd share/gnome/libgda/xml/gda-xml-query.dtd @@ -208,12 +215,12 @@ share/locale/ga/LC_MESSAGES/libgda-2.mo share/locale/gl/LC_MESSAGES/libgda-2.mo share/locale/hr/LC_MESSAGES/libgda-2.mo share/locale/hu/LC_MESSAGES/libgda-2.mo -share/locale/id/LC_MESSAGES/libgda-2.mo share/locale/it/LC_MESSAGES/libgda-2.mo share/locale/ja/LC_MESSAGES/libgda-2.mo share/locale/ko/LC_MESSAGES/libgda-2.mo share/locale/ml/LC_MESSAGES/libgda-2.mo share/locale/ms/LC_MESSAGES/libgda-2.mo +share/locale/nb/LC_MESSAGES/libgda-2.mo share/locale/nl/LC_MESSAGES/libgda-2.mo share/locale/no/LC_MESSAGES/libgda-2.mo share/locale/pl/LC_MESSAGES/libgda-2.mo @@ -222,6 +229,7 @@ share/locale/pt_BR/LC_MESSAGES/libgda-2.mo share/locale/ru/LC_MESSAGES/libgda-2.mo share/locale/sk/LC_MESSAGES/libgda-2.mo share/locale/sl/LC_MESSAGES/libgda-2.mo +share/locale/sq/LC_MESSAGES/libgda-2.mo share/locale/sr/LC_MESSAGES/libgda-2.mo share/locale/sr@Latn/LC_MESSAGES/libgda-2.mo share/locale/sv/LC_MESSAGES/libgda-2.mo @@ -235,7 +243,8 @@ share/locale/zh_TW/LC_MESSAGES/libgda-2.mo @dirrm share/gnome/libgda @dirrm lib/libgda/providers @dirrm lib/libgda -@dirrm include/libgda/sql -@dirrm include/libgda -@dirrm include/libgda-report +@dirrm include/libgda-1.2/sql +@dirrm include/libgda-1.2/libgda-report +@dirrm include/libgda-1.2/libgda +@dirrm include/libgda-1.2 @dirrm etc/libgda diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile index 9028bea115c0..6045013e614a 100644 --- a/databases/libgda3/Makefile +++ b/databases/libgda3/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libgda2 -PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTVERSION= 1.2.1 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/1.2 DISTNAME= libgda-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -24,11 +23,12 @@ RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier glib20 libxslt +USE_GNOME= gnomeprefix gnomehack glib20 libxslt INSTALLS_OMF= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL_VER=15 USE_REINPLACE= yes +CONFIGURE_ARGS= --without-bdb CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lintl" @@ -47,10 +47,6 @@ post-patch: WITH_MYSQL= yes .endif -.if exists(${LOCALBASE}/lib/libpq.so.3) -WITH_PGSQL= yes -.endif - .if exists(${LOCALBASE}/lib/libldap.so.2) WITH_LDAP=yes .endif @@ -111,7 +107,7 @@ LIB_DEPENDS+= gds.1:${PORTSDIR}/databases/firebird CONFIGURE_ARGS+= --with-firebird=${LOCALBASE}/firebird PLIST_SUB+= FIREBIRD:="" .else -CONFIGURE_ARGS+= --without-firebird +CONFIGURE_ARGS+= --without-interbase PLIST_SUB+= FIREBIRD:="@comment " .endif @@ -152,7 +148,7 @@ PLIST_SUB+= ODBC:="@comment " .endif .if !defined(WITHOUT_SQLITE) && defined(WITH_SQLITE) -LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 +LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE} PLIST_SUB+= SQLITE:="" .else @@ -164,9 +160,6 @@ pre-everything:: .if !defined(WITH_MYSQL) @${ECHO_MSG} "You can enable support for MySQL databases by defining WITH_MYSQL." .endif -.if !defined(WITH_PGSQL) - @${ECHO_MSG} "You can enable support for PostgreSQL databases by defining WITH_PGSQL." -.endif .if !defined(WITH_LDAP) @${ECHO_MSG} "You can enable support for LDAP databases by defining WITH_LDAP." .endif diff --git a/databases/libgda3/distinfo b/databases/libgda3/distinfo index c0592ec3808a..d03935fd78c2 100644 --- a/databases/libgda3/distinfo +++ b/databases/libgda3/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgda-1.0.4.tar.bz2) = c13d884dc61a3819c91422880147864d -SIZE (gnome2/libgda-1.0.4.tar.bz2) = 1112201 +MD5 (gnome2/libgda-1.2.1.tar.bz2) = 513a3b7adb66fa5641bae5394f60c017 +SIZE (gnome2/libgda-1.2.1.tar.bz2) = 1223001 diff --git a/databases/libgda3/files/patch-doc::libgda-C.omf.in b/databases/libgda3/files/patch-doc::libgda-C.omf.in index cc83c742bedd..f98b540c5562 100644 --- a/databases/libgda3/files/patch-doc::libgda-C.omf.in +++ b/databases/libgda3/files/patch-doc::libgda-C.omf.in @@ -1,11 +1,11 @@ ---- doc/libgda-C.omf.in.orig Thu Oct 2 11:54:08 2003 -+++ doc/libgda-C.omf.in Thu Oct 2 11:54:58 2003 +--- doc/libgda-C.omf.in.orig Mon Feb 28 05:30:59 2005 ++++ doc/libgda-C.omf.in Thu Mar 3 14:07:24 2005 @@ -16,7 +16,7 @@ </description> <type>user's guide</type> <format mime="text/html"/> -- <identifier url="file:/@prefix@/share/gtk-doc/html/libgda/index.html"/> -+ <identifier url="file:/@prefix@/share/doc/libgda/index.html"/> +- <identifier url="file:@prefix@/share/gtk-doc/html/libgda/index.html"/> ++ <identifier url="file:@prefix@/share/doc/libgda/index.html"/> <language code="C"/> <relation seriesid="ebe4f574-a94d-11d6-8bc3-bd1f202a92f8"/> <rights type="GNU FDL" license.version="1.1"/> diff --git a/databases/libgda3/files/patch-doc_C_Makefile.in b/databases/libgda3/files/patch-doc_C_Makefile.in index 718a4a1ebe6f..ef37c3190b54 100644 --- a/databases/libgda3/files/patch-doc_C_Makefile.in +++ b/databases/libgda3/files/patch-doc_C_Makefile.in @@ -1,11 +1,11 @@ ---- doc/C/Makefile.in.orig Sun Jun 2 22:17:05 2002 -+++ doc/C/Makefile.in Sun Jun 2 22:17:27 2002 -@@ -152,7 +152,7 @@ - cxxflags_set = @cxxflags_set@ - - DOC_MODULE = libgda +--- doc/C/Makefile.in.orig Thu Jul 22 10:35:19 2004 ++++ doc/C/Makefile.in Thu Jul 22 10:35:48 2004 +@@ -116,7 +116,7 @@ + HISTORY_LIB = @HISTORY_LIB@ + HISTORY_LIB_FALSE = @HISTORY_LIB_FALSE@ + HISTORY_LIB_TRUE = @HISTORY_LIB_TRUE@ -HTML_DIR = $(datadir)/gtk-doc/html +HTML_DIR = $(prefix)/share/doc - - # The top-level SGML file. Change it if you want. - DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml + IBMDB2_CFLAGS = @IBMDB2_CFLAGS@ + IBMDB2_FALSE = @IBMDB2_FALSE@ + IBMDB2_LIBS = @IBMDB2_LIBS@ diff --git a/databases/libgda3/files/patch-libgda_gda-util.c b/databases/libgda3/files/patch-libgda_gda-util.c deleted file mode 100644 index 61a7cded1fdb..000000000000 --- a/databases/libgda3/files/patch-libgda_gda-util.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgda/gda-util.c.orig Sat Jul 17 11:02:21 2004 -+++ libgda/gda-util.c Sat Jul 17 11:03:07 2004 -@@ -60,7 +60,7 @@ - case GDA_VALUE_TYPE_TIME : return "time"; - case GDA_VALUE_TYPE_TIMESTAMP : return "timestamp"; - case GDA_VALUE_TYPE_TINYINT : return "tinyint"; -- default: -+ default: ; - } - - return "string"; diff --git a/databases/libgda3/files/patch-ltmain.sh b/databases/libgda3/files/patch-ltmain.sh deleted file mode 100644 index 860ddda642f7..000000000000 --- a/databases/libgda3/files/patch-ltmain.sh +++ /dev/null @@ -1,51 +0,0 @@ ---- ltmain.sh.orig Tue Aug 5 18:08:30 2003 -+++ ltmain.sh Wed Aug 6 08:18:27 2003 -@@ -1278,7 +1278,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1288,8 +1288,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -3008,6 +3016,9 @@ - # problems, so we reset it completely - verstring= - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - verstring="0.0" - ;; -@@ -5457,10 +5468,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/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/databases/libgda3/files/patch-po_Makefile.in.in b/databases/libgda3/files/patch-po_Makefile.in.in new file mode 100644 index 000000000000..1e6984b6bbca --- /dev/null +++ b/databases/libgda3/files/patch-po_Makefile.in.in @@ -0,0 +1,10 @@ +--- po/Makefile.in.in.orig Sat Aug 14 00:43:46 2004 ++++ po/Makefile.in.in Sat Aug 14 00:45:54 2004 +@@ -35,6 +35,7 @@ + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + + CC = @CC@ + GENCAT = @GENCAT@ diff --git a/databases/libgda3/files/patch-providers_ldap_gda-ldap-provider.c b/databases/libgda3/files/patch-providers_ldap_gda-ldap-provider.c deleted file mode 100644 index 182c120967dc..000000000000 --- a/databases/libgda3/files/patch-providers_ldap_gda-ldap-provider.c +++ /dev/null @@ -1,20 +0,0 @@ ---- providers/ldap/gda-ldap-provider.c.orig Sat Jul 17 11:06:48 2004 -+++ providers/ldap/gda-ldap-provider.c Sat Jul 17 11:06:57 2004 -@@ -275,7 +275,7 @@ - switch (feature) { - case GDA_CONNECTION_FEATURE_SQL : - return TRUE; -- default : -+ default : ; - } - - return FALSE; -@@ -466,7 +466,7 @@ - return get_ldap_tables (cnc, params); - case GDA_CONNECTION_SCHEMA_TYPES : - return get_ldap_types (cnc, params); -- default : -+ default : ; - } - - return NULL; diff --git a/databases/libgda3/files/patch-providers_mdb_gda-mdb-provider.c b/databases/libgda3/files/patch-providers_mdb_gda-mdb-provider.c deleted file mode 100644 index a56a2df2a1a0..000000000000 --- a/databases/libgda3/files/patch-providers_mdb_gda-mdb-provider.c +++ /dev/null @@ -1,20 +0,0 @@ ---- providers/mdb/gda-mdb-provider.c.orig Sat Jul 17 11:05:48 2004 -+++ providers/mdb/gda-mdb-provider.c Sat Jul 17 11:06:12 2004 -@@ -389,7 +389,7 @@ - g_strfreev (arr); - } - break; -- default : -+ default : ; - } - - return reclist; -@@ -438,7 +438,7 @@ - case GDA_CONNECTION_FEATURE_PROCEDURES : - case GDA_CONNECTION_FEATURE_SQL : - return TRUE; -- default : -+ default : ; - } - - return FALSE; diff --git a/databases/libgda3/files/patch-providers_mysql_gda-mysql-provider.c b/databases/libgda3/files/patch-providers_mysql_gda-mysql-provider.c deleted file mode 100644 index 4b13d3f74cb5..000000000000 --- a/databases/libgda3/files/patch-providers_mysql_gda-mysql-provider.c +++ /dev/null @@ -1,30 +0,0 @@ ---- patch-providers_mysql_gda-mysql-provider.c begins here --- ---- providers/mysql/gda-mysql-provider.c.orig Sat Aug 14 22:14:57 2004 -+++ providers/mysql/gda-mysql-provider.c Sat Aug 14 22:15:59 2004 -@@ -510,7 +510,7 @@ - - g_free (str); - break; -- default: -+ default: ; - } - - return reclist; -@@ -655,7 +655,7 @@ - case GDA_CONNECTION_FEATURE_SQL : - case GDA_CONNECTION_FEATURE_TRANSACTIONS : - return TRUE; -- default : -+ default : ; - } - - return FALSE; -@@ -1187,7 +1187,7 @@ - return get_mysql_tables (cnc, params); - case GDA_CONNECTION_SCHEMA_TYPES : - return get_mysql_types (cnc, params); -- default : -+ default : ; - } - - return NULL; diff --git a/databases/libgda3/files/patch-providers_mysql_gda-mysql-recordset.c b/databases/libgda3/files/patch-providers_mysql_gda-mysql-recordset.c index 758d31ca4869..b0d7ad4862b1 100644 --- a/databases/libgda3/files/patch-providers_mysql_gda-mysql-recordset.c +++ b/databases/libgda3/files/patch-providers_mysql_gda-mysql-recordset.c @@ -1,11 +1,13 @@ ---- providers/mysql/gda-mysql-recordset.c.orig Mon Feb 17 21:42:16 2003 -+++ providers/mysql/gda-mysql-recordset.c Mon Feb 17 21:42:57 2003 -@@ -102,7 +102,7 @@ - break; - case FIELD_TYPE_LONGLONG : - case FIELD_TYPE_INT24 : -- gda_value_set_bigint (field, thevalue ? atoll (thevalue) : 0); -+ gda_value_set_bigint (field, thevalue ? strtoll(thevalue, &thevalue, 10) : 0); - break; - case FIELD_TYPE_SHORT : - gda_value_set_smallint (field, thevalue ? atoi (thevalue) : 0); +--- providers/mysql/gda-mysql-recordset.c.orig Thu Jul 22 10:40:31 2004 ++++ providers/mysql/gda-mysql-recordset.c Thu Jul 22 10:42:51 2004 +@@ -67,8 +67,8 @@ + case FIELD_TYPE_LONGLONG : + case FIELD_TYPE_INT24 : + if (is_unsigned) +- gda_value_set_biguint (gda_value, atoll (value)); +- gda_value_set_bigint (gda_value, atoll (value)); ++ gda_value_set_biguint (gda_value, strtoll (value, &value, 10)); ++ gda_value_set_bigint (gda_value, strtoll (value, &value, 10)); + break; + case FIELD_TYPE_SHORT : + if (is_unsigned) diff --git a/databases/libgda3/files/patch-providers_oracle_utils.c b/databases/libgda3/files/patch-providers_oracle_utils.c deleted file mode 100644 index a38974770e24..000000000000 --- a/databases/libgda3/files/patch-providers_oracle_utils.c +++ /dev/null @@ -1,11 +0,0 @@ ---- providers/oracle/utils.c.orig Sat Jul 17 11:07:46 2004 -+++ providers/oracle/utils.c Sat Jul 17 11:08:12 2004 -@@ -110,7 +110,7 @@ - break; - case OCI_HTYPE_ENV: - gda_connection_add_error (cnc, gda_oracle_make_error (priv_data->henv, type, file, line)); -- default: -+ default: ; - } - break; - default: diff --git a/databases/libgda3/files/patch-providers_sqlite_gda-sqlite-provider.c b/databases/libgda3/files/patch-providers_sqlite_gda-sqlite-provider.c deleted file mode 100644 index 66454f222810..000000000000 --- a/databases/libgda3/files/patch-providers_sqlite_gda-sqlite-provider.c +++ /dev/null @@ -1,20 +0,0 @@ ---- providers/sqlite/gda-sqlite-provider.c.orig Sat Jul 17 11:09:00 2004 -+++ providers/sqlite/gda-sqlite-provider.c Sat Jul 17 11:09:07 2004 -@@ -623,7 +623,7 @@ - case GDA_CONNECTION_FEATURE_TRIGGERS : - case GDA_CONNECTION_FEATURE_VIEWS : - return TRUE; -- default: -+ default: ; - } - - return FALSE; -@@ -809,7 +809,7 @@ - return get_tables (cnc); - case GDA_CONNECTION_SCHEMA_TYPES : - return get_types (); -- default: -+ default: ; - } - - return NULL; diff --git a/databases/libgda3/files/patch-providers_xml_gda-xml-provider.c b/databases/libgda3/files/patch-providers_xml_gda-xml-provider.c deleted file mode 100644 index 487d19514fc6..000000000000 --- a/databases/libgda3/files/patch-providers_xml_gda-xml-provider.c +++ /dev/null @@ -1,11 +0,0 @@ ---- providers/xml/gda-xml-provider.c.orig Sat Jul 17 11:05:02 2004 -+++ providers/xml/gda-xml-provider.c Sat Jul 17 11:05:11 2004 -@@ -681,7 +681,7 @@ - return get_tables (cnc, xmldb); - case GDA_CONNECTION_SCHEMA_TYPES : - return get_types (cnc); -- default : -+ default : ; - } - - return NULL; diff --git a/databases/libgda3/pkg-plist b/databases/libgda3/pkg-plist index 47a454eadc30..b2da31b8cbaa 100644 --- a/databases/libgda3/pkg-plist +++ b/databases/libgda3/pkg-plist @@ -2,79 +2,79 @@ bin/gda-config-tool bin/gda-report-test bin/gda-run etc/libgda/config -include/libgda-report/gda-report-document.h -include/libgda-report/gda-report-item-detail.h -include/libgda-report/gda-report-item-label.h -include/libgda-report/gda-report-item-pagefooter.h -include/libgda-report/gda-report-item-pageheader.h -include/libgda-report/gda-report-item-repfield.h -include/libgda-report/gda-report-item-report.h -include/libgda-report/gda-report-item-reportfooter.h -include/libgda-report/gda-report-item-reportheader.h -include/libgda-report/gda-report-item-sqlquery.h -include/libgda-report/gda-report-item.h -include/libgda-report/gda-report-result.h -include/libgda-report/gda-report-types.h -include/libgda-report/gda-report-valid.h -include/libgda-report/gda-report.h -include/libgda/gda-blob.h -include/libgda/gda-client.h -include/libgda/gda-command.h -include/libgda/gda-config.h -include/libgda/gda-connection.h -include/libgda/gda-data-model-array.h -include/libgda/gda-data-model-hash.h -include/libgda/gda-data-model-list.h -include/libgda/gda-data-model.h -include/libgda/gda-enum-types.h -include/libgda/gda-error.h -include/libgda/gda-export.h -include/libgda/gda-field.h -include/libgda/gda-log.h -include/libgda/gda-marshal.h -include/libgda/gda-parameter.h -include/libgda/gda-quark-list.h -include/libgda/gda-row.h -include/libgda/gda-select.h -include/libgda/gda-server-provider.h -include/libgda/gda-table.h -include/libgda/gda-transaction.h -include/libgda/gda-util.h -include/libgda/gda-value.h -include/libgda/gda-xml-connection.h -include/libgda/gda-xml-database.h -include/libgda/gda-xml-document.h -include/libgda/gda-xql-atom.h -include/libgda/gda-xql-bin.h -include/libgda/gda-xql-column.h -include/libgda/gda-xql-const.h -include/libgda/gda-xql-delete.h -include/libgda/gda-xql-dml.h -include/libgda/gda-xql-dual.h -include/libgda/gda-xql-field.h -include/libgda/gda-xql-func.h -include/libgda/gda-xql-insert.h -include/libgda/gda-xql-item.h -include/libgda/gda-xql-join.h -include/libgda/gda-xql-list.h -include/libgda/gda-xql-query.h -include/libgda/gda-xql-select.h -include/libgda/gda-xql-stack.h -include/libgda/gda-xql-target.h -include/libgda/gda-xql-update.h -include/libgda/gda-xql-utils.h -include/libgda/gda-xql-value.h -include/libgda/gda-xql-valueref.h -include/libgda/libgda.h +include/libgda-1.2/libgda-report/gda-report-document.h +include/libgda-1.2/libgda-report/gda-report-item-detail.h +include/libgda-1.2/libgda-report/gda-report-item-label.h +include/libgda-1.2/libgda-report/gda-report-item-pagefooter.h +include/libgda-1.2/libgda-report/gda-report-item-pageheader.h +include/libgda-1.2/libgda-report/gda-report-item-repfield.h +include/libgda-1.2/libgda-report/gda-report-item-report.h +include/libgda-1.2/libgda-report/gda-report-item-reportfooter.h +include/libgda-1.2/libgda-report/gda-report-item-reportheader.h +include/libgda-1.2/libgda-report/gda-report-item-sqlquery.h +include/libgda-1.2/libgda-report/gda-report-item.h +include/libgda-1.2/libgda-report/gda-report-result.h +include/libgda-1.2/libgda-report/gda-report-types.h +include/libgda-1.2/libgda-report/gda-report-valid.h +include/libgda-1.2/libgda-report/gda-report.h +include/libgda-1.2/libgda/gda-blob.h +include/libgda-1.2/libgda/gda-client.h +include/libgda-1.2/libgda/gda-command.h +include/libgda-1.2/libgda/gda-config.h +include/libgda-1.2/libgda/gda-connection.h +include/libgda-1.2/libgda/gda-data-model-array.h +include/libgda-1.2/libgda/gda-data-model-hash.h +include/libgda-1.2/libgda/gda-data-model-list.h +include/libgda-1.2/libgda/gda-data-model.h +include/libgda-1.2/libgda/gda-enum-types.h +include/libgda-1.2/libgda/gda-error.h +include/libgda-1.2/libgda/gda-field.h +include/libgda-1.2/libgda/gda-log.h +include/libgda-1.2/libgda/gda-marshal.h +include/libgda-1.2/libgda/gda-parameter.h +include/libgda-1.2/libgda/gda-quark-list.h +include/libgda-1.2/libgda/gda-row.h +include/libgda-1.2/libgda/gda-select.h +include/libgda-1.2/libgda/gda-server-provider.h +include/libgda-1.2/libgda/gda-table.h +include/libgda-1.2/libgda/gda-transaction.h +include/libgda-1.2/libgda/gda-util.h +include/libgda-1.2/libgda/gda-value.h +include/libgda-1.2/libgda/gda-xml-connection.h +include/libgda-1.2/libgda/gda-xml-database.h +include/libgda-1.2/libgda/gda-xml-document.h +include/libgda-1.2/libgda/gda-xql-atom.h +include/libgda-1.2/libgda/gda-xql-bin.h +include/libgda-1.2/libgda/gda-xql-column.h +include/libgda-1.2/libgda/gda-xql-const.h +include/libgda-1.2/libgda/gda-xql-delete.h +include/libgda-1.2/libgda/gda-xql-dml.h +include/libgda-1.2/libgda/gda-xql-dual.h +include/libgda-1.2/libgda/gda-xql-field.h +include/libgda-1.2/libgda/gda-xql-func.h +include/libgda-1.2/libgda/gda-xql-insert.h +include/libgda-1.2/libgda/gda-xql-item.h +include/libgda-1.2/libgda/gda-xql-join.h +include/libgda-1.2/libgda/gda-xql-list.h +include/libgda-1.2/libgda/gda-xql-query.h +include/libgda-1.2/libgda/gda-xql-select.h +include/libgda-1.2/libgda/gda-xql-stack.h +include/libgda-1.2/libgda/gda-xql-target.h +include/libgda-1.2/libgda/gda-xql-update.h +include/libgda-1.2/libgda/gda-xql-utils.h +include/libgda-1.2/libgda/gda-xql-value.h +include/libgda-1.2/libgda/gda-xql-valueref.h +include/libgda-1.2/libgda/libgda.h +include/libgda-1.2/sql/sql_parser.h lib/libgda-2.a lib/libgda-2.so -lib/libgda-2.so.2 +lib/libgda-2.so.3 lib/libgda-report-2.a lib/libgda-report-2.so -lib/libgda-report-2.so.2 +lib/libgda-report-2.so.3 lib/libgdasql.a lib/libgdasql.so -lib/libgdasql.so.0 +lib/libgdasql.so.3 %%FIREBIRD:%%lib/libgda/providers/libgda-firebird.so %%FREETDS:%%lib/libgda/providers/libgda-freetds.so %%LDAP:%%lib/libgda/providers/libgda-ldap.so @@ -87,7 +87,10 @@ lib/libgdasql.so.0 lib/libgda/providers/libgda-xml.so libdata/pkgconfig/libgda.pc %%DOCSDIR%%/architecture.html -%%DOCSDIR%%/c694.html +%%DOCSDIR%%/ch06.html +%%DOCSDIR%%/ch09s04.html +%%DOCSDIR%%/ch09s05.html +%%DOCSDIR%%/ch09s06.html %%DOCSDIR%%/compiling.html %%DOCSDIR%%/connecting.html %%DOCSDIR%%/connections.html @@ -104,13 +107,63 @@ libdata/pkgconfig/libgda.pc %%DOCSDIR%%/fdl-section9.html %%DOCSDIR%%/fdl-using.html %%DOCSDIR%%/fdl.html -%%DOCSDIR%%/gdavalue.html +%%DOCSDIR%%/home.png %%DOCSDIR%%/index.html %%DOCSDIR%%/index.sgml %%DOCSDIR%%/installation-configuring.html %%DOCSDIR%%/installation-installing.html %%DOCSDIR%%/installation.html %%DOCSDIR%%/introduction.html +%%DOCSDIR%%/left.png +%%DOCSDIR%%/libgda.devhelp +%%DOCSDIR%%/libgda-GdaClient.html +%%DOCSDIR%%/libgda-GdaConnection.html +%%DOCSDIR%%/libgda-GdaDataModel.html +%%DOCSDIR%%/libgda-GdaDataModelArray.html +%%DOCSDIR%%/libgda-GdaDataModelHash.html +%%DOCSDIR%%/libgda-GdaDataModelList.html +%%DOCSDIR%%/libgda-GdaError.html +%%DOCSDIR%%/libgda-GdaExport.html +%%DOCSDIR%%/libgda-GdaReportDocument.html +%%DOCSDIR%%/libgda-GdaReportItem.html +%%DOCSDIR%%/libgda-GdaReportItemDetail.html +%%DOCSDIR%%/libgda-GdaReportItemLabel.html +%%DOCSDIR%%/libgda-GdaReportItemPageFooter.html +%%DOCSDIR%%/libgda-GdaReportItemPageHeader.html +%%DOCSDIR%%/libgda-GdaReportItemRepField.html +%%DOCSDIR%%/libgda-GdaReportItemReport.html +%%DOCSDIR%%/libgda-GdaReportItemReportFooter.html +%%DOCSDIR%%/libgda-GdaReportItemReportHeader.html +%%DOCSDIR%%/libgda-GdaReportItemSqlQuery.html +%%DOCSDIR%%/libgda-GdaReportResult.html +%%DOCSDIR%%/libgda-GdaReportValid.html +%%DOCSDIR%%/libgda-GdaSelect.html +%%DOCSDIR%%/libgda-GdaServerProvider.html +%%DOCSDIR%%/libgda-GdaTable.html +%%DOCSDIR%%/libgda-GdaTransaction.html +%%DOCSDIR%%/libgda-GdaXmlConnection.html +%%DOCSDIR%%/libgda-GdaXmlDatabase.html +%%DOCSDIR%%/libgda-GdaXmlDocument.html +%%DOCSDIR%%/libgda-GdaXqlAtom.html +%%DOCSDIR%%/libgda-GdaXqlBin.html +%%DOCSDIR%%/libgda-GdaXqlColumn.html +%%DOCSDIR%%/libgda-GdaXqlConst.html +%%DOCSDIR%%/libgda-GdaXqlDelete.html +%%DOCSDIR%%/libgda-GdaXqlDml.html +%%DOCSDIR%%/libgda-GdaXqlDual.html +%%DOCSDIR%%/libgda-GdaXqlField.html +%%DOCSDIR%%/libgda-GdaXqlFunc.html +%%DOCSDIR%%/libgda-GdaXqlInsert.html +%%DOCSDIR%%/libgda-GdaXqlItem.html +%%DOCSDIR%%/libgda-GdaXqlJoin.html +%%DOCSDIR%%/libgda-GdaXqlList.html +%%DOCSDIR%%/libgda-GdaXqlQuery.html +%%DOCSDIR%%/libgda-GdaXqlSelect.html +%%DOCSDIR%%/libgda-GdaXqlStack.html +%%DOCSDIR%%/libgda-GdaXqlTarget.html +%%DOCSDIR%%/libgda-GdaXqlUpdate.html +%%DOCSDIR%%/libgda-GdaXqlValue.html +%%DOCSDIR%%/libgda-GdaXqlValueRef.html %%DOCSDIR%%/libgda-api.html %%DOCSDIR%%/libgda-gda-blob.html %%DOCSDIR%%/libgda-gda-command.html @@ -124,69 +177,23 @@ libdata/pkgconfig/libgda.pc %%DOCSDIR%%/libgda-gda-util.html %%DOCSDIR%%/libgda-gda-value.html %%DOCSDIR%%/libgda-gda-xql-utils.html -%%DOCSDIR%%/libgda-gdaclient.html -%%DOCSDIR%%/libgda-gdaconnection.html -%%DOCSDIR%%/libgda-gdadatamodel.html -%%DOCSDIR%%/libgda-gdadatamodelarray.html -%%DOCSDIR%%/libgda-gdadatamodelhash.html -%%DOCSDIR%%/libgda-gdadatamodellist.html -%%DOCSDIR%%/libgda-gdaerror.html -%%DOCSDIR%%/libgda-gdaexport.html -%%DOCSDIR%%/libgda-gdareportdocument.html -%%DOCSDIR%%/libgda-gdareportitem.html -%%DOCSDIR%%/libgda-gdareportitemdetail.html -%%DOCSDIR%%/libgda-gdareportitemlabel.html -%%DOCSDIR%%/libgda-gdareportitempagefooter.html -%%DOCSDIR%%/libgda-gdareportitempageheader.html -%%DOCSDIR%%/libgda-gdareportitemrepfield.html -%%DOCSDIR%%/libgda-gdareportitemreport.html -%%DOCSDIR%%/libgda-gdareportitemreportfooter.html -%%DOCSDIR%%/libgda-gdareportitemreportheader.html -%%DOCSDIR%%/libgda-gdareportitemsqlquery.html -%%DOCSDIR%%/libgda-gdareportresult.html -%%DOCSDIR%%/libgda-gdareportvalid.html -%%DOCSDIR%%/libgda-gdaselect.html -%%DOCSDIR%%/libgda-gdaserverprovider.html -%%DOCSDIR%%/libgda-gdatable.html -%%DOCSDIR%%/libgda-gdatransaction.html -%%DOCSDIR%%/libgda-gdaxmlconnection.html -%%DOCSDIR%%/libgda-gdaxmldatabase.html -%%DOCSDIR%%/libgda-gdaxmldocument.html -%%DOCSDIR%%/libgda-gdaxqlatom.html -%%DOCSDIR%%/libgda-gdaxqlbin.html -%%DOCSDIR%%/libgda-gdaxqlcolumn.html -%%DOCSDIR%%/libgda-gdaxqlconst.html -%%DOCSDIR%%/libgda-gdaxqldelete.html -%%DOCSDIR%%/libgda-gdaxqldml.html -%%DOCSDIR%%/libgda-gdaxqldual.html -%%DOCSDIR%%/libgda-gdaxqlfield.html -%%DOCSDIR%%/libgda-gdaxqlfunc.html -%%DOCSDIR%%/libgda-gdaxqlinsert.html -%%DOCSDIR%%/libgda-gdaxqlitem.html -%%DOCSDIR%%/libgda-gdaxqljoin.html -%%DOCSDIR%%/libgda-gdaxqllist.html -%%DOCSDIR%%/libgda-gdaxqlquery.html -%%DOCSDIR%%/libgda-gdaxqlselect.html -%%DOCSDIR%%/libgda-gdaxqlstack.html -%%DOCSDIR%%/libgda-gdaxqltarget.html -%%DOCSDIR%%/libgda-gdaxqlupdate.html -%%DOCSDIR%%/libgda-gdaxqlvalue.html -%%DOCSDIR%%/libgda-gdaxqlvalueref.html %%DOCSDIR%%/libgda-libgda.html %%DOCSDIR%%/libgda-provider-class.html %%DOCSDIR%%/libgda-provider-recordset.html %%DOCSDIR%%/libgda-providers.html %%DOCSDIR%%/libgda-reports.html +%%DOCSDIR%%/libgda-server-provider-details.html %%DOCSDIR%%/libgda-xql.html %%DOCSDIR%%/main_example.html +%%DOCSDIR%%/manage-gdavalue.html %%DOCSDIR%%/managing-errors.html %%DOCSDIR%%/migration-configuration.html %%DOCSDIR%%/migration-executing-commands.html %%DOCSDIR%%/migration.html %%DOCSDIR%%/processing-queries.html -%%DOCSDIR%%/x863.html -%%DOCSDIR%%/x892.html -%%DOCSDIR%%/x897.html +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png share/gnome/libgda/xml/gda-report.dtd share/gnome/libgda/xml/gda-report-result.dtd share/gnome/libgda/xml/gda-xml-query.dtd @@ -208,12 +215,12 @@ share/locale/ga/LC_MESSAGES/libgda-2.mo share/locale/gl/LC_MESSAGES/libgda-2.mo share/locale/hr/LC_MESSAGES/libgda-2.mo share/locale/hu/LC_MESSAGES/libgda-2.mo -share/locale/id/LC_MESSAGES/libgda-2.mo share/locale/it/LC_MESSAGES/libgda-2.mo share/locale/ja/LC_MESSAGES/libgda-2.mo share/locale/ko/LC_MESSAGES/libgda-2.mo share/locale/ml/LC_MESSAGES/libgda-2.mo share/locale/ms/LC_MESSAGES/libgda-2.mo +share/locale/nb/LC_MESSAGES/libgda-2.mo share/locale/nl/LC_MESSAGES/libgda-2.mo share/locale/no/LC_MESSAGES/libgda-2.mo share/locale/pl/LC_MESSAGES/libgda-2.mo @@ -222,6 +229,7 @@ share/locale/pt_BR/LC_MESSAGES/libgda-2.mo share/locale/ru/LC_MESSAGES/libgda-2.mo share/locale/sk/LC_MESSAGES/libgda-2.mo share/locale/sl/LC_MESSAGES/libgda-2.mo +share/locale/sq/LC_MESSAGES/libgda-2.mo share/locale/sr/LC_MESSAGES/libgda-2.mo share/locale/sr@Latn/LC_MESSAGES/libgda-2.mo share/locale/sv/LC_MESSAGES/libgda-2.mo @@ -235,7 +243,8 @@ share/locale/zh_TW/LC_MESSAGES/libgda-2.mo @dirrm share/gnome/libgda @dirrm lib/libgda/providers @dirrm lib/libgda -@dirrm include/libgda/sql -@dirrm include/libgda -@dirrm include/libgda-report +@dirrm include/libgda-1.2/sql +@dirrm include/libgda-1.2/libgda-report +@dirrm include/libgda-1.2/libgda +@dirrm include/libgda-1.2 @dirrm etc/libgda diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile index 18166163a64b..d82b6a0cd70c 100644 --- a/databases/libgnomedb/Makefile +++ b/databases/libgnomedb/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libgnomedb -PORTVERSION= 1.0.4 -PORTREVISION= 2 +PORTVERSION= 1.2.1 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/libgnomedb/1.0 +MASTER_SITE_SUBDIR= sources/libgnomedb/1.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -20,8 +19,8 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeui libgda2 gtksourceview \ - intlhack lthack -USE_INC_LIBTOOL_VER= 13 + intlhack +USE_LIBTOOL_VER=15 INSTALLS_OMF= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/databases/libgnomedb/distinfo b/databases/libgnomedb/distinfo index 55a23e5cd28d..223a42243fa1 100644 --- a/databases/libgnomedb/distinfo +++ b/databases/libgnomedb/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomedb-1.0.4.tar.bz2) = 956ddc8ddb3f4a2594a52b8a1b783f29 -SIZE (gnome2/libgnomedb-1.0.4.tar.bz2) = 621983 +MD5 (gnome2/libgnomedb-1.2.1.tar.bz2) = 5e2ff4eaa2bdb02493af4e21b5f5bf8b +SIZE (gnome2/libgnomedb-1.2.1.tar.bz2) = 645167 diff --git a/databases/libgnomedb/files/patch-Makefile.in b/databases/libgnomedb/files/patch-Makefile.in index ad0f1fd1b43e..c23a0014f8f1 100644 --- a/databases/libgnomedb/files/patch-Makefile.in +++ b/databases/libgnomedb/files/patch-Makefile.in @@ -1,12 +1,12 @@ ---- Makefile.in.orig Sun Apr 18 16:19:21 2004 -+++ Makefile.in Sun Apr 18 16:19:38 2004 -@@ -212,8 +212,7 @@ - - @BUILD_WITH_GNOME_TRUE@GNOME_DIRECTORY = control-center components monikers - --@ENABLE_GTK_DOC_TRUE@DOC_DIRECTORY = doc +--- Makefile.in.orig Thu Jul 22 10:56:33 2004 ++++ Makefile.in Thu Jul 22 10:57:14 2004 +@@ -251,8 +251,7 @@ + @HAVE_LIBGLADE_TRUE@LIBGLADE_DIRECTORY = glade + @BUILD_WITH_GNOME_FALSE@GNOME_DIRECTORY = + @BUILD_WITH_GNOME_TRUE@GNOME_DIRECTORY = control-center -@ENABLE_GTK_DOC_FALSE@DOC_DIRECTORY = +-@ENABLE_GTK_DOC_TRUE@DOC_DIRECTORY = doc +DOC_DIRECTORY = doc - SUBDIRS = \ po \ + libgnomedb \ diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-data-source-selector.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-data-source-selector.c deleted file mode 100644 index b652611d1d51..000000000000 --- a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-data-source-selector.c +++ /dev/null @@ -1,37 +0,0 @@ -2004-04-18 Joe Marcus Clarke <marcus@FreeBSD.org> - -* libgnomedb/gnome-db-data-source-selector.c: (show_data_sources): - -Be sure to add something to the DSN menu so that this menu gets initialized. -Failure to do so will cause a segmentation fault when trying to login to -the database. - ---- libgnomedb/gnome-db-data-source-selector.c.orig Sun Apr 18 21:41:59 2004 -+++ libgnomedb/gnome-db-data-source-selector.c Sun Apr 18 21:43:20 2004 -@@ -61,8 +61,25 @@ - dsn_info->name); - gnome_db_config_free_data_source_info (dsn_info); - } -- else -+ else { -+ GList *dsn_list; -+ GList *l; -+ -+ /* load data sources */ -+ dsn_list = gnome_db_config_get_data_source_list (); -+ for (l = dsn_list; l != NULL; l = l->next) { -+ GdaDataSourceInfo *dsn_info = (GdaDataSourceInfo *) l->data; -+ -+ if (!dsn_info) -+ continue; -+ -+ /* add the data source to the option menu */ -+ gnome_db_option_menu_add_item (GTK_OPTION_MENU (selector), dsn_info->name); -+ } -+ -+ gnome_db_config_free_data_source_list (dsn_list); - gtk_option_menu_set_history (GTK_OPTION_MENU (selector), 0); -+ } - } - - /* diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c new file mode 100644 index 000000000000..27555ef8d7e3 --- /dev/null +++ b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c @@ -0,0 +1,16 @@ +--- libgnomedb/gnome-db-find-dialog.c.orig Thu Jul 22 17:40:26 2004 ++++ libgnomedb/gnome-db-find-dialog.c Thu Jul 22 17:41:02 2004 +@@ -216,11 +216,12 @@ + GtkWidget * + gnome_db_find_dialog_new_with_model (const gchar *title, GdaDataModel *dm) + { ++ GnomeDbFindDialog *dialog; + g_return_val_if_fail (GDA_IS_DATA_MODEL (dm), NULL); + + g_object_ref (dm); + +- GnomeDbFindDialog *dialog = gnome_db_find_dialog_new (title); ++ dialog = gnome_db_find_dialog_new (title); + gnome_db_find_dialog_add_fields_from_model (dialog, dm); + + g_object_unref (dm); diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-form.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-form.c deleted file mode 100644 index 392c7d06ec20..000000000000 --- a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-form.c +++ /dev/null @@ -1,10 +0,0 @@ ---- libgnomedb/gnome-db-form.c.orig Mon Aug 2 10:13:56 2004 -+++ libgnomedb/gnome-db-form.c Mon Aug 2 10:14:09 2004 -@@ -582,6 +582,6 @@ - form->priv->navigator_current_row = row; - show_navigator_row (form); - break; -- case GNOME_DB_FORM_TYPE_LIST : -+ case GNOME_DB_FORM_TYPE_LIST :; - } - } diff --git a/databases/libgnomedb/files/patch-libgnomedb_utils.c b/databases/libgnomedb/files/patch-libgnomedb_utils.c deleted file mode 100644 index 92979f008432..000000000000 --- a/databases/libgnomedb/files/patch-libgnomedb_utils.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomedb/utils.c.orig Mon Aug 2 10:12:06 2004 -+++ libgnomedb/utils.c Mon Aug 2 10:12:16 2004 -@@ -45,7 +45,7 @@ - dialog = gnome_db_error_dialog_new (_("Error")); - gnome_db_error_dialog_show_errors (GNOME_DB_ERROR_DIALOG (dialog), - gda_connection_get_errors (cnc)); -- default : -+ default :; - } - } - diff --git a/databases/libgnomedb/files/patch-po::Makefile.in.in b/databases/libgnomedb/files/patch-po::Makefile.in.in new file mode 100644 index 000000000000..2e0e6e70ee75 --- /dev/null +++ b/databases/libgnomedb/files/patch-po::Makefile.in.in @@ -0,0 +1,10 @@ +--- po/Makefile.in.in.orig Thu Jul 22 11:06:21 2004 ++++ po/Makefile.in.in Thu Jul 22 11:06:58 2004 +@@ -35,6 +35,7 @@ + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + + CC = @CC@ + GENCAT = @GENCAT@ diff --git a/databases/libgnomedb/pkg-plist b/databases/libgnomedb/pkg-plist index a7c91a4d5591..0f6a2c9ef98d 100644 --- a/databases/libgnomedb/pkg-plist +++ b/databases/libgnomedb/pkg-plist @@ -1,91 +1,95 @@ bin/gnome-database-properties -include/libgnomedb/gnome-db-browser.h -include/libgnomedb/gnome-db-combo.h -include/libgnomedb/gnome-db-config.h -include/libgnomedb/gnome-db-connection-properties.h -include/libgnomedb/gnome-db-connection-selector.h -include/libgnomedb/gnome-db-control-widget.h -include/libgnomedb/gnome-db-control.h -include/libgnomedb/gnome-db-data-source-selector.h -include/libgnomedb/gnome-db-dsn-config-druid.h -include/libgnomedb/gnome-db-dsn-config.h -include/libgnomedb/gnome-db-editor.h -include/libgnomedb/gnome-db-error-dialog.h -include/libgnomedb/gnome-db-error.h -include/libgnomedb/gnome-db-form.h -include/libgnomedb/gnome-db-gray-bar.h -include/libgnomedb/gnome-db-grid.h -include/libgnomedb/gnome-db-i18n.h -include/libgnomedb/gnome-db-icon-list.h -include/libgnomedb/gnome-db-list.h -include/libgnomedb/gnome-db-login-dialog.h -include/libgnomedb/gnome-db-login.h -include/libgnomedb/gnome-db-model.h -include/libgnomedb/gnome-db-provider-selector.h -include/libgnomedb/gnome-db-query-builder.h -include/libgnomedb/gnome-db-report-editor.h -include/libgnomedb/gnome-db-stock.h -include/libgnomedb/gnome-db-table-editor.h -include/libgnomedb/gnome-db-util.h -include/libgnomedb/libgnomedb.h -lib/bonobo/monikers/libmoniker_database.so +include/libgnomedb-1.2/libgnomedb/gnome-db-browser.h +include/libgnomedb-1.2/libgnomedb/gnome-db-combo.h +include/libgnomedb-1.2/libgnomedb/gnome-db-config.h +include/libgnomedb-1.2/libgnomedb/gnome-db-connection-properties.h +include/libgnomedb-1.2/libgnomedb/gnome-db-connection-selector.h +include/libgnomedb-1.2/libgnomedb/gnome-db-control-widget.h +include/libgnomedb-1.2/libgnomedb/gnome-db-control.h +include/libgnomedb-1.2/libgnomedb/gnome-db-data-source-selector.h +include/libgnomedb-1.2/libgnomedb/gnome-db-dsn-config-druid.h +include/libgnomedb-1.2/libgnomedb/gnome-db-dsn-config.h +include/libgnomedb-1.2/libgnomedb/gnome-db-editor.h +include/libgnomedb-1.2/libgnomedb/gnome-db-error-dialog.h +include/libgnomedb-1.2/libgnomedb/gnome-db-error.h +include/libgnomedb-1.2/libgnomedb/gnome-db-find-dialog.h +include/libgnomedb-1.2/libgnomedb/gnome-db-form.h +include/libgnomedb-1.2/libgnomedb/gnome-db-gray-bar.h +include/libgnomedb-1.2/libgnomedb/gnome-db-grid.h +include/libgnomedb-1.2/libgnomedb/gnome-db-i18n.h +include/libgnomedb-1.2/libgnomedb/gnome-db-icon-list.h +include/libgnomedb-1.2/libgnomedb/gnome-db-list.h +include/libgnomedb-1.2/libgnomedb/gnome-db-login-dialog.h +include/libgnomedb-1.2/libgnomedb/gnome-db-login.h +include/libgnomedb-1.2/libgnomedb/gnome-db-model.h +include/libgnomedb-1.2/libgnomedb/gnome-db-provider-selector.h +include/libgnomedb-1.2/libgnomedb/gnome-db-query-builder.h +include/libgnomedb-1.2/libgnomedb/gnome-db-report-editor.h +include/libgnomedb-1.2/libgnomedb/gnome-db-stock.h +include/libgnomedb-1.2/libgnomedb/gnome-db-table-editor.h +include/libgnomedb-1.2/libgnomedb/gnome-db-util.h +include/libgnomedb-1.2/libgnomedb/libgnomedb.h lib/libglade/2.0/libgnomedb.so lib/libgnomedb-2.a lib/libgnomedb-2.so -lib/libgnomedb-2.so.3 +lib/libgnomedb-2.so.4 libdata/pkgconfig/libgnomedb.pc -libdata/bonobo/servers/GNOME_Database_Components.server -libdata/bonobo/servers/GNOME_Database_Monikers.server -libexec/gnome-database-components -%%DOCSDIR%%/fdl-section1.html -%%DOCSDIR%%/fdl-section10.html -%%DOCSDIR%%/fdl-section2.html -%%DOCSDIR%%/fdl-section3.html -%%DOCSDIR%%/fdl-section4.html -%%DOCSDIR%%/fdl-section5.html -%%DOCSDIR%%/fdl-section6.html -%%DOCSDIR%%/fdl-section7.html -%%DOCSDIR%%/fdl-section8.html -%%DOCSDIR%%/fdl-section9.html -%%DOCSDIR%%/fdl-using.html -%%DOCSDIR%%/fdl.html -%%DOCSDIR%%/index.html -%%DOCSDIR%%/index.sgml -%%DOCSDIR%%/libgnomedb-basic.html -%%DOCSDIR%%/libgnomedb-bonobo.html -%%DOCSDIR%%/libgnomedb-gnome-db-config.html -%%DOCSDIR%%/libgnomedb-gnome-db-model.html -%%DOCSDIR%%/libgnomedb-gnome-db-stock.html -%%DOCSDIR%%/libgnomedb-gnome-db-util.html -%%DOCSDIR%%/libgnomedb-gnomedbbrowser.html -%%DOCSDIR%%/libgnomedb-gnomedbcombo.html -%%DOCSDIR%%/libgnomedb-gnomedbconnectionproperties.html -%%DOCSDIR%%/libgnomedb-gnomedbconnectionselector.html -%%DOCSDIR%%/libgnomedb-gnomedbcontrol.html -%%DOCSDIR%%/libgnomedb-gnomedbcontrolwidget.html -%%DOCSDIR%%/libgnomedb-gnomedbdatasourceselector.html -%%DOCSDIR%%/libgnomedb-gnomedbdsnconfig.html -%%DOCSDIR%%/libgnomedb-gnomedbdsnconfigdruid.html -%%DOCSDIR%%/libgnomedb-gnomedbeditor.html -%%DOCSDIR%%/libgnomedb-gnomedberror.html -%%DOCSDIR%%/libgnomedb-gnomedberrordialog.html -%%DOCSDIR%%/libgnomedb-gnomedbform.html -%%DOCSDIR%%/libgnomedb-gnomedbgraybar.html -%%DOCSDIR%%/libgnomedb-gnomedbgrid.html -%%DOCSDIR%%/libgnomedb-gnomedbiconlist.html -%%DOCSDIR%%/libgnomedb-gnomedblist.html -%%DOCSDIR%%/libgnomedb-gnomedblogin.html -%%DOCSDIR%%/libgnomedb-gnomedblogindialog.html -%%DOCSDIR%%/libgnomedb-gnomedbproviderselector.html -%%DOCSDIR%%/libgnomedb-gnomedbquerybuilder.html -%%DOCSDIR%%/libgnomedb-gnomedbreporteditor.html -%%DOCSDIR%%/libgnomedb-gnomedbtableeditor.html -%%DOCSDIR%%/libgnomedb-gnomedbwindow.html -%%DOCSDIR%%/libgnomedb-introduction.html -%%DOCSDIR%%/libgnomedb-libgnomedb.html -%%DOCSDIR%%/libgnomedb-widgets.html share/gnome/control-center-2.0/capplets/database-properties.desktop share/gnome/gnome-db/ui/db-shell.xml +share/gnome/gtk-doc/html/libgnomedb/fdl-section1.html +share/gnome/gtk-doc/html/libgnomedb/fdl-section10.html +share/gnome/gtk-doc/html/libgnomedb/fdl-section2.html +share/gnome/gtk-doc/html/libgnomedb/fdl-section3.html +share/gnome/gtk-doc/html/libgnomedb/fdl-section4.html +share/gnome/gtk-doc/html/libgnomedb/fdl-section5.html +share/gnome/gtk-doc/html/libgnomedb/fdl-section6.html +share/gnome/gtk-doc/html/libgnomedb/fdl-section7.html +share/gnome/gtk-doc/html/libgnomedb/fdl-section8.html +share/gnome/gtk-doc/html/libgnomedb/fdl-section9.html +share/gnome/gtk-doc/html/libgnomedb/fdl-using.html +share/gnome/gtk-doc/html/libgnomedb/fdl.html +share/gnome/gtk-doc/html/libgnomedb/home.png +share/gnome/gtk-doc/html/libgnomedb/index.html +share/gnome/gtk-doc/html/libgnomedb/index.sgml +share/gnome/gtk-doc/html/libgnomedb/left.png +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbBrowser.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbCombo.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbConnectionProperties.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbConnectionSelector.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbControl.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbControlWidget.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbDataSourceSelector.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbDsnConfig.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbDsnConfigDruid.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbEditor.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbError.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbErrorDialog.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbFindDialog.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbForm.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbGrayBar.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbGrid.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbIconList.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbList.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbLogin.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbLoginDialog.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbProviderSelector.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbQueryBuilder.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbReportEditor.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbTableEditor.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbWindow.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-basic.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-bonobo.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-config.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-model.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-stock.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-util.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-introduction.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-libgnomedb.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-widgets.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb.devhelp +share/gnome/gtk-doc/html/libgnomedb/right.png +share/gnome/gtk-doc/html/libgnomedb/style.css +share/gnome/gtk-doc/html/libgnomedb/up.png share/gnome/mime-info/libgnomedb.keys share/gnome/mime-info/libgnomedb.mime share/gnome/omf/libgnomedb/libgnomedb-C.omf @@ -99,12 +103,15 @@ share/gnome/pixmaps/libgnomedb/gnome-db-database_24x24.png share/gnome/pixmaps/libgnomedb/gnome-db-database_48x48.png share/gnome/pixmaps/libgnomedb/gnome-db-designer_24x24.png share/gnome/pixmaps/libgnomedb/gnome-db-disconnect_24x24.png +share/gnome/pixmaps/libgnomedb/gnome-db-field_16x16.png share/gnome/pixmaps/libgnomedb/gnome-db-indexes_16x16.png share/gnome/pixmaps/libgnomedb/gnome-db-no-transaction_24x24.png share/gnome/pixmaps/libgnomedb/gnome-db-procedures_16x16.png share/gnome/pixmaps/libgnomedb/gnome-db-procedures_24x24.png share/gnome/pixmaps/libgnomedb/gnome-db-query_16x16.png share/gnome/pixmaps/libgnomedb/gnome-db-query_24x24.png +share/gnome/pixmaps/libgnomedb/gnome-db-relations_16x16.png +share/gnome/pixmaps/libgnomedb/gnome-db-relations_24x24.png share/gnome/pixmaps/libgnomedb/gnome-db-rollback_24x24.png share/gnome/pixmaps/libgnomedb/gnome-db-sequences_16x16.png share/gnome/pixmaps/libgnomedb/gnome-db-sequences_24x24.png @@ -136,12 +143,13 @@ share/locale/ga/LC_MESSAGES/libgnomedb-2.mo share/locale/gl/LC_MESSAGES/libgnomedb-2.mo share/locale/hr/LC_MESSAGES/libgnomedb-2.mo share/locale/hu/LC_MESSAGES/libgnomedb-2.mo -share/locale/id/LC_MESSAGES/libgnomedb-2.mo share/locale/it/LC_MESSAGES/libgnomedb-2.mo share/locale/ja/LC_MESSAGES/libgnomedb-2.mo +share/locale/ka/LC_MESSAGES/libgnomedb-2.mo share/locale/ko/LC_MESSAGES/libgnomedb-2.mo share/locale/ml/LC_MESSAGES/libgnomedb-2.mo share/locale/ms/LC_MESSAGES/libgnomedb-2.mo +share/locale/nb/LC_MESSAGES/libgnomedb-2.mo share/locale/nl/LC_MESSAGES/libgnomedb-2.mo share/locale/no/LC_MESSAGES/libgnomedb-2.mo share/locale/pl/LC_MESSAGES/libgnomedb-2.mo @@ -150,6 +158,7 @@ share/locale/pt_BR/LC_MESSAGES/libgnomedb-2.mo share/locale/ru/LC_MESSAGES/libgnomedb-2.mo share/locale/sk/LC_MESSAGES/libgnomedb-2.mo share/locale/sl/LC_MESSAGES/libgnomedb-2.mo +share/locale/sq/LC_MESSAGES/libgnomedb-2.mo share/locale/sr/LC_MESSAGES/libgnomedb-2.mo share/locale/sr@Latn/LC_MESSAGES/libgnomedb-2.mo share/locale/sv/LC_MESSAGES/libgnomedb-2.mo @@ -161,7 +170,10 @@ share/locale/zh_CN/LC_MESSAGES/libgnomedb-2.mo share/locale/zh_TW/LC_MESSAGES/libgnomedb-2.mo @dirrm share/gnome/pixmaps/libgnomedb @dirrm share/gnome/omf/libgnomedb +@dirrm share/gnome/gtk-doc/html/libgnomedb +@unexec rmdir %D/share/gnome/gtk-doc/html 2> /dev/null || true +@unexec rmdir %D/share/gnome/gtk-doc 2> /dev/null || true @dirrm share/gnome/gnome-db/ui @dirrm share/gnome/gnome-db -@dirrm %%DOCSDIR%% -@dirrm include/libgnomedb +@dirrm include/libgnomedb-1.2/libgnomedb +@dirrm include/libgnomedb-1.2 diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile index 83797f1daf3c..fed889a3479d 100644 --- a/databases/mergeant/Makefile +++ b/databases/mergeant/Makefile @@ -6,11 +6,11 @@ # PORTNAME= mergeant -PORTVERSION= 0.12.1 -PORTREVISION= 3 +PORTVERSION= 0.52 +PORTREVISION= 2 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.12 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.52 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -18,11 +18,12 @@ COMMENT= Provide uniform access to data sources for the GNOME 2 environment USE_BZIP2= yes USE_X_PREFIX= yes -INSTALLS_OMF= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack libgnomedb libgnomeprintui +USE_GNOME= gnomeprefix intlhack gnomehack libgnomedb libgnomeprintui USE_PERL5= yes -USE_LIBTOOL_VER= 15 +USE_LIBTOOL_VER=15 +INSTALLS_OMF= yes +INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/databases/mergeant/distinfo b/databases/mergeant/distinfo index dfe2c3e931bd..9289ea8c7364 100644 --- a/databases/mergeant/distinfo +++ b/databases/mergeant/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/mergeant-0.12.1.tar.bz2) = 42a2f6778b81409db6cd1baa49663dca -SIZE (gnome2/mergeant-0.12.1.tar.bz2) = 1204581 +MD5 (gnome2/mergeant-0.52.tar.bz2) = e9f96b824e452e9b9406b4c11f005b95 +SIZE (gnome2/mergeant-0.52.tar.bz2) = 2058623 diff --git a/databases/mergeant/files/patch-doc_libmergeant_C_Makefile.in b/databases/mergeant/files/patch-doc_libmergeant_C_Makefile.in new file mode 100644 index 000000000000..52e62979ef48 --- /dev/null +++ b/databases/mergeant/files/patch-doc_libmergeant_C_Makefile.in @@ -0,0 +1,11 @@ +--- doc/libmergeant/C/Makefile.in.orig Sat Aug 14 04:12:49 2004 ++++ doc/libmergeant/C/Makefile.in Sat Aug 14 04:13:07 2004 +@@ -214,7 +214,7 @@ + + # The name of the module. + DOC_MODULE = libmergeant +-HTML_DIR = $(datadir)/gtk-doc/html ++HTML_DIR = $(prefix)/share/doc + + # The top-level SGML file. + DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml diff --git a/databases/mergeant/files/patch-lib_Makefile.in b/databases/mergeant/files/patch-lib_Makefile.in deleted file mode 100644 index f65cecae49d6..000000000000 --- a/databases/mergeant/files/patch-lib_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/Makefile.in.orig Sat Sep 14 18:40:05 2002 -+++ lib/Makefile.in Sat Sep 14 18:40:22 2002 -@@ -120,7 +120,7 @@ - - noinst_LTLIBRARIES = libgdbshared.la - --INCLUDES = $(MERGEANT_CFLAGS) -DGNOMEDB_PIXMAPDIR=\""$(datadir)/pixmaps/libgnomedb"\" -DGNOMEDB_DATADIR=\""$(datadir)"\" -DGNOMEDB_LOCALEDIR=\""$(prefix)/share/locale"\" -+INCLUDES = $(MERGEANT_CFLAGS) -DGNOMEDB_PIXMAPDIR=\""$(datadir)/pixmaps/libgnomedb"\" -DGNOMEDB_DATADIR=\""$(datadir)"\" -DGNOMEDB_LOCALEDIR=\""$(datadir)/locale"\" - - - libgdbshared_headers = gnome-db-shortcut.h diff --git a/databases/mergeant/files/patch-libmergeant_graph_mg-canvas-field.c b/databases/mergeant/files/patch-libmergeant_graph_mg-canvas-field.c new file mode 100644 index 000000000000..15005003ecdb --- /dev/null +++ b/databases/mergeant/files/patch-libmergeant_graph_mg-canvas-field.c @@ -0,0 +1,17 @@ +--- libmergeant/graph/mg-canvas-field.c.orig Sat Aug 14 04:04:07 2004 ++++ libmergeant/graph/mg-canvas-field.c Sat Aug 14 04:04:40 2004 +@@ -146,13 +146,13 @@ + gpointer ptr; + GString *string; + MgServerDataType *dtype; ++ MgEntity *ent; + + cf = MG_CANVAS_FIELD (object); + + switch (param_id) { + case PROP_FIELD: + ptr = g_value_get_pointer (value); +- MgEntity *ent; + g_return_if_fail (IS_MG_FIELD (ptr)); + + /* signals management */ diff --git a/databases/mergeant/files/patch-libmergeant_mg-form.c b/databases/mergeant/files/patch-libmergeant_mg-form.c new file mode 100644 index 000000000000..168e15c413d3 --- /dev/null +++ b/databases/mergeant/files/patch-libmergeant_mg-form.c @@ -0,0 +1,19 @@ +--- libmergeant/mg-form.c.orig Thu Aug 12 22:24:32 2004 ++++ libmergeant/mg-form.c Thu Aug 12 22:24:48 2004 +@@ -586,6 +586,7 @@ + { + PangoAttrList *attrs = NULL; + PangoAttribute *att; ++ GSList *list; + + if (show_mark) { + attrs = pango_attr_list_new (); +@@ -595,7 +596,7 @@ + pango_attr_list_insert (attrs, att); + } + +- GSList *list = form->priv->not_null_labels; ++ list = form->priv->not_null_labels; + while (list) { + gtk_label_set_attributes (GTK_LABEL (list->data), attrs); + list = g_slist_next (list); diff --git a/databases/mergeant/files/patch-libmergeant_mg-parameter.c b/databases/mergeant/files/patch-libmergeant_mg-parameter.c new file mode 100644 index 000000000000..60bfe9b4205c --- /dev/null +++ b/databases/mergeant/files/patch-libmergeant_mg-parameter.c @@ -0,0 +1,13 @@ +--- libmergeant/mg-parameter.c.orig Thu Aug 12 22:25:38 2004 ++++ libmergeant/mg-parameter.c Thu Aug 12 22:25:53 2004 +@@ -608,9 +608,9 @@ + mg_parameter_set_value (MgParameter *param, const GdaValue *value) + { + gboolean changed = TRUE; ++ const GdaValue *current_val; + g_return_if_fail (param && IS_MG_PARAMETER (param)); + g_return_if_fail (param->priv); +- const GdaValue *current_val; + + param->priv->invalid_forced = FALSE; + diff --git a/databases/mergeant/files/patch-libmergeant_mg-query.c b/databases/mergeant/files/patch-libmergeant_mg-query.c new file mode 100644 index 000000000000..41bf5bf1a138 --- /dev/null +++ b/databases/mergeant/files/patch-libmergeant_mg-query.c @@ -0,0 +1,25 @@ +--- libmergeant/mg-query.c.orig Sun Aug 8 11:20:06 2004 ++++ libmergeant/mg-query.c Wed Jan 5 02:07:47 2005 +@@ -44,7 +44,7 @@ + #include "mg-server-aggregate.h" + #include "mg-data-handler.h" + +-#include <libgda/sql/sql_parser.h> ++#include <libgda-1.2/sql/sql_parser.h> + #include "mg-qf-func.h" + + /* +@@ -5117,9 +5117,11 @@ + if (!cond) + has_error = TRUE; + else { ++ MgQfield *field_left; ++ MgQfield *field_right; + g_assert (mg_condition_get_cond_type (cond) == MG_CONDITION_LEAF_EQUAL); +- MgQfield *field_left = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_LEFT); +- MgQfield *field_right = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_RIGHT); ++ field_left = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_LEFT); ++ field_right = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_RIGHT); + + if (IS_MG_QF_FIELD (field_left)) { + g_object_set (G_OBJECT (field_left), "value_provider", field_right, NULL); diff --git a/databases/mergeant/files/patch-libmergeant_mg-work-grid.c b/databases/mergeant/files/patch-libmergeant_mg-work-grid.c new file mode 100644 index 000000000000..b9a36b2e18d2 --- /dev/null +++ b/databases/mergeant/files/patch-libmergeant_mg-work-grid.c @@ -0,0 +1,14 @@ +--- libmergeant/mg-work-grid.c.orig Sat Aug 14 03:59:47 2004 ++++ libmergeant/mg-work-grid.c Sat Aug 14 04:00:02 2004 +@@ -2299,10 +2299,10 @@ + GtkTreeModel *tree_model, GtkTreeIter *iter, + MgWorkCore *core, MgDataEntryAttribute requested_status) + { +- g_return_if_fail (user_modif); + guint attrs; + GtkTreePath *path; + gint row; ++ g_return_if_fail (user_modif); + + switch (requested_status) { + case MG_DATA_ENTRY_IS_NULL: diff --git a/databases/mergeant/files/patch-src_Makefile.in b/databases/mergeant/files/patch-src_Makefile.in deleted file mode 100644 index 1e4f74872a9b..000000000000 --- a/databases/mergeant/files/patch-src_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig Thu Jul 29 09:01:30 2004 -+++ src/Makefile.in Thu Jul 29 09:01:40 2004 -@@ -141,7 +141,7 @@ - mergeant_LDADD = $(MERGEANT_LIBS) $(top_builddir)/lib/libmergeant.la query-fields/libqueryfields.a - - --mergeant_LDFLAGS = -export-dynamic -dlopen -+mergeant_LDFLAGS = -export-dynamic - mergeant_DEPENDENCIES = query-fields/libqueryfields.a - - DTD_FILES = mergeant.dtd diff --git a/databases/mergeant/files/patch-src_interface_cb.c b/databases/mergeant/files/patch-src_interface_cb.c deleted file mode 100644 index 6cbd2d2b3f63..000000000000 --- a/databases/mergeant/files/patch-src_interface_cb.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/interface_cb.c.orig Mon Aug 2 13:38:56 2004 -+++ src/interface_cb.c Mon Aug 2 13:39:10 2004 -@@ -2209,6 +2209,6 @@ - gnome_db_error_dialog_show_errors (GNOME_DB_ERROR_DIALOG (conf->error_dlg), - gda_connection_get_errors (cnc)); - break; -- default : -+ default :; - } - } diff --git a/databases/mergeant/files/patch-src_plugins_netaddr_makefile.in b/databases/mergeant/files/patch-src_plugins_netaddr_makefile.in deleted file mode 100644 index 65ae9e7248d0..000000000000 --- a/databases/mergeant/files/patch-src_plugins_netaddr_makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/plugins/netaddr/Makefile.in.orig Sat Sep 14 18:56:12 2002 -+++ src/plugins/netaddr/Makefile.in Sat Sep 14 18:57:13 2002 -@@ -125,7 +125,7 @@ - lib_LTLIBRARIES_PLUGIN = libPnetaddr.la - libPnetaddr_la_SOURCES = netaddr.c baseplugin.h - libPnetaddr_la_LIBADD = --libPnetaddr_la_LDFLAGS = -module -export-dynamic -version-info 0:0:0 -+libPnetaddr_la_LDFLAGS = -module -avoid-version -export-dynamic - - # Build a libtool library, for installation in libdir. - lib_LTLIBRARIES = $(lib_LTLIBRARIES_PLUGIN) diff --git a/databases/mergeant/files/patch-src_plugins_picts_Makefile.in b/databases/mergeant/files/patch-src_plugins_picts_Makefile.in deleted file mode 100644 index 3c54fdcd0135..000000000000 --- a/databases/mergeant/files/patch-src_plugins_picts_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/plugins/picts/Makefile.in.orig Sat Sep 14 18:57:58 2002 -+++ src/plugins/picts/Makefile.in Sat Sep 14 18:58:15 2002 -@@ -127,7 +127,7 @@ - libPpicts_la_SOURCES = picts_plugin.c baseplugin.h - libPpicts_la_LIBADD = - --libPpicts_la_LDFLAGS = -module -export-dynamic -version-info 0:0:0 -+libPpicts_la_LDFLAGS = -module -export-dynamic -avoid-version - - # Build a libtool library, libggnomedb.la for installation in libdir. - lib_LTLIBRARIES = $(lib_LTLIBRARIES_PLUGIN) diff --git a/databases/mergeant/files/patch-src_plugins_sample_Makefile.in b/databases/mergeant/files/patch-src_plugins_sample_Makefile.in deleted file mode 100644 index ae8b1158cd68..000000000000 --- a/databases/mergeant/files/patch-src_plugins_sample_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/plugins/sample/Makefile.in.orig Sat Sep 14 18:58:54 2002 -+++ src/plugins/sample/Makefile.in Sat Sep 14 18:59:04 2002 -@@ -127,7 +127,7 @@ - libPsample_la_SOURCES = sample_plugin.c baseplugin.h - libPsample_la_LIBADD = - --libPsample_la_LDFLAGS = -module -export-dynamic -version-info 0:0:0 -+libPsample_la_LDFLAGS = -module -export-dynamic -avoid-version - - # Build a libtool library, libggnomedb.la for installation in libdir. - lib_LTLIBRARIES = $(lib_LTLIBRARIES_PLUGIN) diff --git a/databases/mergeant/pkg-plist b/databases/mergeant/pkg-plist index d4ade5f9bc46..75d763c41237 100644 --- a/databases/mergeant/pkg-plist +++ b/databases/mergeant/pkg-plist @@ -1,52 +1,252 @@ bin/mergeant -lib/mergeant/plugins/libPnetaddr.so -lib/mergeant/plugins/libPpicts.so -lib/mergeant/plugins/libPsample.so +bin/mg-db-browser +bin/mg-test-dyn +bin/mg-test-graph +bin/mg-test-grapher +bin/mg-test-handlers +bin/mg-test-selector +bin/mg-test-sqlquery +bin/mg-test1 +bin/mg-test2 +bin/mg-test3 +bin/mg-verify-file +include/libmergeant/graph/mg-canvas-cursor.h +include/libmergeant/graph/mg-canvas-db-relations.h +include/libmergeant/graph/mg-canvas-entity.h +include/libmergeant/graph/mg-canvas-field.h +include/libmergeant/graph/mg-canvas-fkconstraint.h +include/libmergeant/graph/mg-canvas-item.h +include/libmergeant/graph/mg-canvas-text.h +include/libmergeant/graph/mg-canvas-tip.h +include/libmergeant/graph/mg-canvas.h +include/libmergeant/graph/mg-graph-item.h +include/libmergeant/graph/mg-graph.h +include/libmergeant/handlers/mg-data-cell-renderer-boolean.h +include/libmergeant/handlers/mg-data-cell-renderer-combo.h +include/libmergeant/handlers/mg-data-cell-renderer-info.h +include/libmergeant/handlers/mg-data-cell-renderer-textual.h +include/libmergeant/handlers/mg-entry-boolean.h +include/libmergeant/handlers/mg-entry-combo.h +include/libmergeant/handlers/mg-entry-none.h +include/libmergeant/handlers/mg-entry-shell.h +include/libmergeant/handlers/mg-entry-string.h +include/libmergeant/handlers/mg-entry-time.h +include/libmergeant/handlers/mg-entry-wrapper.h +include/libmergeant/handlers/mg-handler-boolean.h +include/libmergeant/handlers/mg-handler-none.h +include/libmergeant/handlers/mg-handler-numerical.h +include/libmergeant/handlers/mg-handler-string.h +include/libmergeant/handlers/mg-handler-time.h +include/libmergeant/libmergeant.h +include/libmergeant/marshal.h +include/libmergeant/mg-base.h +include/libmergeant/mg-condition.h +include/libmergeant/mg-conf.h +include/libmergeant/mg-context.h +include/libmergeant/mg-custom-layout.h +include/libmergeant/mg-data-entry.h +include/libmergeant/mg-data-handler.h +include/libmergeant/mg-database.h +include/libmergeant/mg-db-constraint.h +include/libmergeant/mg-db-field.h +include/libmergeant/mg-db-table.h +include/libmergeant/mg-dbms-update-viewer.h +include/libmergeant/mg-defs.h +include/libmergeant/mg-entity.h +include/libmergeant/mg-enums.h +include/libmergeant/mg-field.h +include/libmergeant/mg-form.h +include/libmergeant/mg-graphviz.h +include/libmergeant/mg-join.h +include/libmergeant/mg-parameter.h +include/libmergeant/mg-qf-all.h +include/libmergeant/mg-qf-field.h +include/libmergeant/mg-qf-func.h +include/libmergeant/mg-qf-value.h +include/libmergeant/mg-qfield.h +include/libmergeant/mg-query.h +include/libmergeant/mg-ref-base.h +include/libmergeant/mg-referer.h +include/libmergeant/mg-renderer.h +include/libmergeant/mg-result-set.h +include/libmergeant/mg-selector-private.h +include/libmergeant/mg-selector.h +include/libmergeant/mg-server-aggregate.h +include/libmergeant/mg-server-data-type.h +include/libmergeant/mg-server-function.h +include/libmergeant/mg-server.h +include/libmergeant/mg-target.h +include/libmergeant/mg-util.h +include/libmergeant/mg-work-core.h +include/libmergeant/mg-work-form.h +include/libmergeant/mg-work-grid.h +include/libmergeant/mg-work-layout.h +include/libmergeant/mg-work-matrix.h +include/libmergeant/mg-work-widget.h +include/libmergeant/mg-xml-storage.h +include/libmergeant/missing.h +include/libmergeant/sel-aggregates.h +include/libmergeant/sel-data-types.h +include/libmergeant/sel-forms.h +include/libmergeant/sel-functions.h +include/libmergeant/sel-graphs.h +include/libmergeant/sel-onequery.h +include/libmergeant/sel-onetable.h +include/libmergeant/sel-onetarget.h +include/libmergeant/sel-queries.h +include/libmergeant/sel-tables.h +include/libmergeant/utility.h +lib/libmergeant-2.a +lib/libmergeant-2.so +lib/libmergeant-2.so.1 +lib/libmergeant_graph-2.a +lib/libmergeant_graph-2.so +lib/libmergeant_graph-2.so.1 +lib/libmergeant_handlers-2.a +lib/libmergeant_handlers-2.so +lib/libmergeant_handlers-2.so.1 +libdata/bonobo/servers/GNOME_Mergeant.server +libdata/pkgconfig/libmergeant.pc +share/doc/libmergeant/MgBase.html +share/doc/libmergeant/MgCanvas.html +share/doc/libmergeant/MgCanvasCursor.html +share/doc/libmergeant/MgCanvasDbRelations.html +share/doc/libmergeant/MgCanvasEntity.html +share/doc/libmergeant/MgCanvasField.html +share/doc/libmergeant/MgCanvasItem.html +share/doc/libmergeant/MgCanvasText.html +share/doc/libmergeant/MgCanvasTip.html +share/doc/libmergeant/MgCondition.html +share/doc/libmergeant/MgConf.html +share/doc/libmergeant/MgContext.html +share/doc/libmergeant/MgCustomLayout.html +share/doc/libmergeant/MgDataCellRendererBoolean.html +share/doc/libmergeant/MgDataCellRendererInfo.html +share/doc/libmergeant/MgDataCellRendererTextual.html +share/doc/libmergeant/MgDataEntry.html +share/doc/libmergeant/MgDataHandler.html +share/doc/libmergeant/MgDatabase.html +share/doc/libmergeant/MgDbConstraint.html +share/doc/libmergeant/MgDbField.html +share/doc/libmergeant/MgDbTable.html +share/doc/libmergeant/MgDbmsUpdateViewer.html +share/doc/libmergeant/MgEntity.html +share/doc/libmergeant/MgEntryBoolean.html +share/doc/libmergeant/MgEntryCidr.html +share/doc/libmergeant/MgEntryCombo.html +share/doc/libmergeant/MgEntryNone.html +share/doc/libmergeant/MgEntryPassmd5.html +share/doc/libmergeant/MgEntryShell.html +share/doc/libmergeant/MgEntryString.html +share/doc/libmergeant/MgEntryTime.html +share/doc/libmergeant/MgEntryWrapper.html +share/doc/libmergeant/MgField.html +share/doc/libmergeant/MgForm.html +share/doc/libmergeant/MgGraph.html +share/doc/libmergeant/MgGraphItem.html +share/doc/libmergeant/MgGraphviz.html +share/doc/libmergeant/MgHandlerBoolean.html +share/doc/libmergeant/MgHandlerCidr.html +share/doc/libmergeant/MgHandlerNone.html +share/doc/libmergeant/MgHandlerNumerical.html +share/doc/libmergeant/MgHandlerPassmd5.html +share/doc/libmergeant/MgHandlerString.html +share/doc/libmergeant/MgHandlerText.html +share/doc/libmergeant/MgHandlerTime.html +share/doc/libmergeant/MgJoin.html +share/doc/libmergeant/MgParameter.html +share/doc/libmergeant/MgQfAll.html +share/doc/libmergeant/MgQfField.html +share/doc/libmergeant/MgQfFunc.html +share/doc/libmergeant/MgQfValue.html +share/doc/libmergeant/MgQfield.html +share/doc/libmergeant/MgQuery.html +share/doc/libmergeant/MgRefBase.html +share/doc/libmergeant/MgReferer.html +share/doc/libmergeant/MgRenderer.html +share/doc/libmergeant/MgResultSet.html +share/doc/libmergeant/MgSelector.html +share/doc/libmergeant/MgServer.html +share/doc/libmergeant/MgServerAggregate.html +share/doc/libmergeant/MgServerDataType.html +share/doc/libmergeant/MgServerFunction.html +share/doc/libmergeant/MgTarget.html +share/doc/libmergeant/MgWorkCore.html +share/doc/libmergeant/MgWorkForm.html +share/doc/libmergeant/MgWorkGrid.html +share/doc/libmergeant/MgWorkLayout.html +share/doc/libmergeant/MgWorkMatrix.html +share/doc/libmergeant/MgWorkWidget.html +share/doc/libmergeant/MgXmlStorage.html +share/doc/libmergeant/ch01.html +share/doc/libmergeant/ch02.html +share/doc/libmergeant/ch03.html +share/doc/libmergeant/ch04.html +share/doc/libmergeant/ch04s02.html +share/doc/libmergeant/ch05.html +share/doc/libmergeant/ch06.html +share/doc/libmergeant/ch07.html +share/doc/libmergeant/ch08.html +share/doc/libmergeant/ch08s02.html +share/doc/libmergeant/ch09.html +share/doc/libmergeant/ch09s02.html +share/doc/libmergeant/ch09s03.html +share/doc/libmergeant/ch10.html +share/doc/libmergeant/ch11.html +share/doc/libmergeant/ch12.html +share/doc/libmergeant/example_bad.png +share/doc/libmergeant/example_result.png +share/doc/libmergeant/home.png +share/doc/libmergeant/index.html +share/doc/libmergeant/index.sgml +share/doc/libmergeant/left.png +share/doc/libmergeant/libmergeant.devhelp +share/doc/libmergeant/query01.png +share/doc/libmergeant/right.png +share/doc/libmergeant/up.png share/gnome/application-registry/mergeant.applications share/gnome/applications/mergeant.desktop -share/gnome/help/mergeant/C/c137.html -share/gnome/help/mergeant/C/c220.html -share/gnome/help/mergeant/C/c25.html -share/gnome/help/mergeant/C/c254.html -share/gnome/help/mergeant/C/c342.html -share/gnome/help/mergeant/C/c372.html -share/gnome/help/mergeant/C/c375.html -share/gnome/help/mergeant/C/f20.html -share/gnome/help/mergeant/C/images/env_form.jpg -share/gnome/help/mergeant/C/images/env_grid.jpg -share/gnome/help/mergeant/C/images/env_prop.jpg -share/gnome/help/mergeant/C/images/framework.eps -share/gnome/help/mergeant/C/images/framework.fig -share/gnome/help/mergeant/C/images/framework.jpg -share/gnome/help/mergeant/C/images/gas.gif -share/gnome/help/mergeant/C/images/main.jpg -share/gnome/help/mergeant/C/images/plugins_dt.jpg -share/gnome/help/mergeant/C/images/plugins_objects.jpg -share/gnome/help/mergeant/C/images/plugins_sum.jpg -share/gnome/help/mergeant/C/images/properties.jpg -share/gnome/help/mergeant/C/images/queryprop.jpg -share/gnome/help/mergeant/C/images/queryprop_cond.jpg -share/gnome/help/mergeant/C/images/queryprop_joins.jpg -share/gnome/help/mergeant/C/images/queryprop_objects.jpg -share/gnome/help/mergeant/C/images/queryprop_sql.jpg -share/gnome/help/mergeant/C/images/rels.jpg -share/gnome/help/mergeant/C/images/sysinfo.jpg +share/gnome/help/mergeant/C/book1.html +share/gnome/help/mergeant/C/c13.html +share/gnome/help/mergeant/C/c47.html +share/gnome/help/mergeant/C/c68.html +share/gnome/help/mergeant/C/c76.html +share/gnome/help/mergeant/C/c8.html +share/gnome/help/mergeant/C/c84.html +share/gnome/help/mergeant/C/c94.html +share/gnome/help/mergeant/C/images/datasources.png +share/gnome/help/mergeant/C/images/dba_properties.png +share/gnome/help/mergeant/C/images/workspace-data-types.png +share/gnome/help/mergeant/C/images/workspace-graphs.png +share/gnome/help/mergeant/C/images/workspace-queries.png +share/gnome/help/mergeant/C/images/workspace.png share/gnome/help/mergeant/C/index.html +share/gnome/help/mergeant/C/stylesheet-images/caution.gif +share/gnome/help/mergeant/C/stylesheet-images/home.gif +share/gnome/help/mergeant/C/stylesheet-images/important.gif +share/gnome/help/mergeant/C/stylesheet-images/next.gif +share/gnome/help/mergeant/C/stylesheet-images/note.gif +share/gnome/help/mergeant/C/stylesheet-images/prev.gif +share/gnome/help/mergeant/C/stylesheet-images/tip.gif +share/gnome/help/mergeant/C/stylesheet-images/toc-blank.gif +share/gnome/help/mergeant/C/stylesheet-images/toc-minus.gif +share/gnome/help/mergeant/C/stylesheet-images/toc-plus.gif +share/gnome/help/mergeant/C/stylesheet-images/up.gif +share/gnome/help/mergeant/C/stylesheet-images/warning.gif share/gnome/help/mergeant/C/topic.dat -share/gnome/help/mergeant/C/x110.html -share/gnome/help/mergeant/C/x168.html -share/gnome/help/mergeant/C/x210.html -share/gnome/help/mergeant/C/x236.html -share/gnome/help/mergeant/C/x245.html -share/gnome/help/mergeant/C/x313.html -share/gnome/help/mergeant/C/x32.html -share/gnome/help/mergeant/C/x350.html -share/gnome/help/mergeant/C/x66.html -share/gnome/help/mergeant/C/x80.html -share/gnome/help/mergeant/C/x92.html -share/gnome/mergeant/dtd/mergeant.dtd +share/gnome/help/mergeant/C/x19.html +share/gnome/help/mergeant/C/x40.html +share/gnome/mergeant/dtd/libmergeant.dtd +share/gnome/mergeant/plugins/libmergeant_handler_cidr.so +share/gnome/mergeant/plugins/libmergeant_handler_cidr.so.1 +share/gnome/mergeant/plugins/libmergeant_handler_passmd5.so +share/gnome/mergeant/plugins/libmergeant_handler_passmd5.so.1 +share/gnome/mergeant/plugins/libmergeant_handler_text.so +share/gnome/mergeant/plugins/libmergeant_handler_text.so.1 +share/gnome/mergeant/ui/mergeant.xml share/gnome/mime-info/mergeant.keys share/gnome/mime-info/mergeant.mime +share/gnome/omf/libmergeant/libmergeant-C.omf share/gnome/omf/mergeant/mergeant-C.omf share/gnome/pixmaps/document-icons/gnome-application-x-mergeant.png share/gnome/pixmaps/mergeant/mergeant.png @@ -65,14 +265,20 @@ share/gnome/pixmaps/mergeant/query-view-query_16x16.png share/gnome/pixmaps/mergeant/query-view-table_16x16.png share/gnome/pixmaps/mergeant/query-view-view_16x16.png share/locale/am/LC_MESSAGES/mergeant.mo +share/locale/az/LC_MESSAGES/mergeant.mo share/locale/ca/LC_MESSAGES/mergeant.mo share/locale/cs/LC_MESSAGES/mergeant.mo share/locale/da/LC_MESSAGES/mergeant.mo share/locale/de/LC_MESSAGES/mergeant.mo +share/locale/el/LC_MESSAGES/mergeant.mo +share/locale/en_CA/LC_MESSAGES/mergeant.mo +share/locale/en_GB/LC_MESSAGES/mergeant.mo share/locale/es/LC_MESSAGES/mergeant.mo share/locale/fa/LC_MESSAGES/mergeant.mo share/locale/fr/LC_MESSAGES/mergeant.mo +share/locale/hr/LC_MESSAGES/mergeant.mo share/locale/it/LC_MESSAGES/mergeant.mo +share/locale/ml/LC_MESSAGES/mergeant.mo share/locale/ms/LC_MESSAGES/mergeant.mo share/locale/nl/LC_MESSAGES/mergeant.mo share/locale/no/LC_MESSAGES/mergeant.mo @@ -87,13 +293,19 @@ share/locale/sv/LC_MESSAGES/mergeant.mo share/locale/tr/LC_MESSAGES/mergeant.mo share/locale/uk/LC_MESSAGES/mergeant.mo share/locale/vi/LC_MESSAGES/mergeant.mo +share/locale/zh_CN/LC_MESSAGES/mergeant.mo @dirrm share/gnome/pixmaps/mergeant @dirrm share/gnome/omf/mergeant +@dirrm share/gnome/omf/libmergeant +@dirrm share/gnome/mergeant/ui +@dirrm share/gnome/mergeant/plugins @dirrm share/gnome/mergeant/dtd @dirrm share/gnome/mergeant @dirrm share/gnome/help/mergeant/C/stylesheet-images @dirrm share/gnome/help/mergeant/C/images @dirrm share/gnome/help/mergeant/C @dirrm share/gnome/help/mergeant -@dirrm lib/mergeant/plugins -@dirrm lib/mergeant +@dirrm share/doc/libmergeant +@dirrm include/libmergeant/handlers +@dirrm include/libmergeant/graph +@dirrm include/libmergeant |