CVS commit: pkgsrc/net/sipsak

["Georg Schwarz" <schwarz%netbsd.org@localhost>]

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


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/sipsak/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/sipsak/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/net/sipsak/patches/patch-header__f.c \
    pkgsrc/net/sipsak/patches/patch-header__f.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/sipsak/Makefile
diff -u pkgsrc/net/sipsak/Makefile:1.14 pkgsrc/net/sipsak/Makefile:1.15
--- pkgsrc/net/sipsak/Makefile:1.14     Sat Apr 29 10:01:07 2017
+++ pkgsrc/net/sipsak/Makefile  Sat Apr 29 10:21:54 2017
@@ -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
 

Index: pkgsrc/net/sipsak/distinfo
diff -u pkgsrc/net/sipsak/distinfo:1.4 pkgsrc/net/sipsak/distinfo:1.5
--- pkgsrc/net/sipsak/distinfo:1.4      Wed Nov  4 00:35:37 2015
+++ pkgsrc/net/sipsak/distinfo  Sat Apr 29 10:21:54 2017
@@ -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