pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/hugin Needs msgfmt and pkg-config. Add workar...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/15f0db5c6e0c
branches:  trunk
changeset: 564018:15f0db5c6e0c
user:      hasso <hasso%pkgsrc.org@localhost>
date:      Wed Aug 26 10:58:11 2009 +0000

description:
Needs msgfmt and pkg-config. Add workaround for a problem which is probably
a bug in cmake.

diffstat:

 graphics/hugin/Makefile |  21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diffs (35 lines):

diff -r 4008eaaaed76 -r 15f0db5c6e0c graphics/hugin/Makefile
--- a/graphics/hugin/Makefile   Wed Aug 26 10:20:57 2009 +0000
+++ b/graphics/hugin/Makefile   Wed Aug 26 10:58:11 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/08/21 18:08:44 adam Exp $
+# $NetBSD: Makefile,v 1.2 2009/08/26 10:58:11 hasso Exp $
 
 DISTNAME=      hugin-0.8.0
 CATEGORIES=    graphics
@@ -15,6 +15,25 @@
 USE_CMAKE=             yes
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
+USE_TOOLS+=            msgfmt pkg-config
+
+# Workaround for a bug(?) in cmake. CXX_FLAGS will end containing
+# '-pthread;-D_THREAD_SAFE' Happens at least on FreeBSD and DragonFly.
+SUBST_CLASSES+=                pthread
+SUBST_STAGE.pthread=   post-configure
+SUBST_FILES.pthread=   \
+       ${WRKSRC}/src/hugin1/hugin/CMakeFiles/hugin.dir/flags.make \
+       ${WRKSRC}/src/hugin1/hugin/CMakeFiles/hugin.dir/link.txt \
+       ${WRKSRC}/src/hugin1/base_wx/CMakeFiles/huginbasewx.dir/flags.make \
+       ${WRKSRC}/src/hugin1/stitch_project/CMakeFiles/hugin_stitch_project.dir/flags.make \
+       ${WRKSRC}/src/hugin1/stitch_project/CMakeFiles/hugin_stitch_project.dir/link.txt \
+       ${WRKSRC}/src/hugin1/nona_gui/CMakeFiles/nona_gui.dir/flags.make \
+       ${WRKSRC}/src/hugin1/nona_gui/CMakeFiles/nona_gui.dir/link.txt \
+       ${WRKSRC}/src/hugin1/ptbatcher/CMakeFiles/PTBatcher.dir/flags.make \
+       ${WRKSRC}/src/hugin1/ptbatcher/CMakeFiles/PTBatcher.dir/link.txt \
+       ${WRKSRC}/src/hugin1/ptbatcher/CMakeFiles/PTBatcherGUI.dir/flags.make \
+       ${WRKSRC}/src/hugin1/ptbatcher/CMakeFiles/PTBatcherGUI.dir/link.txt
+SUBST_SED.pthread=     -e 's|-pthread;-D_THREAD_SAFE|-pthread -D_THREAD_SAFE|g'
 
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"



Home | Main Index | Thread Index | Old Index