aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sysutils/ldapvi/Makefile16
-rw-r--r--sysutils/ldapvi/files/patch-ldapvi.c11
2 files changed, 20 insertions, 7 deletions
diff --git a/sysutils/ldapvi/Makefile b/sysutils/ldapvi/Makefile
index 76444acb6641..d4e200737eb1 100644
--- a/sysutils/ldapvi/Makefile
+++ b/sysutils/ldapvi/Makefile
@@ -9,12 +9,16 @@ PORTNAME= ldapvi
PORTVERSION= 1.7
PORTREVISION= 3
CATEGORIES= sysutils net
-MASTER_SITES= http://www.lichteblau.com/download/
+MASTER_SITES= http://www.lichteblau.com/download/ \
+ ${MASTER_SITE_LOCAL:S,%SUBDIR%,sbz,}
MAINTAINER= sbz@FreeBSD.org
COMMENT= A tool to update LDAP entries with a text editor
-LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+LIB_DEPENDS= popt:${PORTSDIR}/devel/popt
USE_OPENLDAP= yes
USE_GNOME= pkgconfig glib20
@@ -27,16 +31,14 @@ CFLAGS+= -I${LOCALBASE}/include
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-MAN1= ldapvi.1
-PLIST_FILES= bin/ldapvi \
+MAN1= ${PORTNAME}.1
+PLIST_FILES= bin/${PORTNAME} \
${DOCSDIR_REL}/manual.css ${DOCSDIR_REL}/manual.xml \
${DOCSDIR_REL}/bg.png ${DOCSDIR_REL}/html.xsl
PLIST_DIRS= ${DOCSDIR_REL}
-.include <bsd.port.pre.mk>
-
.if !defined(WANT_OPENLDAP_SASL) || defined(WITHOUT_SASL)
CONFIGURE_ARGS+=--without-sasl
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/ldapvi/files/patch-ldapvi.c b/sysutils/ldapvi/files/patch-ldapvi.c
new file mode 100644
index 000000000000..1939f9a11aed
--- /dev/null
+++ b/sysutils/ldapvi/files/patch-ldapvi.c
@@ -0,0 +1,11 @@
+--- ./ldapvi.c.orig 2012-07-09 23:43:28.000000000 +0200
++++ ./ldapvi.c 2012-07-09 23:43:50.000000000 +0200
+@@ -1465,7 +1465,7 @@
+ int line = 0;
+ int c;
+
+- if (lstat(sasl, &st) == -1) return;
++ if (lstat(sasl, &st) == -1) return 0;
+ if ( !(in = fopen(sasl, "r"))) syserr();
+
+ if (st.st_size > 0) {