diff options
| author | drochner <drochner> | 2011-12-07 13:36:16 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2011-12-07 13:36:16 +0000 |
| commit | 68ce0967ea76168023daec111cf8b80e60769343 (patch) | |
| tree | 72ed1fc6f84da681ac3fffe848bf17554cf657b2 /x11/qwt-qt4/patches | |
| parent | c030fb9072f03babe6783ba3dbc23cb6647a4d8d (diff) | |
| download | pkgsrc-68ce0967ea76168023daec111cf8b80e60769343.tar.gz | |
roll back to D2011.06.14.22.00.00, i.e. revert to 5.2.1nb4
qwt6 is incompatible, and the update has broken the graphics/scidavis pkg
Diffstat (limited to 'x11/qwt-qt4/patches')
| -rw-r--r-- | x11/qwt-qt4/patches/patch-pri | 33 | ||||
| -rw-r--r-- | x11/qwt-qt4/patches/patch-srcpro | 28 |
2 files changed, 27 insertions, 34 deletions
diff --git a/x11/qwt-qt4/patches/patch-pri b/x11/qwt-qt4/patches/patch-pri index c5b22d0ed19..aa022fa9438 100644 --- a/x11/qwt-qt4/patches/patch-pri +++ b/x11/qwt-qt4/patches/patch-pri @@ -1,30 +1,23 @@ -$NetBSD: patch-pri,v 1.4 2011/06/20 12:43:00 drochner Exp $ +$NetBSD: patch-pri,v 1.5 2011/12/07 13:36:16 drochner Exp $ ---- qwtconfig.pri.orig 2011-04-15 10:48:51.000000000 +0000 +--- qwtconfig.pri.orig 2010-04-11 09:55:06.000000000 +0000 +++ qwtconfig.pri -@@ -19,14 +19,14 @@ QWT_VERSION = $${QWT_VER_MAJ}.$${QW - QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX] +@@ -8,7 +8,7 @@ VER_PAT = 1 + VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} unix { -- QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION -+ QWT_INSTALL_PREFIX = $$(PREFIX) +- INSTALLBASE = /usr/local/qwt-5.2.1 ++ INSTALLBASE = $$(PREFIX) } win32 { - QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION - } - --QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc -+QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/share/doc/qwt - QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include - QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib - -@@ -34,7 +34,7 @@ QWT_INSTALL_LIBS = $${QWT_INSTALL_P - # Designer plugin - ###################################################################### +@@ -17,7 +17,8 @@ win32 { --QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer -+QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/qt4/plugins/designer - # QWT_INSTALL_PLUGINS = $${QT_INSTALL_PREFIX}/plugins/designer + target.path = $$INSTALLBASE/lib + headers.path = $$INSTALLBASE/include +-doc.path = $$INSTALLBASE/doc ++doc.path = $$INSTALLBASE/share/doc/qwt ++man.path = $$INSTALLBASE/${PKGMANDIR} ###################################################################### + # qmake internal options diff --git a/x11/qwt-qt4/patches/patch-srcpro b/x11/qwt-qt4/patches/patch-srcpro index 2078c54019e..7b914dcf2e7 100644 --- a/x11/qwt-qt4/patches/patch-srcpro +++ b/x11/qwt-qt4/patches/patch-srcpro @@ -1,19 +1,19 @@ -$NetBSD: patch-srcpro,v 1.2 2011/06/16 15:21:34 adam Exp $ +$NetBSD: patch-srcpro,v 1.3 2011/12/07 13:36:16 drochner Exp $ ---- src/src.pro.orig 2011-04-15 10:48:51.000000000 +0000 +--- src/src.pro.orig 2009-03-22 16:41:05.000000000 +0100 +++ src/src.pro -@@ -216,11 +216,11 @@ contains(QWT_CONFIG, QwtWidgets) { +@@ -216,9 +216,10 @@ contains(CONFIG, QwtWidgets) { + # Install directives - target.path = $${QWT_INSTALL_LIBS} - --doc.files = $${QWT_ROOT}/doc/html --unix:doc.files += $${QWT_ROOT}/doc/man + headers.files = $$HEADERS +-doc.files = $${QWT_ROOT}/doc/html $${QWT_ROOT}/doc/qwt-5.2.0.qch +-unix { +- doc.files += $${QWT_ROOT}/doc/man +-} +doc.files = $${QWT_ROOT}/doc/html/* -+man.files = $${QWT_ROOT}/doc/man/* - doc.path = $${QWT_INSTALL_DOCS} - --INSTALLS = target doc -+INSTALLS = target doc man - - CONFIG(lib_bundle) { ++man.files = $${QWT_ROOT}/doc/man/* + INSTALLS = target headers doc ++unix { ++ INSTALLS += man ++} |