diff options
author | hans <hans> | 2012-02-16 17:35:30 +0000 |
---|---|---|
committer | hans <hans> | 2012-02-16 17:35:30 +0000 |
commit | c104b12af4f9c0c0f0ca127ee7a9f471c4b051de (patch) | |
tree | 4c2da346df0aa2bf17cd6f8a89f43964ba09831e | |
parent | c59cad4826ebf5e72c74e234fff191307909e28c (diff) | |
download | pkgsrc-c104b12af4f9c0c0f0ca127ee7a9f471c4b051de.tar.gz |
Fix build on SunOS.
-rw-r--r-- | comms/multisync-gui/distinfo | 3 | ||||
-rw-r--r-- | comms/multisync-gui/patches/patch-configure | 15 | ||||
-rw-r--r-- | comms/obexftp/Makefile | 4 | ||||
-rw-r--r-- | comms/obexftp/distinfo | 4 | ||||
-rw-r--r-- | comms/obexftp/patches/patch-ai | 36 | ||||
-rw-r--r-- | comms/pilot-link/Makefile | 4 | ||||
-rw-r--r-- | comms/plp/Makefile | 4 |
7 files changed, 60 insertions, 10 deletions
diff --git a/comms/multisync-gui/distinfo b/comms/multisync-gui/distinfo index 077300ae851..8be81f5b94f 100644 --- a/comms/multisync-gui/distinfo +++ b/comms/multisync-gui/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/02/27 17:44:14 drochner Exp $ +$NetBSD: distinfo,v 1.2 2012/02/16 17:35:30 hans Exp $ SHA1 (multisync-gui-0.91.0.tar.gz) = 03b32007dab9945ee08affe6ac59be34f565adcb RMD160 (multisync-gui-0.91.0.tar.gz) = 7522f28e217acefde9076229da81ab4df627e2af Size (multisync-gui-0.91.0.tar.gz) = 112933 bytes SHA1 (patch-aa) = 13417a99cfeb6d50bbe3c9cafbe970e870e0b417 +SHA1 (patch-configure) = 8802f1d38d4f159e42ab5ce1730488c4095375ba diff --git a/comms/multisync-gui/patches/patch-configure b/comms/multisync-gui/patches/patch-configure new file mode 100644 index 00000000000..35563b046ed --- /dev/null +++ b/comms/multisync-gui/patches/patch-configure @@ -0,0 +1,15 @@ +$NetBSD: patch-configure,v 1.1 2012/02/16 17:35:30 hans Exp $ + +--- configure.orig 2006-10-12 20:48:13.000000000 +0200 ++++ configure 2012-01-26 20:54:21.447800794 +0100 +@@ -58,10 +58,6 @@ checkPython() + checkWAF() + { + echo -n "Checking for WAF : " +- #global installed waf with waf->waf.py link +- if [ -z "$WAF" ]; then +- WAF=`which waf 2>/dev/null` +- fi + #installed miniwaf in sourcedir + if [ -z "$WAF" ]; then + if [ -e "$WORKINGDIR/waf" ] ; then diff --git a/comms/obexftp/Makefile b/comms/obexftp/Makefile index 7912a0af649..6935a8b674f 100644 --- a/comms/obexftp/Makefile +++ b/comms/obexftp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2009/07/20 05:56:02 hasso Exp $ +# $NetBSD: Makefile,v 1.14 2012/02/16 17:40:29 hans Exp $ # DISTNAME= obexftp-0.20 @@ -21,6 +21,8 @@ CONFIGURE_ARGS+= --disable-perl CONFIGURE_ARGS+= --disable-python CONFIGURE_ARGS+= --disable-swig +LIBS.SunOS+= -lsocket -lnsl -liconv + .include "../../mk/bsd.prefs.mk" .if ((${OPSYS} == "NetBSD" && exists(/usr/include/bluetooth.h)) || ${OPSYS} == "DragonFly") diff --git a/comms/obexftp/distinfo b/comms/obexftp/distinfo index 7dca8d9e400..04805596d00 100644 --- a/comms/obexftp/distinfo +++ b/comms/obexftp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2009/07/20 05:56:02 hasso Exp $ +$NetBSD: distinfo,v 1.8 2012/02/16 17:40:29 hans Exp $ SHA1 (obexftp-0.20.tar.bz2) = 0b3a7d2aeb0dbd24d75761a7e59f42f46ea5ef82 RMD160 (obexftp-0.20.tar.bz2) = ded5cf4d95eac77d5f6ee0a39f3789eb962534ed @@ -11,7 +11,7 @@ SHA1 (patch-ae) = d08fd3b4aa5e2f61eda5ea6d3f6656f8b036af30 SHA1 (patch-af) = f1e96b8a15a4fec69b81d19635a674ee307d31c1 SHA1 (patch-ag) = 7a3f10354e8a86022cac360b8a36198d9e7449ab SHA1 (patch-ah) = c0fe5bd78e7614a7eb6adb7154676fd9bde7a31c -SHA1 (patch-ai) = 8baf3463303156e890316622ddeb011842acaa85 +SHA1 (patch-ai) = dca54c345dba0977f1bf90778e15cdd4676749ca SHA1 (patch-aj) = 26f6509d26aaa893fe6018bd048135fb077e0b9c SHA1 (patch-ak) = bdef026206a0dca2c4781b06bbdfdd90f1c934f6 SHA1 (patch-al) = 1f2dd6ed302711f17e33584cc34f6f674a6973c7 diff --git a/comms/obexftp/patches/patch-ai b/comms/obexftp/patches/patch-ai index 79ac585c893..bd4659c6ee9 100644 --- a/comms/obexftp/patches/patch-ai +++ b/comms/obexftp/patches/patch-ai @@ -1,4 +1,4 @@ -$NetBSD: patch-ai,v 1.3 2009/07/20 05:56:03 hasso Exp $ +$NetBSD: patch-ai,v 1.4 2012/02/16 17:40:29 hans Exp $ --- apps/obexftpd.c.orig 2006-04-13 07:57:55.000000000 +0200 +++ apps/obexftpd.c @@ -28,7 +28,35 @@ $NetBSD: patch-ai,v 1.3 2009/07/20 05:56:03 hasso Exp $ /* just until there is a server layer in obexftp */ #include <openobex/obex.h> -@@ -934,16 +946,21 @@ static void start_server(int transport) +@@ -56,6 +68,8 @@ + + #include "obexftp_sdp.h" + ++#define DEFFILEMOD (S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) /* 0644 */ ++ + /* define this to "", "\r\n" or "\n" */ + #define EOLCHARS "\n" + +@@ -72,7 +86,9 @@ + + //BEGIN of constant + ++#ifdef HAVE_BLUETOOTH + bdaddr_t *bt_src = NULL; ++#endif + char *device = NULL; + int channel = 10; /* OBEX_PUSH_HANDLE */ + +@@ -698,7 +714,7 @@ static int safe_save_file(char *name, co + #ifdef _WIN32 + fd = open(filename, O_RDWR | O_CREAT, 0); + #else +- fd = open(filename, O_RDWR | O_CREAT, DEFFILEMODE); ++ fd = open(filename, O_RDWR | O_CREAT, DEFFILEMOD); + #endif + + if ( fd < 0) { +@@ -934,16 +950,21 @@ static void start_server(int transport) exit(0); } @@ -60,7 +88,7 @@ $NetBSD: patch-ai,v 1.3 2009/07/20 05:56:03 hasso Exp $ reset: handle = OBEX_Init(transport, obex_event, 0); -@@ -963,12 +980,14 @@ reset: +@@ -963,12 +984,14 @@ reset: exit(-1); } break; @@ -75,7 +103,7 @@ $NetBSD: patch-ai,v 1.3 2009/07/20 05:56:03 hasso Exp $ case OBEX_TRANS_IRDA: if (0 > IrOBEX_ServerRegister(handle, "")) { perror("failed to register IrDA server"); -@@ -1002,11 +1021,13 @@ reset: +@@ -1002,11 +1025,13 @@ reset: goto reset; } diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile index b3d7548eac2..495e2defe17 100644 --- a/comms/pilot-link/Makefile +++ b/comms/pilot-link/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2011/04/22 13:43:11 obache Exp $ +# $NetBSD: Makefile,v 1.54 2012/02/16 17:42:19 hans Exp $ PKG_DESTDIR_SUPPORT= user-destdir @@ -17,6 +17,8 @@ CONFIGURE_ARGS+= --with-libpng CONFIGURE_ARGS+= --with-readline CONFIGURE_ARGS+= --enable-conduits +CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS + BUILD_DIRS= src bindings doc tests post-patch: diff --git a/comms/plp/Makefile b/comms/plp/Makefile index b341ebfbab1..65cb556f378 100644 --- a/comms/plp/Makefile +++ b/comms/plp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2011/12/19 13:44:07 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2012/02/16 17:44:15 hans Exp $ DISTNAME= plp_1_8 PKGNAME= plp-1.8 @@ -17,6 +17,8 @@ USE_TOOLS+= gmake USE_LIBTOOL= yes MAKE_JOBS_SAFE= no +LDFLAGS.SunOS+= -lsocket -lnsl + INSTALLATION_DIRS= bin lib do-install: |