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).

4 files changed, 5 insertions, 34 deletions

diff --git a/net/sipsak/Makefile b/net/sipsak/Makefile
index 77149cda5d3..6e40479de80 100644
--- a/net/sipsak/Makefile
+++ b/net/sipsak/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/04/29 10:01:07 schwarz Exp $
+# $NetBSD: Makefile,v 1.15 2017/04/29 10:21:54 schwarz Exp $
 
 DISTNAME=	sipsak-0.9.6-1
 PKGNAME=	${DISTNAME:S/-1//}
@@ -16,14 +16,11 @@ WRKSRC=		${WRKDIR}/${DISTNAME:S/-1//}
 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 --git a/net/sipsak/distinfo b/net/sipsak/distinfo
index e977ddba529..2d2d700685b 100644
--- a/net/sipsak/distinfo
+++ b/net/sipsak/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 00:35:37 agc Exp $
+$NetBSD: distinfo,v 1.5 2017/04/29 10:21:54 schwarz 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 --git a/net/sipsak/patches/patch-header__f.c b/net/sipsak/patches/patch-header__f.c
deleted file mode 100644
index 835146506ed..00000000000
--- a/net/sipsak/patches/patch-header__f.c
+++ /dev/null
@@ -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 --git a/net/sipsak/patches/patch-header__f.h b/net/sipsak/patches/patch-header__f.h
deleted file mode 100644
index 20d46180c9e..00000000000
--- a/net/sipsak/patches/patch-header__f.h
+++ /dev/null
@@ -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