Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2014Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
devel/ucommon/Makefile
View File

@@ -1,7 +1,8 @@
# $NetBSD: Makefile,v 1.3 2013/06/27 01:36:25 rodent Exp $
# $NetBSD: Makefile,v 1.8 2014/02/12 23:17:51 tron Exp $
#
DISTNAME= ucommon-6.0.5
DISTNAME= ucommon-6.1.0
PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=commonc++/}
@@ -21,6 +22,8 @@ PKGCONFIG_OVERRIDE+= ucommon.pc.in
.include "options.mk"
LDFLAGS.SunOS+= -lsocket -lnsl -lintl
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"

25
devel/ucommon/PLIST
View File

@@ -1,7 +1,8 @@
@comment $NetBSD: PLIST,v 1.2 2013/06/27 01:36:25 rodent Exp $
@comment $NetBSD: PLIST,v 1.3 2014/01/10 02:32:50 rodent Exp $
bin/args
bin/car
bin/commoncpp-config
bin/keywait
bin/mdsum
bin/pdetach
bin/scrub-files
@@ -62,23 +63,21 @@ include/ucommon/ucommon.h
include/ucommon/unicode.h
include/ucommon/vector.h
include/ucommon/xml.h
${PLIST.static}lib/libcommoncpp.a
${PLIST.dynamic}lib/libcommoncpp.so
${PLIST.dynamic}lib/libcommoncpp.so.6
${PLIST.dynamic}lib/libcommoncpp.so.${PKGVERSION}
${PLIST.static}lib/libucommon.a
${PLIST.dynamic}lib/libucommon.so
${PLIST.dynamic}lib/libucommon.so.6
${PLIST.dynamic}lib/libucommon.so.${PKGVERSION}
${PLIST.static}lib/libusecure.a
${PLIST.dynamic}lib/libusecure.so
${PLIST.dynamic}lib/libusecure.so.6
${PLIST.dynamic}lib/libusecure.so.${PKGVERSION}
lib/libcommoncpp.so
lib/libcommoncpp.so.6
lib/libcommoncpp.so.${PKGVERSION}
lib/libucommon.so
lib/libucommon.so.6
lib/libucommon.so.${PKGVERSION}
lib/libusecure.so
lib/libusecure.so.6
lib/libusecure.so.${PKGVERSION}
lib/pkgconfig/commoncpp.pc
lib/pkgconfig/ucommon.pc
man/man1/args.1
man/man1/car.1
man/man1/commoncpp-config.1
man/man1/keywait.1
man/man1/mdsum.1
man/man1/pdetach.1
man/man1/scrub-files.1

3
devel/ucommon/buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.3 2013/06/28 08:39:21 obache Exp $
# $NetBSD: buildlink3.mk,v 1.4 2014/02/12 23:17:51 tron Exp $
BUILDLINK_TREE+= ucommon
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= ucommon
UCOMMON_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ucommon+= ucommon>=5.0.6
BUILDLINK_ABI_DEPENDS.ucommon?= ucommon>=6.1.0nb1
BUILDLINK_PKGSRCDIR.ucommon?= ../../devel/ucommon
pkgbase := ucommon

15
devel/ucommon/distinfo
View File

@@ -1,7 +1,10 @@
$NetBSD: distinfo,v 1.3 2013/06/27 01:36:25 rodent Exp $
$NetBSD: distinfo,v 1.8 2014/01/19 00:49:06 rodent Exp $
SHA1 (ucommon-6.0.5.tar.gz) = 661d5aa1a164826cf41bc6512c1eb1451a396be1
RMD160 (ucommon-6.0.5.tar.gz) = 73b1b1fa35320a71718bf5367c273aac7f98076d
Size (ucommon-6.0.5.tar.gz) = 806904 bytes
SHA1 (patch-CMakeLists.txt) = 4d4c11a89111161bc8d8fe3715f643290ecb6149
SHA1 (patch-commoncpp_address.cpp) = 13fc4a7073b6c2de6329a90269045fc3dbb0e389
SHA1 (ucommon-6.1.0.tar.gz) = c20dc9c5ec53131284cbc523148302b6e135a9ac
RMD160 (ucommon-6.1.0.tar.gz) = 93e175c0970e335acb2df2b8ee2433720ba69fdd
Size (ucommon-6.1.0.tar.gz) = 826742 bytes
SHA1 (patch-CMakeLists.txt) = 53e9ffad15d45a89eb1b992da3d6a965a46d0447
SHA1 (patch-commoncpp_address.cpp) = 64cbb5ae5f43b994a36d65d893cf58309e7324df
SHA1 (patch-commoncpp_udp.cpp) = 6950168df08702bb5aed023682e8a73e73b6f965
SHA1 (patch-inc_ucommon_string.h) = 334e9a71dfbf94f81ced34e0af7074c67f65b8da
SHA1 (patch-utils_keywait.cpp) = 7f5a595b080f3e61097cf99680602d8fcc84bafa

6
devel/ucommon/patches/patch-CMakeLists.txt
View File

@@ -1,10 +1,10 @@
$NetBSD: patch-CMakeLists.txt,v 1.1 2013/04/17 00:51:20 rodent Exp $
$NetBSD: patch-CMakeLists.txt,v 1.2 2014/01/19 00:49:06 rodent Exp $
Fix INSTALL_MANDIR overwriting itself.
--- CMakeLists.txt.orig 2011-11-12 15:24:39.000000000 +0000
--- CMakeLists.txt.orig 2014-01-04 17:15:36.000000000 +0000
+++ CMakeLists.txt
@@ -36,15 +36,7 @@ if(WIN32)
@@ -42,15 +42,7 @@ if(WIN32)
set(SYSCONFDIR "etc" CACHE PATH "config directory")
set(STATEDIR "var" CACHE PATH "state directory")
else()

4
devel/ucommon/patches/patch-commoncpp_address.cpp
View File

@@ -1,9 +1,9 @@
$NetBSD: patch-commoncpp_address.cpp,v 1.2 2013/06/27 01:36:25 rodent Exp $
$NetBSD: patch-commoncpp_address.cpp,v 1.3 2014/01/19 00:49:06 rodent Exp $
Be explicit that the local version of bitset is wanted, not the STL
version in std for C++11 libraries.
--- commoncpp/address.cpp.orig 2013-04-28 14:29:48.000000000 +0000
--- commoncpp/address.cpp.orig 2014-01-04 17:32:41.000000000 +0000
+++ commoncpp/address.cpp
@@ -1062,7 +1062,7 @@ void IPV4Cidr::set(const char *cp)
#endif

22
devel/ucommon/patches/patch-commoncpp_udp.cpp Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-commoncpp_udp.cpp,v 1.2 2014/01/19 00:49:06 rodent Exp $
--- commoncpp/udp.cpp.orig 2014-01-04 17:32:41.000000000 +0000
+++ commoncpp/udp.cpp
@@ -409,7 +409,7 @@ Socket::Error UDPSocket::join(const IPV4
setsockopt(so, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char *)&group, sizeof(group));
return errSuccess;
-#elif defined(IP_ADD_MEMBERSHIP) && defined(SIOCGIFINDEX) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(_OSF_SOURCE) && !defined(__hpux) && !defined(__GNU__)
+#elif defined(IP_ADD_MEMBERSHIP) && defined(SIOCGIFINDEX) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(_OSF_SOURCE) && !defined(__hpux) && !defined(__GNU__) && !defined(__NetBSD__)
struct ip_mreqn group;
struct sockaddr_in myaddr;
@@ -448,7 +448,7 @@ Socket::Error UDPSocket::join(const IPV4
Socket::Error UDPSocket::getInterfaceIndex(const char *DeviceName,int& InterfaceIndex)
{
#ifndef _MSWINDOWS_
-#if defined(IP_ADD_MEMBERSHIP) && defined(SIOCGIFINDEX) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(_OSF_SOURCE) && !defined(__hpux) && !defined(__GNU__)
+#if defined(IP_ADD_MEMBERSHIP) && defined(SIOCGIFINDEX) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(_OSF_SOURCE) && !defined(__hpux) && !defined(__GNU__) && !defined(__NetBSD__)
struct ip_mreqn mreqn;
struct ifreq m_ifreq;

22
devel/ucommon/patches/patch-inc_ucommon_string.h Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-inc_ucommon_string.h,v 1.2 2014/01/19 00:49:06 rodent Exp $
--- inc/ucommon/string.h.orig 2014-01-04 17:30:39.000000000 +0000
+++ inc/ucommon/string.h
@@ -1627,7 +1627,7 @@ public:
* @param string2 to compare.
* @return 0 if equal, > 0 if s2 > s1, < 0 if s2 < s1.
*/
-extern "C" inline int stricmp(const char *string1, const char *string2)
+inline int stricmp(const char *string1, const char *string2)
{return String::case_compare(string1, string2);}
/**
@@ -1637,7 +1637,7 @@ extern "C" inline int stricmp(const char
* @param max size of string to compare.
* @return 0 if equal, > 0 if s2 > s1, < 0 if s2 < s1.
*/
-extern "C" inline int strnicmp(const char *string1, const char *string2, size_t max)
+inline int strnicmp(const char *string1, const char *string2, size_t max)
{return String::case_compare(string1, string2, max);}
#endif

22
devel/ucommon/patches/patch-utils_keywait.cpp Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-utils_keywait.cpp,v 1.1 2014/01/26 04:00:19 rodent Exp $
Fix unportable cfmakeraw() for SunOS.
--- utils/keywait.cpp.orig 2014-01-04 17:31:43.000000000 +0000
+++ utils/keywait.cpp
@@ -122,7 +122,15 @@ PROGRAM_MAIN(argc, argv)
shell::exiting(&cleanup);
tcgetattr(0, &current);
+#if defined(__sun)
+ current.c_iflag &= ~(IMAXBEL|IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
+ current.c_oflag &= ~OPOST;
+ current.c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
+ current.c_cflag &= ~(CSIZE|PARENB);
+ current.c_cflag |= CS8;
+#else
cfmakeraw(&current);
+#endif
tcsetattr(0, TCSANOW, &current);
fd_set inp;
struct timeval tv = {0, 0};