pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
libetonyek: Enable this package for reuse by libreoffice
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Wed Dec 2 22:06:05 2015 +0100
Changeset: 97bc1b8cec9a37dcc86e917964bd8ebc97ee16cf
Modified Files:
libetonyek/Makefile
libetonyek/PLIST
libetonyek/distinfo
liblxqt/Makefile
liblxqt/distinfo
libqtxdg/Makefile
Added Files:
libetonyek/buildlink3.mk
Removed Files:
libetonyek/patches/patch-configure
libetonyek/patches/patch-configure.ac
Log Message:
libetonyek: Enable this package for reuse by libreoffice
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=97bc1b8cec9a37dcc86e917964bd8ebc97ee16cf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
libetonyek/Makefile | 4 --
libetonyek/PLIST | 14 ++++++
libetonyek/buildlink3.mk | 20 +++++++++
libetonyek/distinfo | 2 -
libetonyek/patches/patch-configure | 81 -----------------------------------
libetonyek/patches/patch-configure.ac | 35 ---------------
liblxqt/Makefile | 2 +-
liblxqt/distinfo | 7 +--
libqtxdg/Makefile | 2 +-
9 files changed, 40 insertions(+), 127 deletions(-)
diffs:
diff --git a/libetonyek/Makefile b/libetonyek/Makefile
index 11ed91d..b8629e3 100644
--- a/libetonyek/Makefile
+++ b/libetonyek/Makefile
@@ -22,10 +22,6 @@ CXXFLAGS+= -std=c++0x
CONFIGURE_ARGS+= --disable-tests
CONFIGURE_ARGS+= --without-docs
-MDDS_LIBS=/usr/pkg/include
-MDDS_CFLAGS+=-I/usr/pkg/include
-PKG_CONFIG_PATH=/usr/pkg/include
-
PKGCONFIG_OVERRIDE+= libetonyek.pc.in
.include "../../wip/mdds/buildlink3.mk"
diff --git a/libetonyek/PLIST b/libetonyek/PLIST
index e69de29..8c210a2 100644
--- a/libetonyek/PLIST
+++ b/libetonyek/PLIST
@@ -0,0 +1,14 @@
+@comment $NetBSD$
+bin/key2raw
+bin/key2text
+bin/key2xhtml
+bin/numbers2csv
+bin/numbers2raw
+bin/numbers2text
+bin/pages2html
+bin/pages2raw
+bin/pages2text
+include/libetonyek-0.1/libetonyek/EtonyekDocument.h
+include/libetonyek-0.1/libetonyek/libetonyek.h
+lib/libetonyek-0.1.la
+lib/pkgconfig/libetonyek-0.1.pc
diff --git a/libetonyek/buildlink3.mk b/libetonyek/buildlink3.mk
new file mode 100644
index 0000000..7b632d5
--- /dev/null
+++ b/libetonyek/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD$
+
+BUILDLINK_TREE+= libetonyek
+
+.if !defined(LIBETONYEK_BUILDLINK3_MK)
+LIBETONYEK_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libetonyek+= libetonyek>=0.1.4
+BUILDLINK_PKGSRCDIR.libetonyek?= ../../wip/libetonyek
+
+.include "../../wip/mdds/buildlink3.mk"
+.include "../../converters/libwpd/buildlink3.mk"
+.include "../../converters/librevenge/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/glm/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.endif # LIBETONYEK_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -libetonyek
diff --git a/libetonyek/distinfo b/libetonyek/distinfo
index f8a7251..76aabd8 100644
--- a/libetonyek/distinfo
+++ b/libetonyek/distinfo
@@ -4,5 +4,3 @@ SHA1 (libetonyek-0.1.4.tar.bz2) = 447dc05b4b9b8f63b09b27116df6b3c3f88d958e
RMD160 (libetonyek-0.1.4.tar.bz2) = 7e77158c812210b006d521dcede6cdd7f2a8f6d0
SHA512 (libetonyek-0.1.4.tar.bz2) = 96b57c9873575de56ea9017d8fff49d4ac14cc6e74a626cba6a12a01fe0720fae26710e9e549e990ea35159cda8a91eb8ba5f62a5f9827a2d3cfdca60befd337
Size (libetonyek-0.1.4.tar.bz2) = 1565397 bytes
-SHA1 (patch-configure) = 96fc0c472618fc3083c834632ff4818280d57882
-SHA1 (patch-configure.ac) = b9753691d3948c5a85248c8560ff8dd928f12e7f
diff --git a/libetonyek/patches/patch-configure b/libetonyek/patches/patch-configure
deleted file mode 100644
index 9bed869..0000000
--- a/libetonyek/patches/patch-configure
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD$
-
---- configure.orig 2015-11-17 19:13:04.000000000 +0000
-+++ configure
-@@ -3147,7 +3147,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- if test "${with_mdds+set}" = set; then :
- withval=$with_mdds;
- else
-- with_mdds="1.0"
-+ with_mdds="1.0.0"
- fi
-
-
-@@ -17451,7 +17451,7 @@ $as_echo "$ac_cv_path_SED" >&6; }
- GPERF=${GPERF-"${am_missing_run}gperf"}
-
-
--if test "$with_mdds" = "1.0"; then :
-+if test "$with_mdds" = "1.0.0"; then :
- ax_cxx_compile_cxx11_required=true
- ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -18118,7 +18118,7 @@ CPPFLAGS="${saved_CPPFLAGS}"
- # =========
- # Find mdds
- # =========
--if test "$with_mdds" = "1.0"; then :
-+if test "$with_mdds" = "1.0.0"; then :
-
-
- pkg_failed=no
-@@ -18129,12 +18129,12 @@ if test -n "$MDDS_CFLAGS"; then
- pkg_cv_MDDS_CFLAGS="$MDDS_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds-1.0\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "mdds-1.0") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds-1.0.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "mdds-1.0.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_MDDS_CFLAGS=`$PKG_CONFIG --cflags "mdds-1.0" 2>/dev/null`
-+ pkg_cv_MDDS_CFLAGS=`$PKG_CONFIG --cflags "mdds-1.0.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -18146,12 +18146,12 @@ if test -n "$MDDS_LIBS"; then
- pkg_cv_MDDS_LIBS="$MDDS_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds-1.0\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "mdds-1.0") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds-1.0.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "mdds-1.0.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_MDDS_LIBS=`$PKG_CONFIG --libs "mdds-1.0" 2>/dev/null`
-+ pkg_cv_MDDS_LIBS=`$PKG_CONFIG --libs "mdds-1.0.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -18172,14 +18172,14 @@ else
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- MDDS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mdds-1.0" 2>&1`
-+ MDDS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mdds-1.0.0" 2>&1`
- else
-- MDDS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mdds-1.0" 2>&1`
-+ MDDS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mdds-1.0.0" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$MDDS_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (mdds-1.0) were not met:
-+ as_fn_error $? "Package requirements (mdds-1.0.0) were not met:
-
- $MDDS_PKG_ERRORS
-
diff --git a/libetonyek/patches/patch-configure.ac b/libetonyek/patches/patch-configure.ac
deleted file mode 100644
index 3c6c64c..0000000
--- a/libetonyek/patches/patch-configure.ac
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
---- configure.ac.orig 2015-11-17 15:32:31.000000000 +0000
-+++ configure.ac
-@@ -24,8 +24,8 @@ AC_LANG([C++])
- # Configure options
- # =================
- AC_ARG_WITH([mdds],
-- AS_HELP_STRING([--with-mdds=1.0|0.x], [Specify which version of mdds to use (1.0 is the default)]),
-- [], [with_mdds="1.0"])
-+ AS_HELP_STRING([--with-mdds=1.0.0|0.x], [Specify which version of mdds to use (1.0.0 is the default)]),
-+ [], [with_mdds="1.0.0"])
-
- # ===========================
- # Find required base packages
-@@ -47,7 +47,7 @@ AC_PROG_SED
-
- AM_MISSING_PROG([GPERF], [gperf])
-
--AS_IF([test "$with_mdds" = "1.0"], [AX_CXX_COMPILE_STDCXX_11([noext])])
-+AS_IF([test "$with_mdds" = "1.0.0"], [AX_CXX_COMPILE_STDCXX_11([noext])])
-
- # ===============
- # Find librevenge
-@@ -128,8 +128,8 @@ AC_SUBST([GLM_CFLAGS])
- # =========
- # Find mdds
- # =========
--AS_IF([test "$with_mdds" = "1.0"], [
-- PKG_CHECK_MODULES([MDDS], [mdds-1.0])
-+AS_IF([test "$with_mdds" = "1.0.0"], [
-+ PKG_CHECK_MODULES([MDDS], [mdds-1.0.0])
- ], [
- PKG_CHECK_MODULES([MDDS], [mdds])
- AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type])
diff --git a/liblxqt/Makefile b/liblxqt/Makefile
index 1c33855..49dc8b1 100644
--- a/liblxqt/Makefile
+++ b/liblxqt/Makefile
@@ -2,7 +2,7 @@
.include "../../wip/liblxqt/Makefile.common"
-DISTNAME= liblxqt-0.9.0
+DISTNAME= liblxqt-0.10.0
CATEGORIES= x11
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
diff --git a/liblxqt/distinfo b/liblxqt/distinfo
index 7cb20dd..8b4c7e7 100644
--- a/liblxqt/distinfo
+++ b/liblxqt/distinfo
@@ -1,5 +1,6 @@
$NetBSD: distinfo,v 1.1 2015/04/11 01:47:19 krytarowski Exp $
-SHA1 (liblxqt-0.9.0.tar.gz) = a36ca1d3d111e06925e02b5442322ba365bb2002
-RMD160 (liblxqt-0.9.0.tar.gz) = f7a94e3ff35e2c8ddf09d66306e64a42cf440270
-Size (liblxqt-0.9.0.tar.gz) = 107945 bytes
+SHA1 (liblxqt-0.10.0.tar.gz) = 6a8fc5ca404f4ac00c9663113611caacc68fb94e
+RMD160 (liblxqt-0.10.0.tar.gz) = b1a4df8f169eed6eeccaf202afd88c7cef4a05ce
+SHA512 (liblxqt-0.10.0.tar.gz) = a5ff5a0e5d206e48d512363dc5c76e1973679d7b578843b1b458b157471a15b60c14395891aee178a46e49d0a3a6647d7829797bb5ba4f015e224660aaf770ac
+Size (liblxqt-0.10.0.tar.gz) = 93245 bytes
diff --git a/libqtxdg/Makefile b/libqtxdg/Makefile
index 29acb07..d336280 100644
--- a/libqtxdg/Makefile
+++ b/libqtxdg/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.1 2015/04/11 11:07:19 krytarowski Exp $
-DISTNAME= libqtxdg-1.2.0
+DISTNAME= libqtxdg-1.3.0
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GITHUB:=lxde/}
EXTRACT_SUFX= .zip
Home |
Main Index |
Thread Index |
Old Index