aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoredwin <edwin@FreeBSD.org>2004-10-31 08:31:55 +0800
committeredwin <edwin@FreeBSD.org>2004-10-31 08:31:55 +0800
commit5b584c8ac1c4f14d2ae6c875113ec7522b46a684 (patch)
treef782dcfde3da3b6fd7e55030ac53741f3de9b312
parentef2a9c91b51a34a0a70735a9d077343e0311b1c8 (diff)
downloadfreebsd-ports-gnome-5b584c8ac1c4f14d2ae6c875113ec7522b46a684.tar.gz
freebsd-ports-gnome-5b584c8ac1c4f14d2ae6c875113ec7522b46a684.tar.zst
freebsd-ports-gnome-5b584c8ac1c4f14d2ae6c875113ec7522b46a684.zip
Add patch to let it work with OpenLDAP 2.2. Obtained from:
http://sourceforge.net/tracker/index.php?func=detail&aid=1022295&group_id=3805&atid=103805 Use OPTIONS
-rw-r--r--net/gq/Makefile28
-rw-r--r--net/gq/files/patch-src::util.c20
2 files changed, 33 insertions, 15 deletions
diff --git a/net/gq/Makefile b/net/gq/Makefile
index 6fac8b5b69a3..3aa2f03372d4 100644
--- a/net/gq/Makefile
+++ b/net/gq/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gq
PORTVERSION= 1.0b1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gqclient
@@ -16,21 +16,26 @@ DISTNAME= gq-${PORTVERSION:S/b/beta/}
MAINTAINER= ports@oven.org
COMMENT= GTK-based LDAP client
-.if !defined(WITHOUT_JPEG)
-USE_GNOME= gdkpixbuf
-.endif
-
USE_GMAKE= yes
USE_ICONV= yes
USE_GETTEXT= yes
USE_OPENLDAP= yes
-WANT_OPENLDAP_VER= 21
USE_OPENSSL= yes
USE_X_PREFIX= yes
-USE_GNOME+= gtk20 libxml2
+USE_GNOME= gtk20 libxml2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-ldap=${LOCALBASE}
+OPTIONS= JPEG "Enable jpegPhoto attr. handling" On \
+ DND "Enable Drag and drop support in browse mode" On \
+ CACHE "Support the OpenLDAP experimental client cache" On
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_JPEG)
+USE_GNOME+= gdkpixbuf
+.endif
+
.if defined(WITH_DND)
CONFIGURE_ARGS+= --enable-browser-dnd
.endif
@@ -39,11 +44,4 @@ CONFIGURE_ARGS+= --enable-browser-dnd
CONFIGURE_ARGS+= --enable-cache
.endif
-post-extract:
- @${ECHO_MSG} "This port supports the following configuration knobs:"
- @${ECHO_MSG} "WITHOUT_JPEG=yes Disable jpegPhoto attr. handling"
- @${ECHO_MSG} "WITH_DND=yes Enable Drag and drop support in browse mode"
- @${ECHO_MSG} "WITH_CACHE=yes Support the OpenLDAP experimental client cache"
- @${ECHO_MSG}
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/gq/files/patch-src::util.c b/net/gq/files/patch-src::util.c
new file mode 100644
index 000000000000..d470f6ae5b8e
--- /dev/null
+++ b/net/gq/files/patch-src::util.c
@@ -0,0 +1,20 @@
+--- src/util.c.orig Mon Nov 3 23:28:24 2003
++++ src/util.c Thu Oct 14 12:46:42 2004
+@@ -1909,7 +1909,7 @@
+ char **gq_ldap_explode_dn(const char *dn, int dummy)
+ {
+ int i, rc;
+- LDAPDN *parts;
++ LDAPDN parts;
+ char **v = 0;
+
+ rc = ldap_str2dn(dn, &parts, LDAP_DN_FORMAT_LDAPV3);
+@@ -1921,7 +1921,7 @@
+ v = (char **) calloc((i + 2), sizeof(char*));
+
+ for( i = 0 ; parts[i] ; i++ ) {
+- ldap_rdn2str(parts[0][i], &v[i],
++ ldap_rdn2str(parts[i], &v[i],
+ LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY );
+ }
+ return v;