Date: Wed, 2 Sep 2009 03:00:53 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/138458: Update port: textproc/wbxm2 to 0.10.7 Message-ID: <20090902030053.6954b9ff.tkato432@yahoo.com> Resent-Message-ID: <200909011810.n81IA7Ql086939@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 138458
>Category: ports
>Synopsis: Update port: textproc/wbxm2 to 0.10.7
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Sep 01 18:10:07 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.2-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 0.10.7
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/textproc/wbxml2/Makefile textproc/wbxml2/Makefile
--- /usr/ports/textproc/wbxml2/Makefile 2009-08-02 21:41:45.000000000 +0900
+++ textproc/wbxml2/Makefile 2009-08-12 06:11:48.000000000 +0900
@@ -6,10 +6,9 @@
#
PORTNAME= wbxml2
-PORTVERSION= 0.10.6
+PORTVERSION= 0.10.7
CATEGORIES= textproc devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= libwbxml
+MASTER_SITES= SF/libwbxml
DISTNAME= libwbxml-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
@@ -17,20 +16,27 @@
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
-USE_BZIP2= YES
-USE_CMAKE= YES
+WRKSRC= ${WRKDIR}/libwbxml-${PORTVERSION}
+CONFIGURE_WRKSRC= ${WRKDIR}/libwbxml-${PORTVERSION}/build
+BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
+INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}
+
+USE_BZIP2= yes
+USE_CMAKE= yes
+CMAKE_SOURCE_PATH= ..
+USE_LDCONFIG= yes
-WRKSRC= ${WRKDIR}/libwbxml-${PORTVERSION}/build
-CMAKE_SOURCE_PATH=..
-PATCH_WRKSRC= ${WRKDIR}/libwbxml-${PORTVERSION}
-.if defined(NOPORTDOCS)
-EXTRA_PATCHES= ${FILESDIR}/noportdocs-CMakeLists.txt.diff
-.endif
-
-pre-patch:
- @cd ${PATCH_WRKSRC}
+DOCSDIR= ${PREFIX}/share/doc/libwbxml
post-extract:
- ${MKDIR} ${WRKSRC}
+ @${MKDIR} ${CONFIGURE_WRKSRC}
+
+post-install:
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
+.for file in AUTHORS BUGS ChangeLog NEWS README References THANKS TODO
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+.endif
.include <bsd.port.mk>
diff -urN /usr/ports/textproc/wbxml2/distinfo textproc/wbxml2/distinfo
--- /usr/ports/textproc/wbxml2/distinfo 2009-05-11 21:12:52.000000000 +0900
+++ textproc/wbxml2/distinfo 2009-08-12 05:51:54.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (libwbxml-0.10.6.tar.bz2) = 2befb9116a82915f7ed4af0820d80a44
-SHA256 (libwbxml-0.10.6.tar.bz2) = 5cb7b5d63c88e6baf4a57e5e6157591de815d9582ee110f85a744c705571aab1
-SIZE (libwbxml-0.10.6.tar.bz2) = 349749
+MD5 (libwbxml-0.10.7.tar.bz2) = 1f65a3f836df395a7839f3d331b0c6e7
+SHA256 (libwbxml-0.10.7.tar.bz2) = a584a8fbc7dd5c6fa2561c35dda95147fa590bc0c19342c080f9c8253d56ddd6
+SIZE (libwbxml-0.10.7.tar.bz2) = 349840
diff -urN /usr/ports/textproc/wbxml2/files/patch-CMakeLists.txt textproc/wbxml2/files/patch-CMakeLists.txt
--- /usr/ports/textproc/wbxml2/files/patch-CMakeLists.txt 2009-05-11 21:12:53.000000000 +0900
+++ textproc/wbxml2/files/patch-CMakeLists.txt 2009-08-12 06:10:20.000000000 +0900
@@ -1,11 +1,20 @@
---- CMakeLists.txt.orig 2009-04-24 14:49:51.000000000 +0000
-+++ CMakeLists.txt 2009-04-26 09:57:23.953012704 +0000
-@@ -174,7 +174,7 @@
- ENDIF( ENABLE_INSTALL_DOC )
+--- CMakeLists.txt.orig 2009-05-12 20:43:10.000000000 +0900
++++ CMakeLists.txt 2009-08-12 05:53:35.000000000 +0900
+@@ -36,7 +36,7 @@
- # todo: add requires in pc file
--INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/libwbxml2.pc" DESTINATION "${LIBDATA_INSTALL_DIR}/pkgconfig/" )
-+INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/libwbxml2.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig/" )
- # status output
- INCLUDE( ShowStatus )
- MESSAGE( STATUS "==================================================" )
+ SET( LIB_SUFFIX "" CACHE STRING "The library directory suffix. 32bit empty string, 64 for 64bit." )
+ SET( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE INTERNAL "libary location" )
+-SET( LIBDATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The library data directory" )
++SET( LIBDATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/libdata" CACHE PATH "The library data directory" )
+ SET( BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE INTERNAL "binary location" )
+ SET( SHARE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share" CACHE INTERNAL "data location" )
+ SET( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE INTERNAL "headers location" )
+@@ -176,7 +176,7 @@
+ # ADD_CUSTOM_TARGET( DoxygenDoc )
+ # ADD_DEPENDENCIES( DoxygenDoc DoxygenDocLibrary DoxygenDocTools )
+ #ENDIF ( BUILD_DOCUMENTATION )
+-OPTION( ENABLE_INSTALL_DOC "install documentation" ON )
++OPTION( ENABLE_INSTALL_DOC "install documentation" OFF )
+ IF( ENABLE_INSTALL_DOC )
+ ADD_DOCUMENTATION( TEXT FILE ${CMAKE_SOURCE_DIR}/AUTHORS )
+ ADD_DOCUMENTATION( TEXT FILE ${CMAKE_SOURCE_DIR}/BUGS )
diff -urN /usr/ports/textproc/wbxml2/pkg-plist textproc/wbxml2/pkg-plist
--- /usr/ports/textproc/wbxml2/pkg-plist 2009-05-11 21:12:53.000000000 +0900
+++ textproc/wbxml2/pkg-plist 2009-08-12 06:04:12.000000000 +0900
@@ -4,6 +4,7 @@
include/wbxml_base64.h
include/wbxml_buffers.h
include/wbxml_charset.h
+include/wbxml_config.h
include/wbxml_conv.h
include/wbxml_elt.h
include/wbxml_encoder.h
@@ -17,20 +18,16 @@
include/wbxml_tree.h
include/wbxml_tree_clb_wbxml.h
include/wbxml_tree_clb_xml.h
-include/wbxml_config.h
lib/libwbxml2.so
lib/libwbxml2.so.0
-lib/libwbxml2.so.0.0.15
+lib/libwbxml2.so.0.0.16
libdata/pkgconfig/libwbxml2.pc
-%%PORTDOCS%%share/doc/libwbxml/AUTHORS
-%%PORTDOCS%%share/doc/libwbxml/BUGS
-%%PORTDOCS%%share/doc/libwbxml/COPYING
-%%PORTDOCS%%share/doc/libwbxml/ChangeLog
-%%PORTDOCS%%share/doc/libwbxml/GNU-LGPL
-%%PORTDOCS%%share/doc/libwbxml/INSTALL
-%%PORTDOCS%%share/doc/libwbxml/NEWS
-%%PORTDOCS%%share/doc/libwbxml/README
-%%PORTDOCS%%share/doc/libwbxml/References
-%%PORTDOCS%%share/doc/libwbxml/THANKS
-%%PORTDOCS%%share/doc/libwbxml/TODO
-%%PORTDOCS%%@dirrm share/doc/libwbxml
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/References
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090902030053.6954b9ff.tkato432>