From c8b99ffee39d3c5c735f77594d4014a4afc4c092 Mon Sep 17 00:00:00 2001 From: hans Date: Thu, 16 Feb 2012 17:47:04 +0000 Subject: Fix build on SunOS. --- comms/scmxx/Makefile | 4 ++-- comms/snooper/Makefile | 5 ++++- comms/snooper/distinfo | 4 ++-- comms/snooper/patches/patch-ab | 12 ++++++++---- comms/synce-libsynce/Makefile | 4 +++- comms/synce-rra/Makefile | 4 +++- comms/synce-rra/distinfo | 5 +++-- comms/synce-rra/patches/patch-ad | 10 ++++++++-- comms/synce-rra/patches/patch-lib_syncmgr.c | 13 +++++++++++++ 9 files changed, 46 insertions(+), 15 deletions(-) create mode 100644 comms/synce-rra/patches/patch-lib_syncmgr.c (limited to 'comms') diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile index a08dbd1de79..ac5c4feea3c 100644 --- a/comms/scmxx/Makefile +++ b/comms/scmxx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2011/04/22 13:43:11 obache Exp $ +# $NetBSD: Makefile,v 1.49 2012/02/16 17:47:04 hans Exp $ # DISTNAME= scmxx-0.9.0 @@ -12,8 +12,8 @@ HOMEPAGE= http://www.hendrik-sattler.de/scmxx/ COMMENT= Data exchange utility for Siemens mobile phones GNU_CONFIGURE= yes -USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake msgfmt +LDFLAGS.SunOS+= -lintl INSTALLATION_DIRS+= share/doc/scmxx share/examples/scmxx PKG_DESTDIR_SUPPORT= user-destdir diff --git a/comms/snooper/Makefile b/comms/snooper/Makefile index 225ee5f928a..b3d59a17293 100644 --- a/comms/snooper/Makefile +++ b/comms/snooper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2011/12/18 18:18:50 dholland Exp $ +# $NetBSD: Makefile,v 1.29 2012/02/16 17:49:41 hans Exp $ DISTNAME= snooper-19991202 PKGREVISION= 3 @@ -23,6 +23,9 @@ PKG_GROUPS_VARS+= DIALER_GROUP UUCP_GROUP PKG_USERS_VARS= UUCP_USER SPECIAL_PERMS+= ${PREFIX}/bin/snooper ${UUCP_USER} ${DIALER_GROUP} 4555 +CFLAGS.SunOS+= -Du_int32_t=uint32_t +LDFLAGS.SunOS+= -l${BUILDLINK_LIBNAME.curses} + post-extract: ${RM} ${WRKSRC}/build/.depend diff --git a/comms/snooper/distinfo b/comms/snooper/distinfo index a4f8c2ddf8b..77a1d293e6e 100644 --- a/comms/snooper/distinfo +++ b/comms/snooper/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.9 2011/12/18 18:18:50 dholland Exp $ +$NetBSD: distinfo,v 1.10 2012/02/16 17:49:41 hans Exp $ SHA1 (snooper-19991202.tar.gz) = d6aba20cd14449d7b126f393cdb219fd627b7777 RMD160 (snooper-19991202.tar.gz) = 52d61dea95cac246afd5815bc32f31448f9c757b Size (snooper-19991202.tar.gz) = 38239 bytes SHA1 (patch-aa) = c819aa96cb6c5fde4cb79e73fe6ba5f499de8897 -SHA1 (patch-ab) = c1867c0284ea2e94c3ca14fd78a29bcba0c34dc6 +SHA1 (patch-ab) = 7dd3aeca56ae7ba98a95acb2619ef0d6960a3fed SHA1 (patch-ac) = 3e63795a9174fe060270acce9f208107e70e6f25 SHA1 (patch-main_c) = 0c0646839bbc2720ae07a6b1d20d1e737758d762 diff --git a/comms/snooper/patches/patch-ab b/comms/snooper/patches/patch-ab index eb4fa528c82..93324864cad 100644 --- a/comms/snooper/patches/patch-ab +++ b/comms/snooper/patches/patch-ab @@ -1,13 +1,17 @@ -$NetBSD: patch-ab,v 1.3 2011/12/18 18:18:50 dholland Exp $ +$NetBSD: patch-ab,v 1.4 2012/02/16 17:49:42 hans Exp $ - use standard headers - use NAME_MAX where available, as it's the standard symbol --- src/uucplock.c.orig 1999-12-02 03:12:46.000000000 +0000 +++ src/uucplock.c -@@ -38,8 +38,10 @@ static char sccsid[] = "@(#)uucplock.c 5 +@@ -37,9 +37,14 @@ static char sccsid[] = "@(#)uucplock.c 5 + #include "config.h" ++#include ++#include ++#include #include -#include +#include @@ -17,7 +21,7 @@ $NetBSD: patch-ab,v 1.3 2011/12/18 18:18:50 dholland Exp $ #include "pathnames.h" -@@ -52,9 +54,12 @@ static char sccsid[] = "@(#)uucplock.c 5 +@@ -52,9 +57,12 @@ static char sccsid[] = "@(#)uucplock.c 5 uu_lock(ttyname) char *ttyname; { @@ -31,7 +35,7 @@ $NetBSD: patch-ab,v 1.3 2011/12/18 18:18:50 dholland Exp $ off_t lseek(); (void)snprintf(tbuf, sizeof(tbuf), _PATH_LOCKDIRNAME, ttyname); -@@ -104,7 +109,11 @@ uu_lock(ttyname) +@@ -104,7 +112,11 @@ uu_lock(ttyname) uu_unlock(ttyname) char *ttyname; { diff --git a/comms/synce-libsynce/Makefile b/comms/synce-libsynce/Makefile index 97d55679ada..d6a5c57d91b 100644 --- a/comms/synce-libsynce/Makefile +++ b/comms/synce-libsynce/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2008/06/20 01:09:09 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2012/02/16 17:52:07 hans Exp $ # DISTNAME= synce-libsynce-0.9.1 @@ -14,5 +14,7 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_LIBTOOL= yes GNU_CONFIGURE= yes +CFLAGS.SunOS+= -D__EXTENSIONS__ + .include "../../converters/libiconv/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/synce-rra/Makefile b/comms/synce-rra/Makefile index f9abf1eee8d..0b7b2469737 100644 --- a/comms/synce-rra/Makefile +++ b/comms/synce-rra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2008/06/20 01:09:09 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2012/02/16 17:54:26 hans Exp $ # DISTNAME= synce-rra-0.9.1 @@ -19,6 +19,8 @@ USE_LANGUAGES= c c++ USE_LIBTOOL= yes GNU_CONFIGURE= yes +CFLAGS.SunOS+= -D__EXTENSIONS__ + .include "../../comms/synce-librapi2/buildlink3.mk" .include "../../comms/synce-libsynce/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" diff --git a/comms/synce-rra/distinfo b/comms/synce-rra/distinfo index 22cb63a2a34..442cf6c1ba5 100644 --- a/comms/synce-rra/distinfo +++ b/comms/synce-rra/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2007/10/10 17:12:51 rillig Exp $ +$NetBSD: distinfo,v 1.7 2012/02/16 17:54:26 hans Exp $ SHA1 (synce-rra-0.9.1.tar.gz) = 9532427890404a5f095df6b95e140c11e20e2e9c RMD160 (synce-rra-0.9.1.tar.gz) = af3b87221f28db88a744039b9c709f2a534d4602 @@ -6,8 +6,9 @@ Size (synce-rra-0.9.1.tar.gz) = 379075 bytes SHA1 (rra-fixes-after-V0_9_1.diff) = 14f25880b79ef27a573c227d151021954247d78c RMD160 (rra-fixes-after-V0_9_1.diff) = a030ee14e2b59cfcd9630e2520761099bf150515 Size (rra-fixes-after-V0_9_1.diff) = 11297 bytes -SHA1 (patch-ad) = 7d5bcf1b6e26355cec79522e5caa64528d7a8d82 +SHA1 (patch-ad) = 7a23f0909ef372d0a89e11fd95adf37301d3d883 SHA1 (patch-af) = 10c72841de2279a5f78713784d692c6c205cdce0 SHA1 (patch-ah) = 33debd3a81e7903a0b3d473383d605e5fad773c9 SHA1 (patch-ai) = f360b298cef4db55281382367ce3a93b9d1e5edc SHA1 (patch-aj) = c7379e194118506611de656c91cde2a49746bcd8 +SHA1 (patch-lib_syncmgr.c) = cc2884a3cbb84c56e5dd7e1dce4df9e8cc7e577a diff --git a/comms/synce-rra/patches/patch-ad b/comms/synce-rra/patches/patch-ad index a35e0650572..cb53e41acdf 100644 --- a/comms/synce-rra/patches/patch-ad +++ b/comms/synce-rra/patches/patch-ad @@ -1,9 +1,15 @@ -$NetBSD: patch-ad,v 1.1.1.1 2005/10/13 16:57:41 wiz Exp $ +$NetBSD: patch-ad,v 1.2 2012/02/16 17:54:26 hans Exp $ --- lib/rrac.c.orig 2004-08-01 20:02:51.000000000 +0200 +++ lib/rrac.c -@@ -11,8 +11,6 @@ +@@ -9,10 +9,12 @@ + #include + #include ++#ifdef __sun ++#include ++#endif ++ #define LETOH16(x) x = letoh16(x) #define LETOH32(x) x = letoh32(x) -#define HTOLE16(x) x = htole16(x) diff --git a/comms/synce-rra/patches/patch-lib_syncmgr.c b/comms/synce-rra/patches/patch-lib_syncmgr.c new file mode 100644 index 00000000000..aa0a4811d7c --- /dev/null +++ b/comms/synce-rra/patches/patch-lib_syncmgr.c @@ -0,0 +1,13 @@ +--- lib/syncmgr.c.orig 2005-07-08 21:25:22.000000000 +0200 ++++ lib/syncmgr.c 2012-01-26 21:40:31.623129670 +0100 +@@ -11,6 +11,10 @@ + #include + #include /* for MIN(a,b) */ + ++#ifdef __sun ++#include ++#endif ++ + #define VERBOSE 0 + + static const char* RRA_DIRECTORY = "rra"; -- cgit v1.2.3