From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Aug 13 15:10:14 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9ACF81065672 for ; Mon, 13 Aug 2012 15:10:14 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 72F768FC16 for ; Mon, 13 Aug 2012 15:10:14 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q7DFAEiu045718 for ; Mon, 13 Aug 2012 15:10:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q7DFAE3t045717; Mon, 13 Aug 2012 15:10:14 GMT (envelope-from gnats) Resent-Date: Mon, 13 Aug 2012 15:10:14 GMT Resent-Message-Id: <201208131510.q7DFAE3t045717@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Veniamin Gvozdikov Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B1BDF106564A for ; Mon, 13 Aug 2012 15:09:36 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 9CC178FC0C for ; Mon, 13 Aug 2012 15:09:36 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q7DF9aTd024341 for ; Mon, 13 Aug 2012 15:09:36 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q7DF9aTn024340; Mon, 13 Aug 2012 15:09:36 GMT (envelope-from nobody) Message-Id: <201208131509.q7DF9aTn024340@red.freebsd.org> Date: Mon, 13 Aug 2012 15:09:36 GMT From: Veniamin Gvozdikov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/170610: [update]: textproc/ctpp2 up to new version X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Aug 2012 15:10:14 -0000 >Number: 170610 >Category: ports >Synopsis: [update]: textproc/ctpp2 up to new version >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Aug 13 15:10:14 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Veniamin Gvozdikov >Release: FreeBSD 8.2-RELEASE >Organization: >Environment: FreeBSD ololo 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Aug 18 11:19:07 MSD 2011 root@ololo:/usr/obj/usr/src/sys/OLOLO amd64 >Description: Up to date. Critical changes, see changelog. >How-To-Repeat: >Fix: diff -ruN ctpp2.orig/Makefile ctpp2/Makefile --- ctpp2.orig/Makefile 2012-08-13 19:06:19.882162837 +0400 +++ ctpp2/Makefile 2012-08-13 19:05:45.844377867 +0400 @@ -6,7 +6,7 @@ # PORTNAME= ctpp2 -PORTVERSION= 2.8.1 +PORTVERSION= 2.8.2 CATEGORIES= textproc devel MASTER_SITES= http://ctpp.havoc.ru/download/ @@ -22,4 +22,55 @@ MAN1= ctpp2c.1 ctpp2vm.1 ctpp2i.1 ctpp2json.1 ctpp2-config.1 +OPTIONS_DEFINE= DEBUG DISCARD_ILSEQ DOCS MD5 OPTIMIZATION TRANSLITERATE +DEBUG_DESC= Enable debug output +DOCS_DESC= Enable htmldocs +OPTIMIZATION_DESC= Enable optimization +MD5_DESC= Enable md5 support +DISCARD_ILSEQ_DESC= Discard illegal sequence and continue +TRANSLITERATE_DESC= Enable transliteration in the conversion + +OPTIONS_DEFAULT= DISCARD_ILSEQ MD5 OPTIMIZATION TRANSLITERATE + +.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 diff -ruN ctpp2.orig/distinfo ctpp2/distinfo --- ctpp2.orig/distinfo 2012-08-13 19:06:19.882162837 +0400 +++ ctpp2/distinfo 2012-08-13 14:12:25.833280368 +0400 @@ -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 diff -ruN ctpp2.orig/files/patch-CMakeLists.txt ctpp2/files/patch-CMakeLists.txt --- ctpp2.orig/files/patch-CMakeLists.txt 1970-01-01 03:00:00.000000000 +0300 +++ ctpp2/files/patch-CMakeLists.txt 2012-08-13 18:55:33.500907118 +0400 @@ -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") + diff -ruN ctpp2.orig/pkg-plist ctpp2/pkg-plist --- ctpp2.orig/pkg-plist 2012-08-13 19:06:19.882162837 +0400 +++ ctpp2/pkg-plist 2012-08-13 18:58:44.807115589 +0400 @@ -65,8 +65,10 @@ 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 >Release-Note: >Audit-Trail: >Unformatted: