diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2015-09-25 23:18:14 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2015-09-25 23:18:14 +0800 |
| commit | 5bfe6e1d65f6c7adfe67b3d97b7ba99f70f2f049 (patch) | |
| tree | c27c6790b30af1c88c32e2809e701382d3165ae7 /textproc | |
| parent | 3a21ea7c9f8d6e9cfd76a70df7fea02adf5ba45f (diff) | |
| download | freebsd-ports-gnome-5bfe6e1d65f6c7adfe67b3d97b7ba99f70f2f049.tar.gz freebsd-ports-gnome-5bfe6e1d65f6c7adfe67b3d97b7ba99f70f2f049.tar.zst freebsd-ports-gnome-5bfe6e1d65f6c7adfe67b3d97b7ba99f70f2f049.zip | |
- Add LICENSE
- Pet portlint
- Merge REINPLACE_CMD into patch
- Regenerate patches with `make makepatch`
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/wv2/Makefile | 8 | ||||
| -rw-r--r-- | textproc/wv2/files/patch-CMakeLists.txt | 24 | ||||
| -rw-r--r-- | textproc/wv2/files/patch-cmake-MacroCreateLibtoolFile.cmake | 8 |
3 files changed, 30 insertions, 10 deletions
diff --git a/textproc/wv2/Makefile b/textproc/wv2/Makefile index b5f9a69f4260..eecfb608f027 100644 --- a/textproc/wv2/Makefile +++ b/textproc/wv2/Makefile @@ -10,15 +10,15 @@ MASTER_SITES= SF/wvware/ MAINTAINER= ports@FreeBSD.org COMMENT= Library providing routines to access Microsoft Word files +LICENSE= LGPL20 +LICENSE_FILE= ${WRKSRC}/COPYING.LIB + USE_GNOME= libgsf GNU_CONFIGURE= yes -USES= cmake:outsource iconv pkgconfig libtool tar:bzip2 +USES= cmake:outsource iconv libtool pkgconfig tar:bzip2 USE_LDCONFIG= yes post-patch: - @${REINPLACE_CMD} -e 's|LIBGSF_INCLUDE_DIR|PC_LIBGSF_INCLUDE_DIRS|g' \ - -e 's|LIBGSF_LIBRARIES|PC_LIBGSF_LIBRARIES|g' \ - ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's|glib/giochannel.h|glib.h|g' \ ${WRKSRC}/src/olestream.h diff --git a/textproc/wv2/files/patch-CMakeLists.txt b/textproc/wv2/files/patch-CMakeLists.txt index 5a5a2ba5b713..2ef68b551e86 100644 --- a/textproc/wv2/files/patch-CMakeLists.txt +++ b/textproc/wv2/files/patch-CMakeLists.txt @@ -1,6 +1,15 @@ ---- CMakeLists.txt +--- CMakeLists.txt.orig 2009-10-31 18:22:43 UTC +++ CMakeLists.txt -@@ -59,7 +59,9 @@ +@@ -34,7 +34,7 @@ IF( WITH_ZLIB ) + FIND_PACKAGE( ZLIB REQUIRED ) + ENDIF( WITH_ZLIB ) + +-INCLUDE_DIRECTORIES( ${GLIB2_INCLUDE_DIR} ${LIBGSF_INCLUDE_DIR} ${ICONV_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ) ++INCLUDE_DIRECTORIES( ${GLIB2_INCLUDE_DIR} ${PC_LIBGSF_INCLUDE_DIRS} ${ICONV_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ) + + # + # Iconv checks +@@ -59,7 +59,9 @@ IF( HAVE_SYS_ICONV_H ) SET( ICONV_COMPILE_DEFINITIONS ${ICONV_COMPILE_DEFINITIONS} "-DHAVE_SYS_ICONV_H" ) ENDIF( HAVE_SYS_ICONV_H ) @@ -11,3 +20,14 @@ IF( MODERN_ICONV_RUN GREATER 0 OR NOT MODERN_ICONV_COMPILE ) MESSAGE( STATUS "wv2 depends on a modern iconv installation, supporting UNICODELITTLE and" ) +@@ -143,8 +145,8 @@ IF( ZLIB_FOUND ) + ENDIF( ZLIB_FOUND ) + + IF( LIBGSF_FOUND ) +- SET( _WV2_LDFLAGS ${_WV2_LDFLAGS} ${LIBGSF_LIBRARIES} ) +- SET( _WV2_CFLAGS ${_WV2_CFLAGS} ${LIBGSF_INCLUDE_DIR} ) ++ SET( _WV2_LDFLAGS ${_WV2_LDFLAGS} ${PC_LIBGSF_LIBRARIES} ) ++ SET( _WV2_CFLAGS ${_WV2_CFLAGS} ${PC_LIBGSF_INCLUDE_DIRS} ) + ENDIF( LIBGSF_FOUND ) + + IF( ICONV_FOUND ) diff --git a/textproc/wv2/files/patch-cmake-MacroCreateLibtoolFile.cmake b/textproc/wv2/files/patch-cmake-MacroCreateLibtoolFile.cmake index dc4b0da43dc0..97612c8a18d0 100644 --- a/textproc/wv2/files/patch-cmake-MacroCreateLibtoolFile.cmake +++ b/textproc/wv2/files/patch-cmake-MacroCreateLibtoolFile.cmake @@ -1,6 +1,6 @@ ---- ./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 @@ +--- cmake/MacroCreateLibtoolFile.cmake.orig 2009-10-31 18:22:43 UTC ++++ cmake/MacroCreateLibtoolFile.cmake +@@ -16,17 +16,18 @@ MACRO(CREATE_LIBTOOL_FILE _target _insta 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) @@ -24,7 +24,7 @@ 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 @@ +@@ -35,7 +36,7 @@ MACRO(CREATE_LIBTOOL_FILE _target _insta 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") |