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

honor --disable-libmagic and do not pick up magic.h; problem reported by sthen@

Browse Source
This commit is contained in:
naddy 2015-12-21 20:58:57 +00:00
parent 84d1e686dc
commit 1cf74b6333
4 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editors/nano/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.77 2015/11/18 20:24:12 naddy Exp $
# $OpenBSD: Makefile,v 1.78 2015/12/21 20:58:57 naddy Exp $
COMMENT= Pico editor clone with enhancements
@ -18,7 +18,8 @@ MODULES= devel/gettext
WANTLIB= c ncursesw
SEPARATE_BUILD= Yes
CONFIGURE_STYLE=gnu
AUTOCONF_VERSION=2.69
CONFIGURE_STYLE=autoconf
CONFIGURE_ARGS= --disable-libmagic
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

18
editors/nano/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-configure_ac,v 1.3 2015/12/21 20:58:57 naddy Exp $
AC_CHECK_HEADERS_ONCE() cannot be conditionalized.
--- configure.ac.orig Wed Nov 18 06:31:35 2015
+++ configure.ac Mon Dec 21 21:46:52 2015
@@ -656,9 +656,9 @@ AC_MSG_RESULT(no),
AC_MSG_WARN([*** Can't check for macro redefinability when cross-compiling]))
AS_IF([test "x$enable_libmagic" != "xno"], [
- AC_CHECK_HEADERS_ONCE([magic.h])
+ AC_CHECK_HEADERS([magic.h])
AC_CHECK_LIB(magic, magic_open)
- AC_CHECK_HEADERS_ONCE([zlib.h])
+ AC_CHECK_HEADERS([zlib.h])
AC_CHECK_LIB(z, inflate)
])

8
editors/nano/patches/patch-doc_man_nano_1
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_man_nano_1,v 1.5 2015/03/25 20:27:19 naddy Exp $
--- doc/man/nano.1.orig Mon Mar 23 04:46:00 2015
+++ doc/man/nano.1 Tue Mar 24 23:03:50 2015
@@ -262,8 +262,6 @@ http://www.nano-editor.org/
$OpenBSD: patch-doc_man_nano_1,v 1.6 2015/12/21 20:58:57 naddy Exp $
--- doc/man/nano.1.orig Sun Aug 30 18:38:50 2015
+++ doc/man/nano.1 Mon Dec 21 18:11:49 2015
@@ -284,8 +284,6 @@ http://www.nano-editor.org/
.PD 0
.TP
\fBnanorc\fP(5)

8
editors/nano/patches/patch-doc_man_nanorc_5
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_man_nanorc_5,v 1.6 2015/04/28 21:05:30 naddy Exp $
--- doc/man/nanorc.5.orig Sat Apr 4 19:09:34 2015
+++ doc/man/nanorc.5 Tue Apr 28 22:28:59 2015
@@ -694,8 +694,7 @@ Per-user configuration file.
$OpenBSD: patch-doc_man_nanorc_5,v 1.7 2015/12/21 20:58:57 naddy Exp $
--- doc/man/nanorc.5.orig Sun Aug 30 18:38:50 2015
+++ doc/man/nanorc.5 Mon Dec 21 18:11:49 2015
@@ -697,8 +697,7 @@ Per-user configuration file.
.TP
\fBnano\fP(1)
.PP