Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Jul 2005 08:05:48 GMT
From:      Gerrit Beine <tux@pinguru.net>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/83894: Update port: devel/simpletest
Message-ID:  <200507220805.j6M85mUJ051186@www.freebsd.org>
Resent-Message-ID: <200507220810.j6M8ANFm002860@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         83894
>Category:       ports
>Synopsis:       Update port: devel/simpletest
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 22 08:10:23 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Gerrit Beine
>Release:        FreeBSD 5.4-RELEASE-p1
>Organization:
pitcom GmbH
>Environment:
FreeBSD asus 5.4-RELEASE-p1 FreeBSD 5.4-RELEASE-p1 #0: Sun May 15 16:37:58 CEST 2005     root@asus:/usr/src/sys/i386/compile/ASUS  i386

>Description:
This is an update to current version 1.0.0.
I've PEARyfied the port as much as possible.
Because simpletest is no official PEAR package, it's a little tricky.

If you like it, please commit these changes.
>How-To-Repeat:
      
>Fix:
diff -Nur /usr/ports/devel/simpletest/Makefile simpletest/Makefile
--- /usr/ports/devel/simpletest/Makefile	Thu Dec 30 04:08:55 2004
+++ simpletest/Makefile	Fri Jul 22 10:01:09 2005
@@ -6,11 +6,8 @@
 #
 
 PORTNAME=	SimpleTest
-PORTVERSION=	1.0.r1
+PORTVERSION=	1.0.0
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME:L}/
-DISTNAME=	php_simple_test_1.0RC1
 
 MAINTAINER=	neuhauser@chello.cz
 COMMENT=	Unit testing, mock objects and web testing framework for PHP
@@ -19,90 +16,82 @@
 USE_PHP_BUILD=	yes
 NO_BUILD=	yes
 
-SIMPLETESTS?=	unit
-
-.include <bsd.port.pre.mk>
-
-PHP_CONFIG?=	${LOCALBASE}/bin/php-config
+TODO=		patch the tests for running with PEAR
+CATEGORY=	simpletest
 
-.if !defined(PEARDIR) && exists(${PHP_CONFIG})
-_PEARPREFIX!=	${PHP_CONFIG} --prefix
-_PEARDIR=	share/pear
-PEARDIR=	${_PEARPREFIX}/${_PEARDIR}
-.endif
-WRKSRC=		${WRKDIR}/${PORTNAME:L}
-PLIST_SUB+=	PEARDIR="${_PEARDIR}"
 .if !defined(NOPORTDOCS)
-DOCS=		HELP_MY_TESTS_DONT_WORK_ANYMORE LICENSE README VERSION \
-		docs/expectation_documentation.html \
-		docs/form_testing_documentation.html \
-		docs/group_test_documentation.html \
-		docs/index.html \
-		docs/mock_objects_documentation.html \
-		docs/overview.html \
-		docs/partial_mocks_documentation.html \
-		docs/reporter_documentation.html \
-		docs/server_stubs_documentation.html \
-		docs/unit_test_documentation.html \
-		docs/web_tester_documentation.html
+DOCS=		HELP_MY_TESTS_DONT_WORK_ANYMORE LICENSE README VERSION
+_DOCSDIR=	.
 .endif
 
-TESTS=		test/acceptance_test.php \
-		test/adapter_test.php \
-		test/all_tests.php \
-		test/authentication_test.php \
-		test/browser_test.php \
-		test/dumper_test.php \
-		test/errors_test.php \
-		test/expectation_test.php \
-		test/form_test.php \
-		test/frames_test.php \
-		test/http_test.php \
-		test/live_test.php \
-		test/options_test.php \
-		test/page_test.php \
-		test/parser_test.php \
-		test/real_sites_test.php \
-		test/remote_test.php \
-		test/shell_test.php \
-		test/shell_tester_test.php \
-		test/simple_mock_test.php \
-		test/socket_test.php \
-		test/tag_test.php \
-		test/unit_tests.php \
-		test/url_test.php \
-		test/user_agent_test.php \
-		test/visual_test.php \
-		test/web_tester_test.php \
-		test/xml_test.php
-
-CLASSES=	authentication.php browser.php dumper.php errors.php \
-		expectation.php extensions/pear_test_case.php \
-		extensions/phpunit_test_case.php form.php frames.php http.php \
-		mock_objects.php options.php page.php parser.php remote.php \
-		reporter.php scorer.php shell_tester.php simple_test.php \
-		socket.php tag.php unit_tester.php url.php user_agent.php \
-		web_tester.php xml.php
-
-pre-patch:
-	${CP} -r ${WRKSRC}/test ${WRKSRC}/test.beforeinstall
-
-#do-build:
-#	cd ${WRKSRC}/test.beforeinstall && \
-#	${LOCALBASE}/bin/php -f ${SIMPLETESTS}_tests.php
-
-do-install:
-	${MKDIR} ${DOCSDIR}
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-	${MKDIR} ${DATADIR}/test
-.for f in ${TESTS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}/${f}
-.endfor
-	${MKDIR} ${PEARDIR}/simpletest/extensions
-.for f in ${CLASSES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PEARDIR}/simpletest/${f}
-.endfor
+TESTS=		acceptance_test.php \
+		adapter_test.php \
+		all_tests.php \
+		authentication_test.php \
+		browser_test.php \
+		dumper_test.php \
+		encoding_test.php \
+		errors_test.php \
+		expectation_test.php \
+		form_test.php \
+		frames_test.php \
+		http_test.php \
+		live_test.php \
+		options_test.php \
+		page_test.php \
+		parse_error_test.php \
+		parser_test.php \
+		real_sites_test.php \
+		remote_test.php \
+		shell_test.php \
+		shell_tester_test.php \
+		simple_mock_test.php \
+		socket_test.php \
+		tag_test.php \
+		test_with_parse_error.php \
+		unit_tester_test.php \
+		unit_tests.php \
+		url_test.php \
+		user_agent_test.php \
+		visual_test.php \
+		web_tester_test.php \
+		xml_test.php
+_TESTSDIR=	test
+
+FILES=		extensions/pear_test_case.php \
+		extensions/phpunit_test_case.php \
+		authentication.php \
+		browser.php \
+		dumper.php \
+		encoding.php \
+		errors.php \
+		expectation.php \
+		form.php \
+		frames.php \
+		http.php \
+		mock_objects.php \
+		options.php \
+		page.php \
+		parser.php \
+		remote.php \
+		reporter.php \
+		runner.php \
+		scorer.php \
+		shell_tester.php \
+		simple_test.php \
+		socket.php \
+		tag.php \
+		unit_tester.php \
+		url.php \
+		user_agent.php \
+		web_tester.php \
+		xml.php
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+# This is to override PEAR's default settings - it's really bad
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME:L}
+DISTNAME=	${PORTNAME:L}_${PORTVERSION}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/g}
 .include <bsd.port.post.mk>
diff -Nur /usr/ports/devel/simpletest/distinfo simpletest/distinfo
--- /usr/ports/devel/simpletest/distinfo	Wed Dec 22 00:12:33 2004
+++ simpletest/distinfo	Fri Jul 22 09:45:55 2005
@@ -1,2 +1,2 @@
-MD5 (php_simple_test_1.0RC1.tar.gz) = 00ec0a4c94e5480c15550039886248c1
-SIZE (php_simple_test_1.0RC1.tar.gz) = 155315
+MD5 (PEAR/simpletest_1.0.0.tgz) = 0dcec3749afbd964c7f5259560a9c944
+SIZE (PEAR/simpletest_1.0.0.tgz) = 133521
diff -Nur /usr/ports/devel/simpletest/pkg-plist simpletest/pkg-plist
--- /usr/ports/devel/simpletest/pkg-plist	Wed Dec 22 00:12:33 2004
+++ simpletest/pkg-plist	Thu Jan  1 01:00:00 1970
@@ -1,75 +0,0 @@
-%%PEARDIR%%/simpletest/authentication.php
-%%PEARDIR%%/simpletest/browser.php
-%%PEARDIR%%/simpletest/dumper.php
-%%PEARDIR%%/simpletest/errors.php
-%%PEARDIR%%/simpletest/expectation.php
-%%PEARDIR%%/simpletest/extensions/pear_test_case.php
-%%PEARDIR%%/simpletest/extensions/phpunit_test_case.php
-%%PEARDIR%%/simpletest/form.php
-%%PEARDIR%%/simpletest/frames.php
-%%PEARDIR%%/simpletest/http.php
-%%PEARDIR%%/simpletest/mock_objects.php
-%%PEARDIR%%/simpletest/options.php
-%%PEARDIR%%/simpletest/page.php
-%%PEARDIR%%/simpletest/parser.php
-%%PEARDIR%%/simpletest/remote.php
-%%PEARDIR%%/simpletest/reporter.php
-%%PEARDIR%%/simpletest/scorer.php
-%%PEARDIR%%/simpletest/shell_tester.php
-%%PEARDIR%%/simpletest/simple_test.php
-%%PEARDIR%%/simpletest/socket.php
-%%PEARDIR%%/simpletest/tag.php
-%%PEARDIR%%/simpletest/unit_tester.php
-%%PEARDIR%%/simpletest/url.php
-%%PEARDIR%%/simpletest/user_agent.php
-%%PEARDIR%%/simpletest/web_tester.php
-%%PEARDIR%%/simpletest/xml.php
-%%PORTDOCS%%%%DOCSDIR%%/HELP_MY_TESTS_DONT_WORK_ANYMORE
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/VERSION
-%%PORTDOCS%%%%DOCSDIR%%/expectation_documentation.html
-%%PORTDOCS%%%%DOCSDIR%%/form_testing_documentation.html
-%%PORTDOCS%%%%DOCSDIR%%/group_test_documentation.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/mock_objects_documentation.html
-%%PORTDOCS%%%%DOCSDIR%%/overview.html
-%%PORTDOCS%%%%DOCSDIR%%/partial_mocks_documentation.html
-%%PORTDOCS%%%%DOCSDIR%%/reporter_documentation.html
-%%PORTDOCS%%%%DOCSDIR%%/server_stubs_documentation.html
-%%PORTDOCS%%%%DOCSDIR%%/unit_test_documentation.html
-%%PORTDOCS%%%%DOCSDIR%%/web_tester_documentation.html
-%%DATADIR%%/test/acceptance_test.php
-%%DATADIR%%/test/adapter_test.php
-%%DATADIR%%/test/all_tests.php
-%%DATADIR%%/test/authentication_test.php
-%%DATADIR%%/test/browser_test.php
-%%DATADIR%%/test/dumper_test.php
-%%DATADIR%%/test/errors_test.php
-%%DATADIR%%/test/expectation_test.php
-%%DATADIR%%/test/form_test.php
-%%DATADIR%%/test/frames_test.php
-%%DATADIR%%/test/http_test.php
-%%DATADIR%%/test/live_test.php
-%%DATADIR%%/test/options_test.php
-%%DATADIR%%/test/page_test.php
-%%DATADIR%%/test/parser_test.php
-%%DATADIR%%/test/real_sites_test.php
-%%DATADIR%%/test/remote_test.php
-%%DATADIR%%/test/shell_test.php
-%%DATADIR%%/test/shell_tester_test.php
-%%DATADIR%%/test/simple_mock_test.php
-%%DATADIR%%/test/socket_test.php
-%%DATADIR%%/test/tag_test.php
-%%DATADIR%%/test/unit_tests.php
-%%DATADIR%%/test/url_test.php
-%%DATADIR%%/test/user_agent_test.php
-%%DATADIR%%/test/visual_test.php
-%%DATADIR%%/test/web_tester_test.php
-%%DATADIR%%/test/xml_test.php
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/test
-@dirrm %%DATADIR%%
-@dirrm %%PEARDIR%%/simpletest/extensions
-@dirrm %%PEARDIR%%/simpletest
-@unexec rmdir %D/%%PEARDIR%% 2>/dev/null || true
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507220805.j6M85mUJ051186>