[pkgsrc/pkgsrc-2017Q1]: pkgsrc/net/sipsak Pullup ticket #5389 - requested by ...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bcee14709e6d
branches:  pkgsrc-2017Q1
changeset: 360349:bcee14709e6d
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Mon May 01 09:52:27 2017 +0000

description:
Pullup ticket #5389 - requested by sevan
net/sipsak: build fix

Revisions pulled up:
- net/sipsak/Makefile                                           1.14-1.15
- net/sipsak/distinfo                                           1.5
- net/sipsak/patches/patch-header__f.c                          deleted
- net/sipsak/patches/patch-header__f.h                          deleted

---
   Module Name:    pkgsrc
   Committed By:   schwarz
   Date:           Sat Apr 29 10:01:07 UTC 2017

   Modified Files:
           pkgsrc/net/sipsak: Makefile

   Log Message:
   updated the download and home page URLs for sipsak

---
   Module Name:    pkgsrc
   Committed By:   schwarz
   Date:           Sat Apr 29 10:21:54 UTC 2017

   Modified Files:
           pkgsrc/net/sipsak: Makefile distinfo
   Removed Files:
           pkgsrc/net/sipsak/patches: patch-header__f.c patch-header__f.h

   Log Message:
   We do not need the inline removal patches since this can be achieved
   more easily with the existing substituion in Makefile (which initially
   had only been used for the Sunpro compiler).

diffstat:

 net/sipsak/Makefile                  |  15 ++++++---------
 net/sipsak/distinfo                  |   4 +---
 net/sipsak/patches/patch-header__f.c |  13 -------------
 net/sipsak/patches/patch-header__f.h |  11 -----------
 4 files changed, 7 insertions(+), 36 deletions(-)

diffs (84 lines):

diff -r 89b721490098 -r bcee14709e6d net/sipsak/Makefile
--- a/net/sipsak/Makefile       Mon May 01 09:48:24 2017 +0000
+++ b/net/sipsak/Makefile       Mon May 01 09:52:27 2017 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.13 2016/03/05 11:29:12 jperkin Exp $
+# $NetBSD: Makefile,v 1.13.10.1 2017/05/01 09:52:27 bsiegert Exp $
 
 DISTNAME=      sipsak-0.9.6-1
 PKGNAME=       ${DISTNAME:S/-1//}
 PKGREVISION=   7
 CATEGORIES=    net comms
-MASTER_SITES=  http://download.berlios.de/sipsak/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=sipsak.berlios/}
 
 MAINTAINER=    schwarz%NetBSD.org@localhost
-HOMEPAGE=      http://sipsak.org/
+HOMEPAGE=      https://sourceforge.net/projects/sipsak.berlios/
 COMMENT=       Sipsak is a command-line SIP testing utility
 LICENSE=       gnu-gpl-v2
 
@@ -16,14 +16,11 @@
 GNU_CONFIGURE= YES
 USE_TOOLS+=    gmake
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${PKGSRC_COMPILER} == "sunpro"
+# get rid of inline
 SUBST_CLASSES+=        inline
 SUBST_STAGE.inline=    post-patch
-SUBST_FILES.inline=    header_f.h
-SUBST_SED.inline=      -e 's/inline //g'
-.endif
+SUBST_FILES.inline=    header_f.h header_f.c
+SUBST_SED.inline=      -e 's/^inline //g'
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
diff -r 89b721490098 -r bcee14709e6d net/sipsak/distinfo
--- a/net/sipsak/distinfo       Mon May 01 09:48:24 2017 +0000
+++ b/net/sipsak/distinfo       Mon May 01 09:52:27 2017 +0000
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 00:35:37 agc Exp $
+$NetBSD: distinfo,v 1.4.12.1 2017/05/01 09:52:27 bsiegert Exp $
 
 SHA1 (sipsak-0.9.6-1.tar.gz) = 6d2fd2c90ea04be749e48927b3e7fc08c52166b6
 RMD160 (sipsak-0.9.6-1.tar.gz) = d5949e4309bda732b5aee462a4488bb9d850fe5a
 SHA512 (sipsak-0.9.6-1.tar.gz) = c2d62ddaf2ecc9616941cf002a0494d2f9c43747e6b527f8b1542e9b5ae143fc69b18fc140bd3f255896b0e8eb02f7d198cc1799a4041e2d0c95d90b653591fe
 Size (sipsak-0.9.6-1.tar.gz) = 158776 bytes
 SHA1 (patch-aa) = e4df10b6d074acd1f3d925f48849348516533814
-SHA1 (patch-header__f.c) = 5f1574ff7a595631b26cfdf6dcb3e7aae81338f7
-SHA1 (patch-header__f.h) = 728f670573b42d51744db9be6701f782653f0a93
diff -r 89b721490098 -r bcee14709e6d net/sipsak/patches/patch-header__f.c
--- a/net/sipsak/patches/patch-header__f.c      Mon May 01 09:48:24 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-header__f.c,v 1.1 2013/01/11 00:01:33 joerg Exp $
-
---- header_f.c.orig    2013-01-10 23:04:22.000000000 +0000
-+++ header_f.c
-@@ -604,7 +604,7 @@ void print_message_line(char *message)
- }
- 
- /* return pointer to the beginning of the message body */
--inline char* get_body(char *mes) {
-+char* get_body(char *mes) {
-       char *cr;
- 
-       if ((cr = strstr(mes, "\r\n\r\n")) != NULL) {
diff -r 89b721490098 -r bcee14709e6d net/sipsak/patches/patch-header__f.h
--- a/net/sipsak/patches/patch-header__f.h      Mon May 01 09:48:24 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-$NetBSD: patch-header__f.h,v 1.1 2013/01/11 00:01:33 joerg Exp $
-
---- header_f.h.orig    2013-01-10 23:04:10.000000000 +0000
-+++ header_f.h
-@@ -61,5 +61,5 @@ void new_transaction(char *message);
- 
- void print_message_line(char *message);
- 
--inline char* get_body(char *mes);
-+char* get_body(char *mes);
- #endif