diff options
| author | Alberto Villa <avilla@FreeBSD.org> | 2011-06-14 09:23:49 +0000 |
|---|---|---|
| committer | Alberto Villa <avilla@FreeBSD.org> | 2011-06-14 09:23:49 +0000 |
| commit | 3f88d44ab79dbfa206490f1310fa6d12fa005e72 (patch) | |
| tree | 13cc4df89088675d0ba07a254fe5338146fdd460 /astro | |
| parent | 93886773bae157e823f1e6f4e4a1e4ea9783cad3 (diff) | |
| download | ports-3f88d44ab79dbfa206490f1310fa6d12fa005e72.tar.gz ports-3f88d44ab79dbfa206490f1310fa6d12fa005e72.zip | |
Notes
Diffstat (limited to 'astro')
| -rw-r--r-- | astro/marble/Makefile | 11 | ||||
| -rw-r--r-- | astro/marble/files/patch-marble__CMakeLists.txt | 10 | ||||
| -rw-r--r-- | astro/marble/files/patch-src-plugins-positionprovider-gpsd-GpsdConnection.cpp (renamed from astro/marble/files/patch-marble-src-plugins-positionprovider-gpsd-GpsdConnection.cpp) | 4 | ||||
| -rw-r--r-- | astro/marble/pkg-plist | 1 |
4 files changed, 3 insertions, 23 deletions
diff --git a/astro/marble/Makefile b/astro/marble/Makefile index b6149dc3d016..f95ef669831e 100644 --- a/astro/marble/Makefile +++ b/astro/marble/Makefile @@ -27,17 +27,8 @@ USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes DISTINFO_FILE= ${PORTSDIR}/misc/kdeedu4/distinfo -MAKE_JOBS_UNSAFE= yes -CMAKE_SOURCE_PATH= ${WRKSRC}/marble +WRKSRC= ${WRKDIR}/${DISTNAME}/marble CMAKE_OUTSOURCE= yes -pre-configure: - ${LN} -s ${WRKSRC}/doc/marble ${WRKSRC}/marble/marble - -post-install: - ${MKDIR} ${PREFIX}/share/apps/cmake/modules - ${INSTALL_DATA} ${WRKSRC}/cmake/modules/FindMarbleWidget.cmake \ - ${PREFIX}/share/apps/cmake/modules - .include <bsd.port.mk> diff --git a/astro/marble/files/patch-marble__CMakeLists.txt b/astro/marble/files/patch-marble__CMakeLists.txt deleted file mode 100644 index 97bee45da168..000000000000 --- a/astro/marble/files/patch-marble__CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- ./marble/CMakeLists.txt.orig 2009-12-05 02:09:36.000000000 +0300 -+++ ./marble/CMakeLists.txt 2010-06-01 01:15:13.928157277 +0400 -@@ -283,6 +283,7 @@ - # Descend into subdirectories - add_subdirectory(src) - add_subdirectory(data) -+add_subdirectory(marble) - - include(DistTarget) - diff --git a/astro/marble/files/patch-marble-src-plugins-positionprovider-gpsd-GpsdConnection.cpp b/astro/marble/files/patch-src-plugins-positionprovider-gpsd-GpsdConnection.cpp index 68a5b9dea204..58546cdcdd21 100644 --- a/astro/marble/files/patch-marble-src-plugins-positionprovider-gpsd-GpsdConnection.cpp +++ b/astro/marble/files/patch-src-plugins-positionprovider-gpsd-GpsdConnection.cpp @@ -1,5 +1,5 @@ ---- ./marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig 2011-03-22 18:32:49.000000000 +0300 -+++ ./marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp 2011-03-22 19:24:18.000000000 +0300 +--- ./src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig 2011-03-22 18:32:49.000000000 +0300 ++++ ./src/plugins/positionprovider/gpsd/GpsdConnection.cpp 2011-03-22 19:24:18.000000000 +0300 @@ -18,7 +18,8 @@ GpsdConnection::GpsdConnection( QObject* parent ) diff --git a/astro/marble/pkg-plist b/astro/marble/pkg-plist index fb25ecdcb0da..9129eb205ad7 100644 --- a/astro/marble/pkg-plist +++ b/astro/marble/pkg-plist @@ -128,7 +128,6 @@ lib/libmarblewidget.so.0.11.0 lib/libmarblewidget.so.11 share/applications/kde4/marble.desktop share/apps/cmake/modules/FindMarble.cmake -share/apps/cmake/modules/FindMarbleWidget.cmake share/apps/marble/data/LICENSE.txt share/apps/marble/data/bitmaps/airport.png share/apps/marble/data/bitmaps/annotation.png |