kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix build for OpenBSD >= 5.5. It doesn't have sys/ttydev.h. Regenerate

Browse source 
patchset and checksums.
This commit is contained in:
rodent 2014-05-11 16:55:17 +00:00
parent 1f9543e9d0
commit 7489f5afdb
8 changed files with 54 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
devel/ncurses/distinfo
View file

@ -1,11 +1,12 @@
$NetBSD: distinfo,v 1.22 2013/07/08 05:54:24 richard Exp $
$NetBSD: distinfo,v 1.23 2014/05/11 16:55:17 rodent Exp $
SHA1 (ncurses-5.9.tar.gz) = 3e042e5f2c7223bffdaac9646a533b8c758b65b5
RMD160 (ncurses-5.9.tar.gz) = dd7dffe38fcc908230ce3e036b71ced2d270ac9e
Size (ncurses-5.9.tar.gz) = 2826473 bytes
SHA1 (patch-aa) = ff83d492f6016af789ce8397c4bf87969095e4c4
SHA1 (patch-ab) = 6bbc87f2189d184a120c77df68ac75a0b97e8e7a
SHA1 (patch-ac) = 412f2b7aaba6aeeef99dff2b51eb9bda390f04c0
SHA1 (patch-ad) = 82e81dec3798f81efefd1cbbaee95ae39b46350c
SHA1 (patch-cxx_cursesf.h) = 98ea07e87f00ba2c67a8c3f8e6d54693c8869f9b
SHA1 (patch-cxx_cursesm.h) = 24194189201782b457bd3e2c953dcaa34dde99ea
SHA1 (patch-aa) = e2bafc25f1c9e39062de06eccbe1e71321dbd719
SHA1 (patch-ab) = 12ed75d0228793d9ceac5933d8ac8741d2852c31
SHA1 (patch-ac) = e88ab440c19d9087169325eaef8ec0144c82b1a3
SHA1 (patch-ad) = 15d74d0105a22d0cb1aef5c841e6a6085c498bfe
SHA1 (patch-cxx_cursesf.h) = ed10202764d97d7d94d4eb4b35e84424cabc4c20
SHA1 (patch-cxx_cursesm.h) = 0b371901959ce9e36493e57d8df65356284b9ef3
SHA1 (patch-ncurses_tinfo_lib__baudrate.c) = faaf60ec21e9e4e6a4b14d9f245e569b526572df

14
devel/ncurses/patches/patch-aa
View file

@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.16 2011/02/28 11:02:46 adam Exp $
$NetBSD: patch-aa,v 1.17 2014/05/11 16:55:17 rodent Exp $
--- misc/run_tic.in.orig 2006-10-28 21:43:30.000000000 +0200
--- misc/run_tic.in.orig Wed Feb 23 23:30:15 2011
+++ misc/run_tic.in
@@ -122,7 +122,7 @@ TICDIR=`echo $TERMINFO | sed -e 's%/shar
@@ -122,7 +122,7 @@ fi
# would generate a lot of confusing error messages if we tried to overwrite it.
# We explicitly remove its contents rather than the directory itself, in case
# the directory is actually a symbolic link.
@ -11,13 +11,13 @@ $NetBSD: patch-aa,v 1.16 2011/02/28 11:02:46 adam Exp $
if test "$ext_funcs" = 1 ; then
cat <<EOF
@@ -164,6 +164,9 @@ else
@@ -163,6 +163,9 @@ else
exit 1
fi
fi
+
+# For NetBSD pkgsrc, don't bother with setting a symbolic link.
+exit 0
+
# Make a symbolic link to provide compatibility with applications that expect
# to find terminfo under /usr/lib. That is, we'll _try_ to do that. Not
# all systems support symbolic links, and those that do provide a variety

4
devel/ncurses/patches/patch-ab
View file

@ -1,6 +1,6 @@
$NetBSD: patch-ab,v 1.16 2011/02/28 11:02:46 adam Exp $
$NetBSD: patch-ab,v 1.17 2014/05/11 16:55:17 rodent Exp $
--- mk-1st.awk.orig 2010-08-07 20:42:30.000000000 +0000
--- mk-1st.awk.orig Sat Aug 7 20:42:30 2010
+++ mk-1st.awk
@@ -396,11 +396,11 @@ END {
end_name = lib_name;

6
devel/ncurses/patches/patch-ac
View file

@ -1,6 +1,6 @@
$NetBSD: patch-ac,v 1.19 2013/07/08 05:54:24 richard Exp $
$NetBSD: patch-ac,v 1.20 2014/05/11 16:55:17 rodent Exp $
--- configure.orig 2011-02-21 01:40:36.000000000 +0000
--- configure.orig Thu Mar 31 23:35:51 2011
+++ configure
@@ -7096,6 +7096,13 @@ sco*) #(vi
# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.19 2013/07/08 05:54:24 richard Exp $
;;
esac
@@ -18449,7 +18444,7 @@ echo "${ECHO_T}$LIB_SUBSETS" >&6
@@ -18592,7 +18594,7 @@ echo "${ECHO_T}$LIB_SUBSETS" >&6
### Construct the list of include-directories to be generated

4
devel/ncurses/patches/patch-ad
View file

@ -1,6 +1,6 @@
$NetBSD: patch-ad,v 1.11 2011/02/28 11:02:46 adam Exp $
$NetBSD: patch-ad,v 1.12 2014/05/11 16:55:17 rodent Exp $
--- c++/Makefile.in.orig 2010-11-27 21:45:27.000000000 +0000
--- c++/Makefile.in.orig Sat Nov 27 21:45:27 2010
+++ c++/Makefile.in
@@ -167,7 +167,7 @@ LIB_OBJS = \

8
devel/ncurses/patches/patch-cxx_cursesf.h
View file

@ -1,8 +1,8 @@
$NetBSD: patch-cxx_cursesf.h,v 1.1 2011/02/28 11:02:46 adam Exp $
$NetBSD: patch-cxx_cursesf.h,v 1.2 2014/05/11 16:55:17 rodent Exp $
--- c++/cursesf.h.orig 2011-02-28 09:23:33.000000000 +0000
--- c++/cursesf.h.orig Sat Aug 13 18:08:24 2005
+++ c++/cursesf.h
@@ -677,7 +677,7 @@ protected:
@@ -677,7 +677,7 @@ template<class T> class NCURSES_IMPEXP NCursesUserForm
}
public:
@ -11,7 +11,7 @@ $NetBSD: patch-cxx_cursesf.h,v 1.1 2011/02/28 11:02:46 adam Exp $
const T* p_UserData = STATIC_CAST(T*)(0),
bool with_frame=FALSE,
bool autoDelete_Fields=FALSE)
@@ -686,7 +686,7 @@ public:
@@ -686,7 +686,7 @@ template<class T> class NCURSES_IMPEXP NCursesUserForm
set_user (const_cast<void *>(p_UserData));
};

8
devel/ncurses/patches/patch-cxx_cursesm.h
View file

@ -1,8 +1,8 @@
$NetBSD: patch-cxx_cursesm.h,v 1.1 2011/02/28 11:02:46 adam Exp $
$NetBSD: patch-cxx_cursesm.h,v 1.2 2014/05/11 16:55:17 rodent Exp $
--- c++/cursesm.h.orig 2011-02-28 09:25:22.000000000 +0000
--- c++/cursesm.h.orig Sat Aug 13 18:10:36 2005
+++ c++/cursesm.h
@@ -635,7 +635,7 @@ protected:
@@ -635,7 +635,7 @@ template<class T> class NCURSES_IMPEXP NCursesUserMenu
}
public:
@ -11,7 +11,7 @@ $NetBSD: patch-cxx_cursesm.h,v 1.1 2011/02/28 11:02:46 adam Exp $
const T* p_UserData = STATIC_CAST(T*)(0),
bool with_frame=FALSE,
bool autoDelete_Items=FALSE)
@@ -644,7 +644,7 @@ public:
@@ -644,7 +644,7 @@ template<class T> class NCURSES_IMPEXP NCursesUserMenu
set_user (const_cast<void *>(p_UserData));
};

24
devel/ncurses/patches/patch-ncurses_tinfo_lib__baudrate.c Normal file
View file

@ -0,0 +1,24 @@
$NetBSD: patch-ncurses_tinfo_lib__baudrate.c,v 1.1 2014/05/11 16:55:17 rodent Exp $
sys/ttydev.h doesn't exist in OpenBSD 5.5
--- ncurses/tinfo/lib_baudrate.c.orig Sun Dec 19 01:50:50 2010
+++ ncurses/tinfo/lib_baudrate.c
@@ -39,7 +39,7 @@
#include <curses.priv.h>
#include <termcap.h> /* ospeed */
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
#include <sys/param.h>
#endif
@@ -49,7 +49,7 @@
* of the indices up to B115200 fit nicely in a 'short', allowing us to retain
* ospeed's type for compatibility.
*/
-#if (defined(__FreeBSD__) && (__FreeBSD_version < 700000)) || defined(__NetBSD__) || defined(__OpenBSD__)
+#if (defined(__FreeBSD__) && (__FreeBSD_version < 700000)) || defined(__NetBSD__) || (defined(__OpenBSD__) && (OpenBSD < 201405))
#undef B0
#undef B50
#undef B75