[93565] trunk/dports/textproc/zorba
ryandesign at macports.org
ryandesign at macports.org
Sat May 26 22:28:56 PDT 2012
Revision: 93565
https://trac.macports.org/changeset/93565
Author: ryandesign at macports.org
Date: 2012-05-26 22:28:56 -0700 (Sat, 26 May 2012)
Log Message:
-----------
zorba: use patchfiles instead of reinplaces
Modified Paths:
--------------
trunk/dports/textproc/zorba/Portfile
Added Paths:
-----------
trunk/dports/textproc/zorba/files/
trunk/dports/textproc/zorba/files/patch-docdir.diff
trunk/dports/textproc/zorba/files/patch-src-CMakeLists.txt.diff
trunk/dports/textproc/zorba/files/patch-src-types-schema-SchemaValidatorFilter.h.diff
Modified: trunk/dports/textproc/zorba/Portfile
===================================================================
--- trunk/dports/textproc/zorba/Portfile 2012-05-27 05:18:31 UTC (rev 93564)
+++ trunk/dports/textproc/zorba/Portfile 2012-05-27 05:28:56 UTC (rev 93565)
@@ -39,21 +39,10 @@
patch.dir ${worksrcpath}/..
-post-patch {
- # Do not install dependencies' libraries
- reinplace s/APPLE/FALSE/ ${patch.dir}/src/CMakeLists.txt
+patchfiles patch-docdir.diff \
+ patch-src-CMakeLists.txt.diff \
+ patch-src-types-schema-SchemaValidatorFilter.h.diff
- # XMLScanner::loadGrammar's toCache argument is optional
- reinplace {s/toCache/toCache = false/} \
- ${patch.dir}/src/types/schema/SchemaValidatorFilter.h
-
- # Install documentation in an unversioned directory
- reinplace {s/zorba-[^/)]*/zorba/} \
- ${patch.dir}/doc/c/examples/CMakeLists.txt \
- ${patch.dir}/doc/CMakeLists.txt \
- ${patch.dir}/doc/cxx/examples/CMakeLists.txt
-}
-
depends_build-append \
port:bison \
port:flex
Added: trunk/dports/textproc/zorba/files/patch-docdir.diff
===================================================================
--- trunk/dports/textproc/zorba/files/patch-docdir.diff (rev 0)
+++ trunk/dports/textproc/zorba/files/patch-docdir.diff 2012-05-27 05:28:56 UTC (rev 93565)
@@ -0,0 +1,70 @@
+Install documentation in an unversioned directory
+--- doc/CMakeLists.txt.orig 2010-07-14 08:23:17.000000000 -0500
++++ doc/CMakeLists.txt 2012-05-27 00:22:22.000000000 -0500
+@@ -55,34 +55,34 @@
+ ENDIF (BUILDING_SIMPLESTORE)
+
+ INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cxx/html
+- DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/cxx)
++ DESTINATION share/doc/zorba/cxx)
+
+ INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/c/html
+- DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/c)
++ DESTINATION share/doc/zorba/c)
+
+ IF (SWIG_FOUND)
+ INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/java/html
+- DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/java)
++ DESTINATION share/doc/zorba/java)
+
+ INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/php/html
+- DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/php)
++ DESTINATION share/doc/zorba/php)
+
+ INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/python/html
+- DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/python)
++ DESTINATION share/doc/zorba/python)
+
+ INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ruby/html
+- DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/ruby)
++ DESTINATION share/doc/zorba/ruby)
+ ENDIF (SWIG_FOUND)
+
+ INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zorba/html
+ DESTINATION
+- share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/zorba)
++ share/doc/zorba/zorba)
+
+ INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zorba/xqdoc
+ DESTINATION
+- share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/zorba)
++ share/doc/zorba/zorba)
+
+-INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
+-INSTALL(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
+-INSTALL(FILES ${CMAKE_SOURCE_DIR}/NOTICE.txt DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
+-INSTALL(FILES ${CMAKE_SOURCE_DIR}/AUTHORS.txt DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
++INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt DESTINATION share/doc/zorba)
++INSTALL(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION share/doc/zorba)
++INSTALL(FILES ${CMAKE_SOURCE_DIR}/NOTICE.txt DESTINATION share/doc/zorba)
++INSTALL(FILES ${CMAKE_SOURCE_DIR}/AUTHORS.txt DESTINATION share/doc/zorba)
+--- doc/c/examples/CMakeLists.txt.orig 2010-07-14 08:23:17.000000000 -0500
++++ doc/c/examples/CMakeLists.txt 2012-05-27 00:22:22.000000000 -0500
+@@ -61,4 +61,4 @@
+ ${CMAKE_CURRENT_BINARY_DIR}/cexamples.c
+ ${CMAKE_CURRENT_BINARY_DIR}/cparsing.xml
+ DESTINATION
+- share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/c/examples)
++ share/doc/zorba/c/examples)
+--- doc/cxx/examples/CMakeLists.txt.orig 2010-07-14 08:23:17.000000000 -0500
++++ doc/cxx/examples/CMakeLists.txt 2012-05-27 00:22:22.000000000 -0500
+@@ -73,7 +73,7 @@
+ # install the examples
+ INSTALL(FILES ${API_EXAMPLES} ${CMAKE_CURRENT_BINARY_DIR}/examples.cpp
+ DESTINATION
+- share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/cxx/examples)
++ share/doc/zorba/cxx/examples)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/Makefile.zorba
+ DESTINATION
+- share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/cxx/examples RENAME Makefile)
++ share/doc/zorba/cxx/examples RENAME Makefile)
Added: trunk/dports/textproc/zorba/files/patch-src-CMakeLists.txt.diff
===================================================================
--- trunk/dports/textproc/zorba/files/patch-src-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/textproc/zorba/files/patch-src-CMakeLists.txt.diff 2012-05-27 05:28:56 UTC (rev 93565)
@@ -0,0 +1,16 @@
+Do not install dependencies' libraries
+--- src/CMakeLists.txt.orig 2010-07-14 08:23:17.000000000 -0500
++++ src/CMakeLists.txt 2012-05-27 00:22:22.000000000 -0500
+@@ -195,10 +195,10 @@
+ )
+
+ #install external packages in Mac OS X package
+-IF ( APPLE )
++IF ( FALSE )
+ FOREACH(LIB ${Zorba_ICUUC} ${Zorba_ICUI18N} ${Zorba_ICU_DATA} ${Zorba_XERCESC} ${Zorba_XML2} )
+ STRING(STRIP ${LIB} LIBNAME)
+ MESSAGE(STATUS "Will install ${LIBNAME}")
+ INSTALL(FILES ${LIBNAME} DESTINATION lib)
+ ENDFOREACH(LIB)
+-ENDIF ( APPLE )
++ENDIF ( FALSE )
Added: trunk/dports/textproc/zorba/files/patch-src-types-schema-SchemaValidatorFilter.h.diff
===================================================================
--- trunk/dports/textproc/zorba/files/patch-src-types-schema-SchemaValidatorFilter.h.diff (rev 0)
+++ trunk/dports/textproc/zorba/files/patch-src-types-schema-SchemaValidatorFilter.h.diff 2012-05-27 05:28:56 UTC (rev 93565)
@@ -0,0 +1,12 @@
+XMLScanner::loadGrammar's toCache argument is optional
+--- src/types/schema/SchemaValidatorFilter.h.orig 2010-07-14 08:23:17.000000000 -0500
++++ src/types/schema/SchemaValidatorFilter.h 2012-05-27 00:22:22.000000000 -0500
+@@ -237,7 +237,7 @@
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER Grammar* loadGrammar(
+ const XERCES_CPP_NAMESPACE_QUALIFIER InputSource &src,
+ const short grammarType,
+- const bool toCache)
++ const bool toCache = false)
+ {
+ return 0;
+ }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120526/ad609036/attachment-0001.html>
More information about the macports-changes
mailing list