Date: Sat, 29 Sep 2012 20:38:28 +0000 (UTC) From: Jase Thew <jase@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305053 - in head/lang/chicken: . files Message-ID: <201209292038.q8TKcSQc090281@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jase Date: Sat Sep 29 20:38:27 2012 New Revision: 305053 URL: http://svn.freebsd.org/changeset/ports/305053 Log: - Update to 4.8.0 [1] - Convert to OPTIONSng, add DOCS option - Convert to new format Makefile header - Tidy up PORTDOCS handling Changes: http://code.call-cc.org/releases/4.8.0/NEWS PR: ports/171926 [1] Submitted by: Vitaly Magerya <vmagerya@gmail.com> (maintainer) Approved by: flo, culot (mentors, implicit) Added: head/lang/chicken/files/ head/lang/chicken/files/patch-rules-make (contents, props changed) Modified: head/lang/chicken/Makefile (contents, props changed) head/lang/chicken/distinfo (contents, props changed) head/lang/chicken/pkg-plist (contents, props changed) Modified: head/lang/chicken/Makefile ============================================================================== --- head/lang/chicken/Makefile Sat Sep 29 20:33:43 2012 (r305052) +++ head/lang/chicken/Makefile Sat Sep 29 20:38:27 2012 (r305053) @@ -1,12 +1,8 @@ -# New ports collection makefile for: CHICKEN -# Date created: 31 December 2002 -# Whom: Kimura Fuyuki <fuyuki@hadaly.org> -# +# Created by: Kimura Fuyuki <fuyuki@hadaly.org> # $FreeBSD$ -# PORTNAME= chicken -PORTVERSION= 4.7.0 +PORTVERSION= 4.8.0 CATEGORIES= lang scheme MASTER_SITES= http://code.call-cc.org/releases/${PORTVERSION}/ @@ -23,6 +19,7 @@ MAKE_ARGS+= PLATFORM=bsd PREFIX=${PREFIX C_COMPILER="${CC}" \ CXX_COMPILER="${CXX}" \ LIBRARIAN="${AR}" \ + DOCDIR="${DOCSDIR}" \ C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" NEW_ARCH= ${ARCH:S/i386/x86/:S/amd64/x86-64/} @@ -30,21 +27,28 @@ NEW_ARCH= ${ARCH:S/i386/x86/:S/amd64/x86 MAN1= chicken.1 chicken-bug.1 chicken-install.1 chicken-profile.1 \ chicken-status.1 chicken-uninstall.1 csc.1 csi.1 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> + +OPTIONS_DEFINE= DOCS .if ${ARCH} != "amd64" && ${ARCH} != "i386" && ${ARCH} != "sparc64" MAKE_ARGS+= HACKED_APPLY= .endif post-patch: - @${REINPLACE_CMD} '/^%.so:/s|$$| lib$$(PROGRAM_PREFIX)chicken$$(PROGRAM_SUFFIX)$$(SO)|' \ - ${WRKSRC}/rules.make - @${REINPLACE_CMD} \ - 's|^DOCDIR = .*$$|DOCDIR = ${DOCSDIR}|' \ - ${WRKSRC}/defaults.make +.if empty(PORT_OPTIONS:MDOCS) + ${REINPLACE_CMD} -e '/$$(DESTDIR)$$(IDOCDIR)/d' ${WRKSRC}/rules.make +.endif post-install: +.if ${PORT_OPTIONS:MDOCS} @${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR} +.endif @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD} -.include <bsd.port.post.mk> +# This only works *after* chicken is installed. +regression-test: build + (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \ + ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check) + +.include <bsd.port.mk> Modified: head/lang/chicken/distinfo ============================================================================== --- head/lang/chicken/distinfo Sat Sep 29 20:33:43 2012 (r305052) +++ head/lang/chicken/distinfo Sat Sep 29 20:38:27 2012 (r305053) @@ -1,2 +1,2 @@ -SHA256 (chicken-4.7.0.tar.gz) = 56afdbff812febe3f98ae437716ecaa96115732f21db5063ce413e4c7449a26c -SIZE (chicken-4.7.0.tar.gz) = 3392031 +SHA256 (chicken-4.8.0.tar.gz) = 5b2e8c6b4b13b502d8c684b394d80ed490d2884c03789353d895ab85d19979ab +SIZE (chicken-4.8.0.tar.gz) = 3970818 Added: head/lang/chicken/files/patch-rules-make ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/chicken/files/patch-rules-make Sat Sep 29 20:38:27 2012 (r305053) @@ -0,0 +1,13 @@ +--- rules.make.orig 2012-07-07 11:34:54.000000000 +0300 ++++ rules.make 2012-07-07 11:38:18.000000000 +0300 +@@ -242,8 +242,8 @@ + + # import libraries and extensions + +-%.so: %.o +- $(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_DLOADABLE_OPTIONS) $^ $(LINKER_OUTPUT_OPTION) $@ \ ++%.so: %.o $(PRIMARY_LIBCHICKEN) ++ $(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_DLOADABLE_OPTIONS) $< $(LINKER_OUTPUT_OPTION) $@ \ + $(LINKER_LIBRARY_PREFIX)$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(LINKER_LIBRARY_SUFFIX) \ + $(LIBRARIES) + Modified: head/lang/chicken/pkg-plist ============================================================================== --- head/lang/chicken/pkg-plist Sat Sep 29 20:33:43 2012 (r305052) +++ head/lang/chicken/pkg-plist Sat Sep 29 20:38:27 2012 (r305053) @@ -19,7 +19,6 @@ lib/chicken/6/lolevel.import.so lib/chicken/6/modules.db lib/chicken/6/ports.import.so lib/chicken/6/posix.import.so -lib/chicken/6/scheme.import.so lib/chicken/6/setup-api.import.so lib/chicken/6/setup-api.so lib/chicken/6/setup-download.import.so @@ -88,8 +87,8 @@ lib/libchicken.so.6 %%PORTDOCS%%%%DOCSDIR%%/manual/Unit tcp.html %%PORTDOCS%%%%DOCSDIR%%/manual/Unit utils.html %%PORTDOCS%%%%DOCSDIR%%/manual/Using the compiler.html -%%PORTDOCS%%%%DOCSDIR%%/manual/Using the interpreter.html %%PORTDOCS%%%%DOCSDIR%%/manual/chicken.png +%%PORTDOCS%%%%DOCSDIR%%/manual/Using the interpreter.html %%PORTDOCS%%%%DOCSDIR%%/manual/faq.html %%PORTDOCS%%%%DOCSDIR%%/manual/index.html %%PORTDOCS%%%%DOCSDIR%%/manual/manual.css
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209292038.q8TKcSQc090281>