svn commit: r353698 - in head/devel/cunit: . files

Sunpoet Po-Chuan Hsieh sunpoet at FreeBSD.org
Sun May 11 14:26:49 UTC 2014 

Author: sunpoet
Date: Sun May 11 14:26:47 2014
New Revision: 353698
URL: http://svnweb.freebsd.org/changeset/ports/353698
QAT: https://qat.redports.org/buildarchive/r353698/

Log:
  - 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

Deleted:
  head/devel/cunit/files/
Modified:
  head/devel/cunit/Makefile
  head/devel/cunit/distinfo
  head/devel/cunit/pkg-descr
  head/devel/cunit/pkg-plist

Modified: head/devel/cunit/Makefile
==============================================================================
--- head/devel/cunit/Makefile	Sun May 11 14:26:42 2014	(r353697)
+++ head/devel/cunit/Makefile	Sun May 11 14:26:47 2014	(r353698)
@@ -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 at FreeBSD.org
 COMMENT=	Automated unit testing framework for C
 
-CONFLICTS=	c-unit-[0-9]*
+LICENSE=	LGPL20
 
-WRKSRC=	${WRKDIR}/${PORTNAME:S/^cu/CU/}-${DISTVERSION}
-DOCSDIR=	${PREFIX}/share/doc/CUnit
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoheader
-USE_LDCONFIG=	yes
+CONFLICTS=	c-unit-[0-9]*
 
-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
-
-.include <bsd.port.options.mk>
-
-.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
+	@${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
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcunit.so.1.0.1
+
+regression-test test: build
+	cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.mk>

Modified: head/devel/cunit/distinfo
==============================================================================
--- head/devel/cunit/distinfo	Sun May 11 14:26:42 2014	(r353697)
+++ head/devel/cunit/distinfo	Sun May 11 14:26:47 2014	(r353698)
@@ -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

Modified: head/devel/cunit/pkg-descr
==============================================================================
--- head/devel/cunit/pkg-descr	Sun May 11 14:26:42 2014	(r353697)
+++ head/devel/cunit/pkg-descr	Sun May 11 14:26:47 2014	(r353698)
@@ -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/

Modified: head/devel/cunit/pkg-plist
==============================================================================
--- head/devel/cunit/pkg-plist	Sun May 11 14:26:42 2014	(r353697)
+++ head/devel/cunit/pkg-plist	Sun May 11 14:26:47 2014	(r353698)
@@ -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
- at dirrmtry share/examples/CUnit/Curses
- at dirrmtry share/examples/CUnit/Console
- at dirrmtry share/examples/CUnit/Basic
- at dirrmtry share/examples/CUnit/Automated
- at dirrmtry share/examples/CUnit
- at dirrmtry share/CUnit/Test
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/headers
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrmtry share/doc
- at dirrm share/CUnit
 @dirrm include/CUnit

More information about the svn-ports-all mailing list