cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak build with clang.

Browse Source 
Drop the gettext MODULE and regen WANTLIB while here...
This commit is contained in:
ajacoutot 2017-04-14 08:24:03 +00:00
parent 5037677f8a
commit 733ef3f910
2 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
editors/ldapvi/Makefile
View File

@ -1,41 +1,41 @@
# $OpenBSD: Makefile,v 1.20 2015/08/11 21:43:03 jasper Exp $
# $OpenBSD: Makefile,v 1.21 2017/04/14 08:24:03 ajacoutot Exp $
COMMENT= update LDAP entries with a text editor
COMMENT= update LDAP entries with a text editor
DISTNAME= ldapvi-1.7
CATEGORIES= editors
DISTNAME= ldapvi-1.7
CATEGORIES= editors
REVISION= 7
REVISION= 6
HOMEPAGE= http://www.lichteblau.com/ldapvi.html
HOMEPAGE= http://www.lichteblau.com/ldapvi.html
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += c crypto curses glib-2.0>=0.8 lber ldap popt pthread readline
WANTLIB += c crypto curses glib-2.0 intl lber ldap popt readline
WANTLIB += ssl
MASTER_SITES= http://www.lichteblau.com/download/
MASTER_SITES= http://www.lichteblau.com/download/
MODULES= devel/gettext
BUILD_DEPENDS= textproc/libxslt
LIB_DEPENDS= devel/glib2 \
databases/openldap \
devel/popt
BUILD_DEPENDS= textproc/libxslt
MAKE_FILE= GNUmakefile
USE_GMAKE= Yes
CONFIGURE_STYLE=gnu
LIB_DEPENDS= devel/glib2 \
databases/openldap \
devel/popt
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAKE_FILE= GNUmakefile
USE_GMAKE= Yes
NO_TEST= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
NO_TEST= Yes
pre-build:
@sed -i "s,/etc/ldap,${SYSCONFDIR}/openldap,g" ${WRKSRC}/ldapvi.1
sed -i "s,/etc/ldap,${SYSCONFDIR}/openldap,g" ${WRKSRC}/ldapvi.1
do-install:
cd ${WRKSRC}/manual && ${MAKE_PROGRAM} ${MAKE_FILE} manual.html

16
editors/ldapvi/patches/patch-ldapvi_c
View File

@ -1,10 +1,11 @@
$OpenBSD: patch-ldapvi_c,v 1.1 2012/03/02 08:01:07 sthen Exp $
$OpenBSD: patch-ldapvi_c,v 1.2 2017/04/14 08:24:03 ajacoutot Exp $
rename getline to avoid future namespace collision, upstream git 256ced029c
remove pointless header which vim whines about
fix build with clang: 'copy_sasl_output' should return a value [-Wreturn-type]
--- ldapvi.c.orig Sat May 5 11:17:26 2007
+++ ldapvi.c Thu Mar 1 22:04:17 2012
--- ldapvi.c.orig Sat May 5 12:17:26 2007
+++ ldapvi.c Fri Apr 14 10:20:13 2017
@@ -470,7 +470,7 @@ change_mechanism(bind_options *bo)
bo->authmethod = LDAP_AUTH_SASL;
puts("Switching to SASL authentication.");
@ -23,3 +24,12 @@ remove pointless header which vim whines about
nlines++;
}
if (cmdline->ldif) {
@@ -1465,7 +1465,7 @@ copy_sasl_output(FILE *out, char *sasl)
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) {