kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update to 0.4.0 release

Browse source 
- Adopt

This required for upcoming KOffice-2.1 for KDE4

Approved by:	miwi (mentor)
Feature safe:	yes
This commit is contained in:
Dima Panov 2009-09-19 11:24:51 +00:00
parent 9b0c608794
commit 6094a1268c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=241715
6 changed files with 117 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
textproc/wv2/Makefile
View file

@ -6,25 +6,18 @@
#
PORTNAME= wv2
PORTVERSION= 0.3.1
PORTREVISION= 1
PORTVERSION= 0.4.0
CATEGORIES= textproc
MASTER_SITES= SF/wvware/${PORTNAME}/${PORTVERSION}
MASTER_SITES= SF/wvware/
MAINTAINER= ports@FreeBSD.org
MAINTAINER= fluffy@FreeBSD.org
COMMENT= A library providing routines to access Microsoft Word files
CONFIGURE_ARGS= --with-libiconv=${LOCALBASE} --disable-debug
USE_AUTOTOOLS= libtool:22
USE_GNOME= gnometarget libgsf
USE_ICONV= yes
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_CMAKE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
pre-configure:
@${REINPLACE_CMD} "s,-pedantic ,," ${WRKSRC}/configure
.include <bsd.port.mk>

6
textproc/wv2/distinfo
View file

@ -1,3 +1,3 @@
MD5 (wv2-0.3.1.tar.bz2) = 4a20200141cb1299055f2bf13b56989d
SHA256 (wv2-0.3.1.tar.bz2) = 896ff8ec59e280e8cb1ef9a953b364845dd65de1cdf8e4ed8a7e045a3f81c546
SIZE (wv2-0.3.1.tar.bz2) = 1094203
MD5 (wv2-0.4.0.tar.bz2) = e0acd7a551c898aab3fb6afafc606bb4
SHA256 (wv2-0.4.0.tar.bz2) = 0c6595e16cf9c5ec33ba0d653d3a980ac9df96f12f416645e01119bb299525d1
SIZE (wv2-0.4.0.tar.bz2) = 452586

55
textproc/wv2/files/patch-CMakeLists.txt Normal file
View file

@ -0,0 +1,55 @@
--- ./CMakeLists.txt.orig 2009-08-27 08:46:40.000000000 +1100
+++ ./CMakeLists.txt 2009-09-16 10:21:34.000000000 +1100
@@ -42,7 +42,7 @@
INCLUDE( CheckIncludeFile )
-CHECK_INCLUDE_FILE( sys/iconv.h HAVE_SYS_ICONV_H )
+#CHECK_INCLUDE_FILE( sys/iconv.h HAVE_SYS_ICONV_H )
# Add "COMPILE_DEFINITIONS definitions" to TRY_RUN only if we have compile definitions
@@ -59,19 +59,22 @@
SET( ICONV_COMPILE_DEFINITIONS ${ICONV_COMPILE_DEFINITIONS} "-DHAVE_SYS_ICONV_H" )
ENDIF( HAVE_SYS_ICONV_H )
-TRY_RUN( MODERN_ICONV_RUN MODERN_ICONV_COMPILE ${wvWare_BINARY_DIR}/CMakeTmp ${wvWare_SOURCE_DIR}/cmake/TestModernIconv.c COMPILE_DEFINITIONS ${ICONV_COMPILE_DEFINITIONS} )
+#TRY_RUN( MODERN_ICONV_RUN MODERN_ICONV_COMPILE ${wvWare_BINARY_DIR}/CMakeTmp ${wvWare_SOURCE_DIR}/cmake/TestModernIconv.c COMPILE_DEFINITIONS ${ICONV_COMPILE_DEFINITIONS} )
-IF( MODERN_ICONV_RUN GREATER 0 OR NOT MODERN_ICONV_COMPILE )
- MESSAGE( STATUS "wv2 depends on a modern iconv installation, supporting UNICODELITTLE and" )
- MESSAGE( STATUS "UNICODEBIG. The detected iconv version doesn't support these conversions." )
- MESSAGE( STATUS "" )
- MESSAGE( STATUS "Please get a new libiconv from http://www.gnu.org/software/libiconv/" )
- MESSAGE( STATUS "You might want to install the library to some alternative directory, in" )
- MESSAGE( STATUS "order not to overwrite your current installation. Please use the options" )
- MESSAGE( STATUS "-DICONV_INCLUDE_DIR=DIR and -DICONV_LIBRARIES=DIR to specify the location." )
- MESSAGE( STATUS "" )
- MESSAGE( FATAL_ERROR "* * * No iconv support - unable to continue. * * *" )
-ENDIF( MODERN_ICONV_RUN GREATER 0 OR NOT MODERN_ICONV_COMPILE )
+SET( MODERN_ICONV_RUN 1)
+SET( MODERN_ICONV_COMPILE 1 )
+
+#IF( MODERN_ICONV_RUN GREATER 0 OR NOT MODERN_ICONV_COMPILE )
+# MESSAGE( STATUS "wv2 depends on a modern iconv installation, supporting UNICODELITTLE and" )
+# MESSAGE( STATUS "UNICODEBIG. The detected iconv version doesn't support these conversions." )
+# MESSAGE( STATUS "" )
+# MESSAGE( STATUS "Please get a new libiconv from http://www.gnu.org/software/libiconv/" )
+# MESSAGE( STATUS "You might want to install the library to some alternative directory, in" )
+# MESSAGE( STATUS "order not to overwrite your current installation. Please use the options" )
+# MESSAGE( STATUS "-DICONV_INCLUDE_DIR=DIR and -DICONV_LIBRARIES=DIR to specify the location." )
+# MESSAGE( STATUS "" )
+# MESSAGE( FATAL_ERROR "* * * No iconv support - unable to continue. * * *" )
+#ENDIF( MODERN_ICONV_RUN GREATER 0 OR NOT MODERN_ICONV_COMPILE )
#
# Various checks
@@ -157,6 +160,8 @@
SET( _WV2_CFLAGS ${_WV2_CFLAGS} ${GLIB2_INCLUDE_DIR} )
ENDIF( GLIB2_FOUND )
+SET( _WV2_CFLAGS "${_WV2_CFLAGS} -I${CMAKE_INSTALL_PREFIX}/include/wv2" )
+
#
# Clean and prepare
#

35
textproc/wv2/files/patch-cmake-MacroCreateLibtoolFile.cmake Normal file
View file

@ -0,0 +1,35 @@
--- ./cmake/MacroCreateLibtoolFile.cmake.orig 2009-08-27 08:46:40.000000000 +1100
+++ ./cmake/MacroCreateLibtoolFile.cmake 2009-09-18 00:46:35.000000000 +1100
@@ -16,17 +16,18 @@
GET_TARGET_PROPERTY_WITH_DEFAULT(_target_age ${_target} LT_VERSION_AGE 0)
GET_TARGET_PROPERTY_WITH_DEFAULT(_target_revision ${_target} LT_VERSION_REVISION 0)
GET_TARGET_PROPERTY_WITH_DEFAULT(_target_installed ${_target} LT_INSTALLED yes)
- GET_TARGET_PROPERTY_WITH_DEFAULT(_target_shouldnotlink ${_target} LT_SHOULDNOTLINK yes)
+ GET_TARGET_PROPERTY_WITH_DEFAULT(_target_shouldnotlink ${_target} LT_SHOULDNOTLINK no)
GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlopen ${_target} LT_DLOPEN "")
GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlpreopen ${_target} LT_DLPREOPEN "")
GET_FILENAME_COMPONENT(_laname ${_target_location} NAME_WE)
GET_FILENAME_COMPONENT(_soname ${_target_location} NAME)
+ SET(__laname ${_laname}.la)
SET(_laname ${PROJECT_BINARY_DIR}/${_laname}.la)
- FILE(WRITE ${_laname} "# ${_laname} - a libtool library file\n")
- FILE(WRITE ${_laname} "# Generated by CMake ${CMAKE_VERSION} (like GNU libtool)\n")
- FILE(WRITE ${_laname} "\n# Please DO NOT delete this file!\n# It is necessary for linking the library with libtool.\n\n" )
+ FILE(WRITE ${_laname} "# ${__laname} - a libtool library file\n")
+ FILE(APPEND ${_laname} "# Generated by CMake ${CMAKE_VERSION} (like GNU libtool)\n")
+ FILE(APPEND ${_laname} "\n# Please DO NOT delete this file!\n# It is necessary for linking the library with libtool.\n\n" )
FILE(APPEND ${_laname} "# The name that we can dlopen(3).\n")
- FILE(APPEND ${_laname} "dlname='${_soname}'\n\n")
+ FILE(APPEND ${_laname} "dlname='${_soname}.${_target_current}'\n\n")
FILE(APPEND ${_laname} "# Names of this library.\n")
FILE(APPEND ${_laname} "library_names='${_soname}.${_target_current}.${_target_age}.${_target_revision} ${_soname}.${_target_current} ${_soname}'\n\n")
FILE(APPEND ${_laname} "# The name of the static archive.\n")
@@ -35,7 +36,7 @@
FILE(APPEND ${_laname} "dependency_libs='${_target_dependency_libs}'\n\n")
FILE(APPEND ${_laname} "# Names of additional weak libraries provided by this library\n")
FILE(APPEND ${_laname} "weak_library_names=''\n\n")
- FILE(APPEND ${_laname} "# Version information for ${_laname}.\n")
+ FILE(APPEND ${_laname} "# Version information for ${__laname}.\n")
FILE(APPEND ${_laname} "current=${_target_current}\n")
FILE(APPEND ${_laname} "age=${_target_age}\n")
FILE(APPEND ${_laname} "revision=${_target_revision}\n\n")

14
textproc/wv2/files/patch-cmake_FindIconv.cmake Normal file
View file

@ -0,0 +1,14 @@
--- ./cmake/FindIconv.cmake.orig 2009-08-27 08:46:40.000000000 +1100
+++ ./cmake/FindIconv.cmake 2009-09-16 09:41:24.000000000 +1100
@@ -13,9 +13,9 @@
SET(ICONV_FIND_QUIETLY TRUE)
ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
-FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
+FIND_PATH(ICONV_INCLUDE_DIR iconv.h PATHS /usr/local/include )
-FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
+FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 PATHS /usr/local/lib )
IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
SET(ICONV_FOUND TRUE)

8
textproc/wv2/pkg-plist
View file

@ -24,8 +24,12 @@ include/wv2/word97_generated.h
include/wv2/word_helper.h
include/wv2/wv2version.h
include/wv2/wvlog.h
lib/libwv2.a
include/wv2/zcodec.hxx
lib/libwv2.la
lib/libwv2.so
lib/libwv2.so.2
lib/libwv2.so.3
lib/libwv2.so.3.0.0
lib/wvWare/wv2.cmake
lib/wvWare/wv2-noconfig.cmake
@dirrm lib/wvWare
@dirrm include/wv2