summaryrefslogtreecommitdiff
path: root/geography
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2011-01-17 11:22:43 +0000
committerdrochner <drochner@pkgsrc.org>2011-01-17 11:22:43 +0000
commitb158189409885e4d6271e7ff334f72cf90e8b502 (patch)
treed373c214b0e340fbbc789a5f1ba30edbe48d8dac /geography
parent7d009747859631b3568385f71a736faaf7d7776d (diff)
downloadpkgsrc-b158189409885e4d6271e7ff334f72cf90e8b502.tar.gz
-adjust the patch for manpage location so that it doesn't hardwire
the pkgsrc specific path, so that it could be submitted upstream -deal with desktopdb approved by jkunz The Maintainer
Diffstat (limited to 'geography')
-rw-r--r--geography/qlandkartegt/Makefile4
-rw-r--r--geography/qlandkartegt/distinfo4
-rw-r--r--geography/qlandkartegt/patches/patch-aa13
3 files changed, 11 insertions, 10 deletions
diff --git a/geography/qlandkartegt/Makefile b/geography/qlandkartegt/Makefile
index 95dd5e8008a..f2febd2f8e8 100644
--- a/geography/qlandkartegt/Makefile
+++ b/geography/qlandkartegt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/01/13 22:55:20 jkunz Exp $
+# $NetBSD: Makefile,v 1.9 2011/01/17 11:22:43 drochner Exp $
#
DISTNAME= qlandkartegt-1.0.0
@@ -14,6 +14,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_LANGUAGES= c c++
USE_CMAKE= yes
+CMAKE_ARGS+= -DMAN_INSTALL_DIR:PATH=${PREFIX}/${PKGMANDIR}
DEPENDS+= qlandkartegt-garmindev>=0.3:../../geography/qlandkartegt-garmindev
@@ -24,5 +25,6 @@ DEPENDS+= qlandkartegt-garmindev>=0.3:../../geography/qlandkartegt-garmindev
.include "../../graphics/libexif/buildlink3.mk"
.include "../../x11/qt4-libs/buildlink3.mk"
.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/qt4-qdbus/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/geography/qlandkartegt/distinfo b/geography/qlandkartegt/distinfo
index 14e55a7e2a7..fcd346d3bd8 100644
--- a/geography/qlandkartegt/distinfo
+++ b/geography/qlandkartegt/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2011/01/13 22:55:20 jkunz Exp $
+$NetBSD: distinfo,v 1.4 2011/01/17 11:22:43 drochner Exp $
SHA1 (qlandkartegt-1.0.0.tar.gz) = 1152383dcec41b3f698897bc4cd1f8cf0b5cbfe9
RMD160 (qlandkartegt-1.0.0.tar.gz) = 373924997ca707007daa024e394c8e033df42f9e
Size (qlandkartegt-1.0.0.tar.gz) = 3799397 bytes
-SHA1 (patch-aa) = 961ede37ca9ec3bd4e1e7ea061aff38c127ca4e9
+SHA1 (patch-aa) = e81de01cd6227b6b486eeee244c31ee486363d6a
diff --git a/geography/qlandkartegt/patches/patch-aa b/geography/qlandkartegt/patches/patch-aa
index 7b16af56f7e..e6794796262 100644
--- a/geography/qlandkartegt/patches/patch-aa
+++ b/geography/qlandkartegt/patches/patch-aa
@@ -1,13 +1,12 @@
-$NetBSD: patch-aa,v 1.1 2011/01/13 22:55:20 jkunz Exp $
+$NetBSD: patch-aa,v 1.2 2011/01/17 11:22:43 drochner Exp $
--- cmake/Modules/DefineInstallationPaths.cmake.orig 2010-12-27 12:52:18.000000000 +0000
+++ cmake/Modules/DefineInstallationPaths.cmake
-@@ -101,7 +101,7 @@ if (UNIX)
- FORCE
- )
+@@ -103,7 +103,6 @@ if (UNIX)
SET(MAN_INSTALL_DIR
-- "${SHARE_INSTALL_PREFIX}/man"
-+ "${CMAKE_INSTALL_PREFIX}/man"
+ "${SHARE_INSTALL_PREFIX}/man"
CACHE PATH "The ${_APPLICATION_NAME} man install dir (default prefix/man)"
- FORCE
+- FORCE
)
+ SET(INFO_INSTALL_DIR
+ "${SHARE_INSTALL_PREFIX}/info"