From owner-svn-ports-all@FreeBSD.ORG Mon Oct 1 18:35:13 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 36E4C1065672; Mon, 1 Oct 2012 18:35:13 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 214EB8FC24; Mon, 1 Oct 2012 18:35:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q91IZCId094669; Mon, 1 Oct 2012 18:35:12 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q91IZCfa094660; Mon, 1 Oct 2012 18:35:12 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201210011835.q91IZCfa094660@svn.freebsd.org> From: Ruslan Mahmatkhanov Date: Mon, 1 Oct 2012 18:35:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r305138 - in head: textproc/ctpp2 textproc/ctpp2/files textproc/py-pyctpp2 www/cas X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Oct 2012 18:35:13 -0000 Author: rm Date: Mon Oct 1 18:35:12 2012 New Revision: 305138 URL: http://svn.freebsd.org/changeset/ports/305138 Log: - update to 2.8.2 - optionify the port - chase the update in dependend ports: - textproc/py-pyctpp2 - www/cas while here: - trim Makefile header - tab -> space change in pkg-descr:WWW PR: 170610 Submitted by: Veniamin Gvozdikov Approved by: maintainer timeout (> 1 month) Added: head/textproc/ctpp2/files/ head/textproc/ctpp2/files/patch-CMakeLists.txt (contents, props changed) Modified: head/textproc/ctpp2/Makefile head/textproc/ctpp2/distinfo head/textproc/ctpp2/pkg-descr head/textproc/ctpp2/pkg-plist head/textproc/py-pyctpp2/Makefile head/textproc/py-pyctpp2/pkg-descr head/www/cas/Makefile Modified: head/textproc/ctpp2/Makefile ============================================================================== --- head/textproc/ctpp2/Makefile Mon Oct 1 17:29:04 2012 (r305137) +++ head/textproc/ctpp2/Makefile Mon Oct 1 18:35:12 2012 (r305138) @@ -1,12 +1,8 @@ -# New ports collection makefile for: ctpp2 -# Date created: 25 Jan 2008 -# Whom: reki@reki.ru (Andrei V. Shetuhin) -# +# Created by: Andrei V. Shetuhin # $FreeBSD$ -# PORTNAME= ctpp2 -PORTVERSION= 2.8.1 +PORTVERSION= 2.8.2 CATEGORIES= textproc devel MASTER_SITES= http://ctpp.havoc.ru/download/ @@ -22,4 +18,53 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} MAN1= ctpp2c.1 ctpp2vm.1 ctpp2i.1 ctpp2json.1 ctpp2-config.1 +OPTIONS_DEFINE= DEBUG DISCARD_ILSEQ DOCS MD5 OPTIMIZATION TRANSLITERATE +OPTIONS_DEFAULT= DISCARD_ILSEQ MD5 OPTIMIZATION TRANSLITERATE +DEBUG_DESC= Enable debug output +OPTIMIZATION_DESC= Enable optimization +MD5_DESC= Enable md5 support +DISCARD_ILSEQ_DESC= Discard illegal sequence and continue +TRANSLITERATE_DESC= Enable transliteration in the conversion + +.include + +.if ${PORT_OPTIONS:MDEBUG} +CMAKE_ARGS+= -DDEBUG_MODE=ON +.else +CMAKE_ARGS+= -DDEBUG_MODE=OFF +.endif + +.if ${PORT_OPTIONS:MDOCS} +BUILD_DEPENDS+= rst2html:${PORTSDIR}/textproc/py-docutils +CMAKE_ARGS+= -DENABLE_DOCS=ON +PLIST_SUB+= DOCS="" +.else +CMAKE_ARGS+= -DENABLE_DOCS=OFF +PLIST_SUB+= DOCS="@comment " +.endif + +.if ${PORT_OPTIONS:MMD5} +CMAKE_ARGS+= -DMD5_SUPPORT=ON +.else +CMAKE_ARGS+= -DMD5_SUPPORT=OFF +.endif + +.if ${PORT_OPTIONS:MDISCARD_ILSEQ} +CMAKE_ARGS+= -DICONV_DISCARD_ILSEQ=ON +.else +CMAKE_ARGS+= -DICONV_DISCARD_ILSEQ=OFF +.endif + +.if ${PORT_OPTIONS:MTRANSLITERATE} +CMAKE_ARGS+= -DICONV_TRANSLITERATE=ON +.else +CMAKE_ARGS+= -DICONV_TRANSLITERATE=OFF +.endif + +.if ${PORT_OPTIONS:MOPTIMIZATION} +CMAKE_ARGS+= -DENABLE_OPTIMIZATION=ON +.else +CMAKE_ARGS+= -DENABLE_OPTIMIZATION=OFF +.endif + .include Modified: head/textproc/ctpp2/distinfo ============================================================================== --- head/textproc/ctpp2/distinfo Mon Oct 1 17:29:04 2012 (r305137) +++ head/textproc/ctpp2/distinfo Mon Oct 1 18:35:12 2012 (r305138) @@ -1,2 +1,2 @@ -SHA256 (ctpp2-2.8.1.tar.gz) = 451a42572cc713cbde56b659a20200f6feb73337ed0496ca9e5fa9cf79ebb33a -SIZE (ctpp2-2.8.1.tar.gz) = 214747 +SHA256 (ctpp2-2.8.2.tar.gz) = 4d14b395520cf34bae8522a51b03b96b2da06ab4ee338047930d167a23a3dfc5 +SIZE (ctpp2-2.8.2.tar.gz) = 240096 Added: head/textproc/ctpp2/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/ctpp2/files/patch-CMakeLists.txt Mon Oct 1 18:35:12 2012 (r305138) @@ -0,0 +1,44 @@ +--- CMakeLists.txt.orig 2012-07-13 16:53:18.000000000 +0400 ++++ CMakeLists.txt 2012-08-13 15:53:30.167118048 +0400 +@@ -21,6 +21,7 @@ + + OPTION(ICONV_DISCARD_ILSEQ "Discard illegal sequence and continue (iconv) [default: ON]" ON) + OPTION(ICONV_TRANSLITERATE "Enable transliteration in the conversion (iconv) [default: ON]" ON) ++OPTION(ENABLE_DOCS "Enable docs [default: OFF]" OFF) + + # Build optimized code for following CPU (default i386) + #SET(CPU_TUNE "i686") +@@ -656,6 +657,8 @@ + SET_TESTS_PROPERTIES(Calls_D PROPERTIES DEPENDS Calls_R) + ENDIF (DIFF_EXECUTABLE) + ++ ++IF(ENABLE_DOCS MATCHES "ON") + FIND_PROGRAM(RST2HTML_EXECUTABLE "rst2html" /usr/local/bin /usr/bin) + IF (RST2HTML_EXECUTABLE) + ADD_CUSTOM_COMMAND( +@@ -665,6 +668,7 @@ + ) + ADD_CUSTOM_TARGET(doc ALL DEPENDS template_language.html) + ENDIF (RST2HTML_EXECUTABLE) ++ENDIF(ENABLE_DOCS MATCHES "ON") + + # Install Headers + INSTALL(FILES include/CDT.hpp +@@ -810,13 +814,15 @@ + GROUP_READ + WORLD_READ) + ++IF(ENABLE_DOCS MATCHES "ON") + IF(RST2HTML_EXECUTABLE) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/template_language.html +- DESTINATION share/doc ++ DESTINATION share/doc/ctpp2 + PERMISSIONS OWNER_READ OWNER_WRITE + GROUP_READ + WORLD_READ) + ENDIF(RST2HTML_EXECUTABLE) ++ENDIF(ENABLE_DOCS MATCHES "ON") + + ENDIF("${CMAKE_SYSTEM_NAME}" MATCHES "Windows") + Modified: head/textproc/ctpp2/pkg-descr ============================================================================== --- head/textproc/ctpp2/pkg-descr Mon Oct 1 17:29:04 2012 (r305137) +++ head/textproc/ctpp2/pkg-descr Mon Oct 1 18:35:12 2012 (r305138) @@ -2,4 +2,4 @@ This is a simple set of C++ classes whic templates like perl modules Template Toolkit and HTML::Template::Pro Version 2. -WWW: http://ctpp.havoc.ru/ +WWW: http://ctpp.havoc.ru/ Modified: head/textproc/ctpp2/pkg-plist ============================================================================== --- head/textproc/ctpp2/pkg-plist Mon Oct 1 17:29:04 2012 (r305137) +++ head/textproc/ctpp2/pkg-plist Mon Oct 1 18:35:12 2012 (r305138) @@ -65,8 +65,10 @@ include/ctpp2/STLOstream.hpp include/ctpp2/STLPair.hpp include/ctpp2/STLString.hpp include/ctpp2/STLVector.hpp +%%DOCS%%%%DOCSDIR%%/template_language.html lib/libctpp2-st.a lib/libctpp2.so lib/libctpp2.so.2 lib/libctpp2.so.%%PORTVERSION%% +%%DOCS%%@dirrm %%DOCSDIR%% @dirrm include/ctpp2 Modified: head/textproc/py-pyctpp2/Makefile ============================================================================== --- head/textproc/py-pyctpp2/Makefile Mon Oct 1 17:29:04 2012 (r305137) +++ head/textproc/py-pyctpp2/Makefile Mon Oct 1 18:35:12 2012 (r305138) @@ -1,12 +1,9 @@ -# New ports collection makefile for: py-pyctpp2 -# Date created: 2012-06-24 -# Whom: Gvozdikov Veniamin -# +# Created by: Gvozdikov Veniamin # $FreeBSD$ -# PORTNAME= pyctpp2 PORTVERSION= 0.12.2 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/textproc/py-pyctpp2/pkg-descr ============================================================================== --- head/textproc/py-pyctpp2/pkg-descr Mon Oct 1 17:29:04 2012 (r305137) +++ head/textproc/py-pyctpp2/pkg-descr Mon Oct 1 18:35:12 2012 (r305138) @@ -1,3 +1,3 @@ Python interface to CTPP2 library. -WWW: http://pypi.python.org/pypi/pyctpp2 +WWW: http://pypi.python.org/pypi/pyctpp2 Modified: head/www/cas/Makefile ============================================================================== --- head/www/cas/Makefile Mon Oct 1 17:29:04 2012 (r305137) +++ head/www/cas/Makefile Mon Oct 1 18:35:12 2012 (r305138) @@ -3,6 +3,7 @@ PORTNAME= cas PORTVERSION= 3.5.5 +PORTREVISION= 1 CATEGORIES= www devel MASTER_SITES= http://cas.havoc.ru/download/