- Update to 2.1.3

- Add LICENSE - Use USES=gmake - Use USES=libtool - Convert to new options helper - Add regression-test: - Cosmetic change - Update pkg-descr Changes: http://sourceforge.net/p/cunit/code/HEAD/tree/trunk/ChangeLog
svn path=/head/; revision=353698
2024-11-21 00:25:50 +00:00 · 2014-05-11 14:26:47 +00:00 · 2014-05-11 14:26:47 +00:00 · 5983804054 · 2021-03-31 03:12:20 +00:00
commit 5983804054
parent 8b6f856fe5
6 changed files with 62 additions and 158 deletions
--- a/devel/cunit/Makefile
+++ b/devel/cunit/Makefile
@ -2,96 +2,65 @@
 # $FreeBSD$

 PORTNAME=	cunit
-DISTVERSION=	2.1-0
-PORTREVISION=	2
+PORTVERSION=	2.1.3
 CATEGORIES=	devel
-MASTER_SITES=	SF/${PORTNAME}/CUnit/2.1-0
-DISTNAME=	${PORTNAME:S/^cu/CU/}-${DISTVERSION}-src
+MASTER_SITES=	SF/${PORTNAME}/CUnit/${PORTVERSION:R}-${PORTVERSION:E}
+DISTNAME=	CUnit-${PORTVERSION:R}-${PORTVERSION:E}

 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Automated unit testing framework for C

+LICENSE=	LGPL20
+
 CONFLICTS=	c-unit-[0-9]*

-WRKSRC=	${WRKDIR}/${PORTNAME:S/^cu/CU/}-${DISTVERSION}
-DOCSDIR=	${PREFIX}/share/doc/CUnit
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoheader
-USE_LDCONFIG=	yes
-
-OPTIONS_DEFINE=	DEB AUT BAS CON CUR EXA ITE MEM
-DEB_DESC=	Debug interface
-AUT_DESC=	Automated(XML) interface
+OPTIONS_DEFINE=	AUT BAS CON CUR DEB EXA ITE MEM
+OPTIONS_DEFAULT=AUT BAS CON
+OPTIONS_SUB=	yes
+AUT_DESC=	Automated (XML) interface
 BAS_DESC=	Basic interface
 CON_DESC=	Console interface
 CUR_DESC=	Curses interface
-EXA_DESC=	Compile example programs
-ITE_DESC=	Compile internal test program
+DEB_DESC=	Debug interface
+EXA_DESC=	Example programs
+ITE_DESC=	Internal test program
 MEM_DESC=	Internal memory tracking

-OPTIONS_DEFAULT=	AUT BAS CON
+GNU_CONFIGURE=	yes
+USES=		gmake libtool pathfix tar:bzip2
+USE_AUTOTOOLS=	aclocal autoconf autoheader automake libtoolize
+USE_LDCONFIG=	yes
+
+DATADIR=	${PREFIX}/share/CUnit
+DOCSDIR=	${PREFIX}/share/doc/CUnit
+EXAMPLESDIR=	${PREFIX}/share/examples/CUnit
+PORTDATA=	*
+PORTDOCS=	*
+PORTEXAMPLES=	*
+
+AUTOMAKE_ARGS=	--add-missing
+LIBTOOLIZE_ARGS=--copy --force --install
+PATHFIX_MAKEFILEIN=	Makefile.am
+
+AUT_CONFIGURE_ENABLE=	automated
+BAS_CONFIGURE_ENABLE=	basic
+CON_CONFIGURE_ENABLE=	console
+CUR_CONFIGURE_ENABLE=	curses
+DEB_CONFIGURE_ENABLE=	debug
+EXA_CONFIGURE_ENABLE=	examples
+ITE_CONFIGURE_ENABLE=	test
+MEM_CONFIGURE_ENABLE=	memtrace

 post-patch:
-	@${REINPLACE_CMD} -e 's|/doc/@PACKAGE@|/share/doc/@PACKAGE@|g' ${WRKSRC}/doc/Makefile.in
-	@${REINPLACE_CMD} -e 's|/doc/@PACKAGE@|/share/doc/@PACKAGE@|g' ${WRKSRC}/doc/headers/Makefile.in
-	@${REINPLACE_CMD} -e 's|/@PACKAGE@/Examples/Automated|/examples/@PACKAGE@/Automated|g' ${WRKSRC}/Examples/AutomatedTest/Makefile.in
-	@${REINPLACE_CMD} -e 's|/@PACKAGE@/Examples/Basic|/examples/@PACKAGE@/Basic|g' ${WRKSRC}/Examples/BasicTest/Makefile.in
-	@${REINPLACE_CMD} -e 's|/@PACKAGE@/Examples/Console|/examples/@PACKAGE@/Console|g' ${WRKSRC}/Examples/ConsoleTest/Makefile.in
-	@${REINPLACE_CMD} -e 's|/@PACKAGE@/Examples/Curses|/examples/@PACKAGE@/Curses|g' ${WRKSRC}/Examples/CursesTest/Makefile.in
-.if defined(NOPORTDOCS)
-	${REINPLACE_CMD} -e 's|CUnit doc Man Share|CUnit Man Share|g' ${WRKSRC}/Makefile.in
-.endif
+	@${REINPLACE_CMD} -e 's|/doc/@PACKAGE@|/share/doc/@PACKAGE@|g' ${WRKSRC}/doc/Makefile.am ${WRKSRC}/doc/headers/Makefile.am
+	@${REINPLACE_CMD} -e 's|/@PACKAGE@/Examples/|/examples/@PACKAGE@/|g' ${WRKSRC}/Examples/*/Makefile.in
+	@${REINPLACE_CMD} -e 's|CUnit-[A-Z][a-z]*\.[a-z]*|${DATADIR}/&|' ${WRKSRC}/CUnit/Sources/Automated/Automated.c
+	@${REINPLACE_CMD} -e '/fprintf/ s|Memory-Dump\.[a-z]*|${DATADIR}/&|' ${WRKSRC}/CUnit/Sources/Framework/MyMem.c

-.include <bsd.port.options.mk>
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcunit.so.1.0.1

-.if ${PORT_OPTIONS:MDEB}
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-.if ${PORT_OPTIONS:MAUT}
-PLIST_FILES+=		include/CUnit/Automated.h
-.else
-CONFIGURE_ARGS+=	--disable-automated
-.endif
-.if ${PORT_OPTIONS:MBAS}
-PLIST_FILES+=		include/CUnit/Basic.h
-.else
-CONFIGURE_ARGS+=	--disable-basic
-.endif
-.if ${PORT_OPTIONS:MCON}
-PLIST_FILES+=		include/CUnit/Console.h
-.else
-CONFIGURE_ARGS+=	--disable-console
-.endif
-.if ${PORT_OPTIONS:MCUR}
-CONFIGURE_ARGS+=	--enable-curses
-PLIST_FILES+=		include/CUnit/CUCurses.h
-.endif
-.if ${PORT_OPTIONS:MEXA}
-CONFIGURE_ARGS+=	--enable-examples
-.if ${PORT_OPTIONS:MAUT}
-PLIST_FILES+=		share/examples/CUnit/Automated/AutomatedTest \
-			share/examples/CUnit/Automated/README
-.endif
-.if ${PORT_OPTIONS:MBAS}
-PLIST_FILES+=		share/examples/CUnit/Basic/BasicTest \
-			share/examples/CUnit/Basic/README
-.endif
-.if ${PORT_OPTIONS:MCON}
-PLIST_FILES+=		share/examples/CUnit/Console/ConsoleTest \
-			share/examples/CUnit/Console/README
-.endif
-.if ${PORT_OPTIONS:MCUR}
-PLIST_FILES+=		share/examples/CUnit/Curses/CursesTest \
-			share/examples/CUnit/Curses/README
-.endif
-.endif
-.if ${PORT_OPTIONS:MITE}
-CONFIGURE_ARGS+=	--enable-test
-PLIST_FILES+=		share/CUnit/Test/test_cunit
-.endif
-.if ${PORT_OPTIONS:MMEM}
-CONFIGURE_ARGS+=	--enable-memtrace
-.endif
+regression-test test: build
+	cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check

 .include <bsd.port.mk>
--- a/devel/cunit/distinfo
+++ b/devel/cunit/distinfo
@ -1,2 +1,2 @@
-SHA256 (CUnit-2.1-0-src.tar.gz) = b5fc0ab0f03e8d287a3f65935c7e36fabfdcd9f926ee6f50ac621ea6ab6fa8c6
-SIZE (CUnit-2.1-0-src.tar.gz) = 628767
+SHA256 (CUnit-2.1-3.tar.bz2) = f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
+SIZE (CUnit-2.1-3.tar.bz2) = 514500
--- a/devel/cunit/files/patch-CUnit-Sources-Automated-Automated.c
+++ b/devel/cunit/files/patch-CUnit-Sources-Automated-Automated.c
@ -1,24 +0,0 @@
--- CUnit/Sources/Automated/Automated.c.orig	Wed Jul 25 09:07:09 2007
-+++ CUnit/Sources/Automated/Automated.c	Wed Jul 25 16:45:43 2007
-@@ -222,8 +222,8 @@
- 
-     fprintf(f_pTestResultFile,
-             "<?xml version=\"1.0\" ?> \n"
-            "<?xml-stylesheet type=\"text/xsl\" href=\"CUnit-Run.xsl\" ?> \n"
-            "<!DOCTYPE CUNIT_TEST_RUN_REPORT SYSTEM \"CUnit-Run.dtd\"> \n"
-+            "<?xml-stylesheet type=\"text/xsl\" href=\"/usr/local/share/CUnit/CUnit-Run.xsl\" ?> \n"
-+            "<!DOCTYPE CUNIT_TEST_RUN_REPORT SYSTEM \"/usr/local/share/CUnit/CUnit-Run.dtd\"> \n"
-             "<CUNIT_TEST_RUN_REPORT> \n"
-             "  <CUNIT_HEADER/> \n");
-   }
-@@ -509,8 +509,8 @@
- 
-     fprintf(pTestListFile,
-             "<?xml version=\"1.0\" ?> \n"
-            "<?xml-stylesheet type=\"text/xsl\" href=\"CUnit-List.xsl\" ?> \n"
-            "<!DOCTYPE CUNIT_TEST_LIST_REPORT SYSTEM \"CUnit-List.dtd\"> \n"
-+            "<?xml-stylesheet type=\"text/xsl\" href=\"/usr/local/share/CUnit/CUnit-List.xsl\" ?> \n"
-+            "<!DOCTYPE CUNIT_TEST_LIST_REPORT SYSTEM \"/usr/local/share/CUnit/CUnit-List.dtd\"> \n"
-             "<CUNIT_TEST_LIST_REPORT> \n"
-             "  <CUNIT_HEADER/> \n"
-             "  <CUNIT_LIST_TOTAL_SUMMARY> \n");
--- a/devel/cunit/files/patch-CUnit-Sources-Framework-MyMem.c
+++ b/devel/cunit/files/patch-CUnit-Sources-Framework-MyMem.c
@ -1,13 +0,0 @@
--- CUnit/Sources/Framework/MyMem.c.orig	Wed Jul 25 16:47:05 2007
-+++ CUnit/Sources/Framework/MyMem.c	Wed Jul 25 16:47:40 2007
-@@ -340,8 +340,8 @@
-   setvbuf(pFile, NULL, _IONBF, 0);
- 
-   fprintf(pFile, "<\?xml version=\"1.0\" \?>");
-  fprintf(pFile, "\n<\?xml-stylesheet type=\"text/xsl\" href=\"Memory-Dump.xsl\" \?>");
-  fprintf(pFile, "\n<!DOCTYPE MEMORY_DUMP_REPORT SYSTEM \"Memory-Dump.dtd\">");
-+  fprintf(pFile, "\n<\?xml-stylesheet type=\"text/xsl\" href=\"/usr/local/share/CUnit/Memory-Dump.xsl\" \?>");
-+  fprintf(pFile, "\n<!DOCTYPE MEMORY_DUMP_REPORT SYSTEM \"/usr/local/share/CUnit/Memory-Dump.dtd\">");
-   fprintf(pFile, "\n<MEMORY_DUMP_REPORT>");
-   fprintf(pFile, "\n  <MD_HEADER/>");
-   fprintf(pFile, "\n  <MD_RUN_LISTING>");
--- a/devel/cunit/pkg-descr
+++ b/devel/cunit/pkg-descr
@ -1,9 +1,11 @@
-CUnit is a lightweight system for writing, administering, and running
-unit tests in C. It provides C programmers a basic testing functionality
-with a flexible variety of user interfaces. CUnit is built as a static
-library which is linked with the user's testing code. It uses a simple
-framework for building test structures, and provides a rich set of
-assertions for testing common data types. In addition, several different
-interfaces are provided for running tests and reporting results.
+CUnit is a lightweight system for writing, administering, and running unit tests
+in C. It provides C programmers a basic testing functionality with a flexible
+variety of user interfaces.
+
+CUnit is built as a static library which is linked with the user's testing code.
+It uses a simple framework for building test structures, and provides a rich set
+of assertions for testing common data types. In addition, several different
+interfaces are provided for running tests and reporting results. These
+interfaces currently include: Automated, Basic, Console and Curses.

 WWW: http://cunit.sourceforge.net/
--- a/devel/cunit/pkg-plist
+++ b/devel/cunit/pkg-plist
@ -1,48 +1,18 @@
+%%AUT%%include/CUnit/Automated.h
+%%BAS%%include/CUnit/Basic.h
+%%CUR%%include/CUnit/CUCurses.h
 include/CUnit/CUError.h
 include/CUnit/CUnit.h
+include/CUnit/CUnit_intl.h
+%%CON%%include/CUnit/Console.h
 include/CUnit/MyMem.h
 include/CUnit/TestDB.h
 include/CUnit/TestRun.h
 include/CUnit/Util.h
 lib/libcunit.a
-lib/libcunit.la
 lib/libcunit.so
 lib/libcunit.so.1
+lib/libcunit.so.1.0.1
+libdata/pkgconfig/cunit.pc
 man/man3/CUnit.3.gz
-share/CUnit/CUnit-List.dtd
-share/CUnit/CUnit-List.xsl
-share/CUnit/CUnit-Run.dtd
-share/CUnit/CUnit-Run.xsl
-share/CUnit/Memory-Dump.dtd
-share/CUnit/Memory-Dump.xsl
-%%PORTDOCS%%%%DOCSDIR%%/CUnit_doc.css
-%%PORTDOCS%%%%DOCSDIR%%/error_handling.html
-%%PORTDOCS%%%%DOCSDIR%%/fdl.html
-%%PORTDOCS%%%%DOCSDIR%%/headers/Automated.h
-%%PORTDOCS%%%%DOCSDIR%%/headers/Basic.h
-%%PORTDOCS%%%%DOCSDIR%%/headers/CUCurses.h
-%%PORTDOCS%%%%DOCSDIR%%/headers/CUError.h
-%%PORTDOCS%%%%DOCSDIR%%/headers/CUnit.h
-%%PORTDOCS%%%%DOCSDIR%%/headers/Console.h
-%%PORTDOCS%%%%DOCSDIR%%/headers/MyMem.h
-%%PORTDOCS%%%%DOCSDIR%%/headers/TestDB.h
-%%PORTDOCS%%%%DOCSDIR%%/headers/TestRun.h
-%%PORTDOCS%%%%DOCSDIR%%/headers/Util.h
-%%PORTDOCS%%%%DOCSDIR%%/headers/Win.h
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/introduction.html
-%%PORTDOCS%%%%DOCSDIR%%/managing_tests.html
-%%PORTDOCS%%%%DOCSDIR%%/running_tests.html
-%%PORTDOCS%%%%DOCSDIR%%/test_registry.html
-%%PORTDOCS%%%%DOCSDIR%%/writing_tests.html
-@dirrmtry share/examples/CUnit/Curses
-@dirrmtry share/examples/CUnit/Console
-@dirrmtry share/examples/CUnit/Basic
-@dirrmtry share/examples/CUnit/Automated
-@dirrmtry share/examples/CUnit
-@dirrmtry share/CUnit/Test
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/headers
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrmtry share/doc
-@dirrm share/CUnit
@dirrm include/CUnit