From 482d0eb8004bcb31dafa5c611fa6258fa20f0bfe Mon Sep 17 00:00:00 2001 From: Greg Larkin Date: Fri, 29 Aug 2008 20:18:54 +0000 Subject: [PATCH] - Updated ctpp2 to version 2.3.5 - Fixed ctpp2 build problem for amd64 - Updated p5-HTML-CTPP2 to version 2.3.6 and unbreak - Added BUILD_DEPENDS to get correct version of ctpp2 to avoid compilation errors in Perl module PR: ports/126331 Submitted by: Andrei V. Shetuhin (maintainer) Approved by: beech (mentor, implicit) --- textproc/ctpp2/Makefile | 5 +++-- textproc/ctpp2/distinfo | 6 +++--- textproc/ctpp2/files/patch-CMakeLists.txt | 11 +++++++++++ textproc/ctpp2/pkg-plist | 2 +- textproc/p5-HTML-CTPP2/Makefile | 5 ++--- textproc/p5-HTML-CTPP2/distinfo | 6 +++--- 6 files changed, 23 insertions(+), 12 deletions(-) create mode 100644 textproc/ctpp2/files/patch-CMakeLists.txt diff --git a/textproc/ctpp2/Makefile b/textproc/ctpp2/Makefile index 030c766b2f6d..1df3f7c6bfb0 100644 --- a/textproc/ctpp2/Makefile +++ b/textproc/ctpp2/Makefile @@ -6,9 +6,10 @@ # PORTNAME= ctpp2 -PORTVERSION= 2.3.3 +PORTVERSION= 2.3.5 CATEGORIES= textproc devel -MASTER_SITES= http://ctpp.havoc.ru/download/ +MASTER_SITES= http://ctpp.havoc.ru/download/ \ + LOCAL/glarkin MAINTAINER= reki@reki.ru COMMENT= C++ library to use templates in C/C++ projects, version 2 diff --git a/textproc/ctpp2/distinfo b/textproc/ctpp2/distinfo index a0cdbcc5b43c..c01e32341328 100644 --- a/textproc/ctpp2/distinfo +++ b/textproc/ctpp2/distinfo @@ -1,3 +1,3 @@ -MD5 (ctpp2-2.3.3.tar.gz) = 08b36d38b514050154ed2ac2a791de27 -SHA256 (ctpp2-2.3.3.tar.gz) = 0d2ac3094a263fa9862b87b4cc1ca217d20f0e0157a8f4568f1cb8db3432cda8 -SIZE (ctpp2-2.3.3.tar.gz) = 135102 +MD5 (ctpp2-2.3.5.tar.gz) = cd65c95100fd6bcae39aac35dd6dc8dc +SHA256 (ctpp2-2.3.5.tar.gz) = 57363827b305514ef3d42ab6998e53f5e443141d2f84a9a3e9786e76179b8617 +SIZE (ctpp2-2.3.5.tar.gz) = 135090 diff --git a/textproc/ctpp2/files/patch-CMakeLists.txt b/textproc/ctpp2/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..19236d8703d9 --- /dev/null +++ b/textproc/ctpp2/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2008-08-29 11:03:56.000000000 -0400 ++++ CMakeLists.txt 2008-08-29 11:04:01.000000000 -0400 +@@ -20,7 +20,7 @@ + OPTION(SKIP_RELINK_RPATH "Skip relinking and full RPATH for the install tree" OFF) + + # uild optimized code for following CPU (default i386) +-SET(CPU_TUNE "i686") ++SET(CPU_TUNE "generic") + + SET(CTPP_FLOAT_PRECISION 12) + diff --git a/textproc/ctpp2/pkg-plist b/textproc/ctpp2/pkg-plist index 909ed3784de2..a84fe831c9e5 100644 --- a/textproc/ctpp2/pkg-plist +++ b/textproc/ctpp2/pkg-plist @@ -48,7 +48,7 @@ include/ctpp2/VMSyscall.hpp lib/libctpp2-st.a lib/libctpp2.so lib/libctpp2.so.2 -lib/libctpp2.so.2.3.3 +lib/libctpp2.so.2.3.5 share/locale/ru_RU.CP1251/LC_MESSAGES/ctpp2.mo share/locale/ru_RU.KOI8-R/LC_MESSAGES/ctpp2.mo @dirrmtry share/locale/ru_RU.KOI8-R/LC_MESSAGES diff --git a/textproc/p5-HTML-CTPP2/Makefile b/textproc/p5-HTML-CTPP2/Makefile index 31209b7ee7eb..893e79e92c76 100644 --- a/textproc/p5-HTML-CTPP2/Makefile +++ b/textproc/p5-HTML-CTPP2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= HTML-CTPP2 -PORTVERSION= 2.3.0 +PORTVERSION= 2.3.6 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,10 +14,9 @@ PKGNAMEPREFIX= p5- MAINTAINER= reki@reki.ru COMMENT= Perl interface module to CTPP2 library +BUILD_DEPENDS= ctpp2>=2.3.5:${PORTSDIR}/textproc/ctpp2 LIB_DEPENDS= ctpp2:${PORTSDIR}/textproc/ctpp2 -BROKEN= Does not compile - PERL_CONFIGURE= yes MAN3= HTML::CTPP2.3 diff --git a/textproc/p5-HTML-CTPP2/distinfo b/textproc/p5-HTML-CTPP2/distinfo index 806ac7b485bc..daeb3fb2b0b3 100644 --- a/textproc/p5-HTML-CTPP2/distinfo +++ b/textproc/p5-HTML-CTPP2/distinfo @@ -1,3 +1,3 @@ -MD5 (HTML-CTPP2-2.3.0.tar.gz) = 6bca3a1fbd66b5e488115dea0a0f4cc0 -SHA256 (HTML-CTPP2-2.3.0.tar.gz) = 1f3c15a1333c1ae5b78bb2e79f1b1debe1aa069d8ba6d4e7ad7f77f8a48d875d -SIZE (HTML-CTPP2-2.3.0.tar.gz) = 51058 +MD5 (HTML-CTPP2-2.3.6.tar.gz) = a5b6c6392ec579d0dfd2db62a631cac2 +SHA256 (HTML-CTPP2-2.3.6.tar.gz) = 1655225f91a61c1dbac86aaa7016ab69adc8f342c42483cca640d49e21f10d4e +SIZE (HTML-CTPP2-2.3.6.tar.gz) = 51301