Sat Apr 29 10:21:54 2017 UTC ()
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).


(schwarz)
diff -r1.14 -r1.15 pkgsrc/net/sipsak/Makefile
diff -r1.4 -r1.5 pkgsrc/net/sipsak/distinfo
diff -r1.1 -r0 pkgsrc/net/sipsak/patches/patch-header__f.c
diff -r1.1 -r0 pkgsrc/net/sipsak/patches/patch-header__f.h

cvs diff -r1.14 -r1.15 pkgsrc/net/sipsak/Makefile (expand / switch to unified diff)

--- pkgsrc/net/sipsak/Makefile 2017/04/29 10:01:07 1.14
+++ pkgsrc/net/sipsak/Makefile 2017/04/29 10:21:54 1.15
@@ -1,31 +1,28 @@ @@ -1,31 +1,28 @@
1# $NetBSD: Makefile,v 1.14 2017/04/29 10:01:07 schwarz Exp $ 1# $NetBSD: Makefile,v 1.15 2017/04/29 10:21:54 schwarz Exp $
2 2
3DISTNAME= sipsak-0.9.6-1 3DISTNAME= sipsak-0.9.6-1
4PKGNAME= ${DISTNAME:S/-1//} 4PKGNAME= ${DISTNAME:S/-1//}
5PKGREVISION= 7 5PKGREVISION= 7
6CATEGORIES= net comms 6CATEGORIES= net comms
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sipsak.berlios/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sipsak.berlios/}
8 8
9MAINTAINER= schwarz@NetBSD.org 9MAINTAINER= schwarz@NetBSD.org
10HOMEPAGE= https://sourceforge.net/projects/sipsak.berlios/ 10HOMEPAGE= https://sourceforge.net/projects/sipsak.berlios/
11COMMENT= Sipsak is a command-line SIP testing utility 11COMMENT= Sipsak is a command-line SIP testing utility
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14WRKSRC= ${WRKDIR}/${DISTNAME:S/-1//} 14WRKSRC= ${WRKDIR}/${DISTNAME:S/-1//}
15 15
16GNU_CONFIGURE= YES 16GNU_CONFIGURE= YES
17USE_TOOLS+= gmake 17USE_TOOLS+= gmake
18 18
19.include "../../mk/bsd.prefs.mk" 19# get rid of inline
20 
21.if ${PKGSRC_COMPILER} == "sunpro" 
22SUBST_CLASSES+= inline 20SUBST_CLASSES+= inline
23SUBST_STAGE.inline= post-patch 21SUBST_STAGE.inline= post-patch
24SUBST_FILES.inline= header_f.h 22SUBST_FILES.inline= header_f.h header_f.c
25SUBST_SED.inline= -e 's/inline //g' 23SUBST_SED.inline= -e 's/^inline //g'
26.endif 
27 24
28INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 25INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
29 26
30.include "../../security/openssl/buildlink3.mk" 27.include "../../security/openssl/buildlink3.mk"
31.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"

cvs diff -r1.4 -r1.5 pkgsrc/net/sipsak/distinfo (expand / switch to unified diff)

--- pkgsrc/net/sipsak/distinfo 2015/11/04 00:35:37 1.4
+++ pkgsrc/net/sipsak/distinfo 2017/04/29 10:21:54 1.5
@@ -1,9 +1,7 @@ @@ -1,9 +1,7 @@
1$NetBSD: distinfo,v 1.4 2015/11/04 00:35:37 agc Exp $ 1$NetBSD: distinfo,v 1.5 2017/04/29 10:21:54 schwarz Exp $
2 2
3SHA1 (sipsak-0.9.6-1.tar.gz) = 6d2fd2c90ea04be749e48927b3e7fc08c52166b6 3SHA1 (sipsak-0.9.6-1.tar.gz) = 6d2fd2c90ea04be749e48927b3e7fc08c52166b6
4RMD160 (sipsak-0.9.6-1.tar.gz) = d5949e4309bda732b5aee462a4488bb9d850fe5a 4RMD160 (sipsak-0.9.6-1.tar.gz) = d5949e4309bda732b5aee462a4488bb9d850fe5a
5SHA512 (sipsak-0.9.6-1.tar.gz) = c2d62ddaf2ecc9616941cf002a0494d2f9c43747e6b527f8b1542e9b5ae143fc69b18fc140bd3f255896b0e8eb02f7d198cc1799a4041e2d0c95d90b653591fe 5SHA512 (sipsak-0.9.6-1.tar.gz) = c2d62ddaf2ecc9616941cf002a0494d2f9c43747e6b527f8b1542e9b5ae143fc69b18fc140bd3f255896b0e8eb02f7d198cc1799a4041e2d0c95d90b653591fe
6Size (sipsak-0.9.6-1.tar.gz) = 158776 bytes 6Size (sipsak-0.9.6-1.tar.gz) = 158776 bytes
7SHA1 (patch-aa) = e4df10b6d074acd1f3d925f48849348516533814 7SHA1 (patch-aa) = e4df10b6d074acd1f3d925f48849348516533814
8SHA1 (patch-header__f.c) = 5f1574ff7a595631b26cfdf6dcb3e7aae81338f7 
9SHA1 (patch-header__f.h) = 728f670573b42d51744db9be6701f782653f0a93 

File Deleted: pkgsrc/net/sipsak/patches/Attic/patch-header__f.c

File Deleted: pkgsrc/net/sipsak/patches/Attic/patch-header__f.h