CVS commit: pkgsrc/devel/cunit

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Dec  3 08:46:39 UTC 2022

Modified Files:
        pkgsrc/devel/cunit: Makefile PLIST distinfo options.mk
Added Files:
        pkgsrc/devel/cunit/patches: patch-doc_Makefile.am
            patch-doc_headers_Makefile.am
Removed Files:
        pkgsrc/devel/cunit/patches: patch-aa patch-ab patch-ac

Log Message:
cunit: updated to 2.1.3

2.1.3
- Ability to build with a non-source directory build root
- Fixed files included in the download source file


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/cunit/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/cunit/PLIST pkgsrc/devel/cunit/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/cunit/options.mk
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/devel/cunit/patches/patch-aa \
    pkgsrc/devel/cunit/patches/patch-ab pkgsrc/devel/cunit/patches/patch-ac
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/cunit/patches/patch-doc_Makefile.am \
    pkgsrc/devel/cunit/patches/patch-doc_headers_Makefile.am

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

Modified files:

Index: pkgsrc/devel/cunit/Makefile
diff -u pkgsrc/devel/cunit/Makefile:1.8 pkgsrc/devel/cunit/Makefile:1.9
--- pkgsrc/devel/cunit/Makefile:1.8     Sun Jan  3 11:23:16 2021
+++ pkgsrc/devel/cunit/Makefile Sat Dec  3 08:46:39 2022
@@ -1,24 +1,24 @@
-# $NetBSD: Makefile,v 1.8 2021/01/03 11:23:16 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/12/03 08:46:39 adam Exp $
 
-DISTNAME=              CUnit-2.1-0-src
-PKGNAME=               CUnit-2.1
-PKGREVISION=           1
-CATEGORIES=            devel
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=cunit/}
-
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://cunit.sourceforge.net/
-COMMENT=               C Unit checking test software
+DISTNAME=      CUnit-2.1-3
+PKGNAME=       CUnit-2.1.3
+CATEGORIES=    devel
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=cunit/}
+EXTRACT_SUFX=  .tar.bz2
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://cunit.sourceforge.net/
+COMMENT=       C Unit checking test software
+LICENSE=       gnu-gpl-v2
 
-USE_TOOLS+=            autoconf:run
 USE_LIBTOOL=           yes
+USE_TOOLS+=            autoconf automake autoreconf
 GNU_CONFIGURE=         yes
-
-WRKSRC=                        ${WRKDIR}/CUnit-2.1-0
-
-INSTALLATION_DIRS+=    include/CUnit share/doc/CUnit
-INSTALLATION_DIRS+=    share/CUnit share/doc/CUnit/headers
+PKGCONFIG_OVERRIDE=    cunit.pc.in
 
 .include "options.mk"
 
+pre-configure:
+       cd ${WRKSRC} && autoreconf -fiv
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/cunit/PLIST
diff -u pkgsrc/devel/cunit/PLIST:1.4 pkgsrc/devel/cunit/PLIST:1.5
--- pkgsrc/devel/cunit/PLIST:1.4        Mon Jan  1 22:29:23 2018
+++ pkgsrc/devel/cunit/PLIST    Sat Dec  3 08:46:39 2022
@@ -1,15 +1,17 @@
-@comment $NetBSD: PLIST,v 1.4 2018/01/01 22:29:23 rillig Exp $
+@comment $NetBSD: PLIST,v 1.5 2022/12/03 08:46:39 adam Exp $
 include/CUnit/Automated.h
 include/CUnit/Basic.h
 ${PLIST.curses}include/CUnit/CUCurses.h
 include/CUnit/CUError.h
 include/CUnit/CUnit.h
+include/CUnit/CUnit_intl.h
 include/CUnit/Console.h
 include/CUnit/MyMem.h
 include/CUnit/TestDB.h
 include/CUnit/TestRun.h
 include/CUnit/Util.h
 lib/libcunit.la
+lib/pkgconfig/cunit.pc
 man/man3/CUnit.3
 share/CUnit/CUnit-List.dtd
 share/CUnit/CUnit-List.xsl
@@ -25,6 +27,7 @@ share/doc/CUnit/headers/Basic.h
 share/doc/CUnit/headers/CUCurses.h
 share/doc/CUnit/headers/CUError.h
 share/doc/CUnit/headers/CUnit.h
+share/doc/CUnit/headers/CUnit_intl.h
 share/doc/CUnit/headers/Console.h
 share/doc/CUnit/headers/MyMem.h
 share/doc/CUnit/headers/TestDB.h
Index: pkgsrc/devel/cunit/distinfo
diff -u pkgsrc/devel/cunit/distinfo:1.4 pkgsrc/devel/cunit/distinfo:1.5
--- pkgsrc/devel/cunit/distinfo:1.4     Tue Oct 26 10:14:28 2021
+++ pkgsrc/devel/cunit/distinfo Sat Dec  3 08:46:39 2022
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 10:14:28 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/12/03 08:46:39 adam Exp $
 
-BLAKE2s (CUnit-2.1-0-src.tar.gz) = b4248bb0c04edb2de053a05d3a610719d5c9f86f8b211a65f927421786f75483
-SHA512 (CUnit-2.1-0-src.tar.gz) = 564c297293e3578384c11daef70bc45619188ff823107a2bbb6e56cfa702941b1c316cd9a4cb1116ecc5aefababd153febc39907296392b59e669d3251f85fbf
-Size (CUnit-2.1-0-src.tar.gz) = 628767 bytes
-SHA1 (patch-aa) = bf27a2c600a217e4d53fc59b2765f1b87f168100
-SHA1 (patch-ab) = cc16d516fde43a5a4de62fce1a061dd6bd6366f7
-SHA1 (patch-ac) = 6f385dabae5dd46862dcaff157782dc5ec08d63a
+BLAKE2s (CUnit-2.1-3.tar.bz2) = 8abb090cf4e014440705b15c39d8ffeee88151a0e653cd128bcb3a3ef2e2a4b3
+SHA512 (CUnit-2.1-3.tar.bz2) = 547b417109332446dfab8fda17bf4ccd2da841dc93f824dc90a20635bcf1fb80fb2176500d8a0906940f3f3d3e2f77b2d70a71090c9ab84ad9af43f3582bc487
+Size (CUnit-2.1-3.tar.bz2) = 514500 bytes
+SHA1 (patch-doc_Makefile.am) = f4ac55770033284e6ad13fdc84cf3031b6b51b4c
+SHA1 (patch-doc_headers_Makefile.am) = e6bca5a57819878bc9d8a5ff2c34d20279d5b5a1

Index: pkgsrc/devel/cunit/options.mk
diff -u pkgsrc/devel/cunit/options.mk:1.1 pkgsrc/devel/cunit/options.mk:1.2
--- pkgsrc/devel/cunit/options.mk:1.1   Mon Oct 19 08:32:39 2015
+++ pkgsrc/devel/cunit/options.mk       Sat Dec  3 08:46:39 2022
@@ -1,8 +1,7 @@
-# $NetBSD: options.mk,v 1.1 2015/10/19 08:32:39 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2022/12/03 08:46:39 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.cunit
 PKG_SUPPORTED_OPTIONS= curses
-PKG_SUGGESTED_OPTIONS= # empty
 
 .include "../../mk/bsd.options.mk"
 
@@ -13,6 +12,4 @@ PLIST_VARS+=          curses
 PLIST.curses=          yes
 USE_NCURSES=           yes
 CONFIGURE_ARGS+=       --enable-curses
-LDFLAGS+=              -lcurses
-CFLAGS+=               -DNCURSES_OPAQUE=0
 .endif

Added files:

Index: pkgsrc/devel/cunit/patches/patch-doc_Makefile.am
diff -u /dev/null pkgsrc/devel/cunit/patches/patch-doc_Makefile.am:1.1
--- /dev/null   Sat Dec  3 08:46:39 2022
+++ pkgsrc/devel/cunit/patches/patch-doc_Makefile.am    Sat Dec  3 08:46:39 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-doc_Makefile.am,v 1.1 2022/12/03 08:46:39 adam Exp $
+
+Place documentation in the correct place.
+
+--- doc/Makefile.am    2009/01/10 17:32:20     1.1
++++ doc/Makefile.am    2009/01/10 17:32:29
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-docdir = $(prefix)/doc/@PACKAGE@
++docdir = $(prefix)/share/doc/@PACKAGE@
+ 
+ doc_DATA = \
+       CUnit_doc.css \
Index: pkgsrc/devel/cunit/patches/patch-doc_headers_Makefile.am
diff -u /dev/null pkgsrc/devel/cunit/patches/patch-doc_headers_Makefile.am:1.1
--- /dev/null   Sat Dec  3 08:46:39 2022
+++ pkgsrc/devel/cunit/patches/patch-doc_headers_Makefile.am    Sat Dec  3 08:46:39 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-doc_headers_Makefile.am,v 1.1 2022/12/03 08:46:39 adam Exp $
+
+lace documentation in the correct place.
+
+--- doc/headers/Makefile.am.orig       2022-12-02 22:10:17.000000000 +0000
++++ doc/headers/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-dochdrdir = $(prefix)/doc/@PACKAGE@/headers
++dochdrdir = $(prefix)/share/doc/@PACKAGE@/headers
+ 
+ INCLUDE_FILES = \
+       Automated.h \