From 2b21a3e13c07f7883a14151ded259d0223d25953 Mon Sep 17 00:00:00 2001 From: jasper Date: Sun, 1 May 2011 20:38:18 +0000 Subject: [PATCH] - remove unneeded patch - prevent patch left-over from ending up in PLIST --- net/neon/Makefile | 8 +++++++- net/neon/patches/patch-Makefile_in | 12 ------------ 2 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 net/neon/patches/patch-Makefile_in diff --git a/net/neon/Makefile b/net/neon/Makefile index bbc22357cf3..9709290c305 100644 --- a/net/neon/Makefile +++ b/net/neon/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2010/11/19 22:31:35 espie Exp $ +# $OpenBSD: Makefile,v 1.27 2011/05/01 20:38:18 jasper Exp $ COMMENT= HTTP and WebDAV client library, with C interface @@ -29,6 +29,8 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ ac_cv_path_CERTUTIL="" \ ac_cv_path_PK12UTIL="" +FAKE_FLAGS= docdir=${PREFIX}/share/doc/neon/ + CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ --with-ca-bundle=/etc/ssl/cert.pem \ --with-ssl=openssl \ @@ -38,6 +40,10 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ post-extract: ${INSTALL} -m 555 ${FILESDIR}/krb5-config ${WRKDIR}/bin +# Prevent this from ending up in PLIST +pre-configure: + rm ${WRKSRC}/macros/neon.m4.orig + post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/neon/macros ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/neon diff --git a/net/neon/patches/patch-Makefile_in b/net/neon/patches/patch-Makefile_in deleted file mode 100644 index 78633ca8293..00000000000 --- a/net/neon/patches/patch-Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.3 2008/11/13 13:14:05 ajacoutot Exp $ ---- Makefile.in.orig Sat Jul 19 23:56:05 2008 -+++ Makefile.in Sun Nov 9 15:51:07 2008 -@@ -22,7 +22,7 @@ man1dir = $(mandir)/man1 - man3dir = $(mandir)/man3 - datarootdir = @datarootdir@ - datadir = @datadir@ --docdir = $(datadir)/doc/neon-@NEON_VERSION@ -+docdir = $(datadir)/doc/neon - includedir = @includedir@ - neonincludes = $(includedir)/neon - pkgconfigdir = $(libdir)/pkgconfig