diff options
author | garga <garga@FreeBSD.org> | 2006-01-30 22:40:59 +0800 |
---|---|---|
committer | garga <garga@FreeBSD.org> | 2006-01-30 22:40:59 +0800 |
commit | a3e2b6499671c1e4a8d1203bb4a6435b1a531d89 (patch) | |
tree | 3bddee1ba61af09ec86f219bf13246768c7b020c | |
parent | 824f3b55ab942333d4b463d30b36d762f68f9bad (diff) | |
download | freebsd-ports-gnome-a3e2b6499671c1e4a8d1203bb4a6435b1a531d89.tar.gz freebsd-ports-gnome-a3e2b6499671c1e4a8d1203bb4a6435b1a531d89.tar.zst freebsd-ports-gnome-a3e2b6499671c1e4a8d1203bb4a6435b1a531d89.zip |
- Update to 0.5
- Use DATADIR
- Respect WITHOUT_NLS
- Require wxgtk26 instead wxgtk24 and patch to use wxrc-gtk2-2.6
- Unbreak
PR: ports/90619
Submitted by: Marco Molteni <molter@tin.it>
Reworked by: garga
Approved by: maintainer
-rw-r--r-- | graphics/hugin/Makefile | 27 | ||||
-rw-r--r-- | graphics/hugin/distinfo | 6 | ||||
-rw-r--r-- | graphics/hugin/files/patch-src-hugin-Makefile.in | 10 | ||||
-rw-r--r-- | graphics/hugin/files/patch-src-include-vigra_ext-PointMatching.h | 26 | ||||
-rw-r--r-- | graphics/hugin/pkg-plist | 237 |
5 files changed, 163 insertions, 143 deletions
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index e7c368f827ff..5319cb662263 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -6,12 +6,10 @@ # PORTNAME= hugin -PORTVERSION= 0.5.b2 -PORTREVISION= 5 +PORTVERSION= 0.5 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= ${PORTNAME}-0.5-beta2 MAINTAINER= cartola@openit.com.br COMMENT= A GUI for Panorama Tools, to stitch panoramic images @@ -22,25 +20,32 @@ LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff \ png:${PORTSDIR}/graphics/png \ jpeg:${PORTSDIR}/graphics/jpeg \ fftw:${PORTSDIR}/math/fftw \ - wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 \ - wx_gtk2_xrc-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24-contrib \ + wx_gtk2_xrc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26 \ boost_date_time:${PORTSDIR}/devel/boost RUN_DEPENDS= PTOptimizer:${PORTSDIR}/graphics/libpano12 \ PTStitcher:${PORTSDIR}/graphics/linux-panorama-tools -BROKEN= Does not compile - GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-wx-config=${WX_CONFIG} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -ftemplate-depth-32" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -ftemplate-depth-64" \ LDFLAGS="-L${LOCALBASE}/lib" USE_GMAKE= yes -USE_BZIP2= yes USE_ICONV= yes -USE_GETTEXT= yes DOCSDIR= ${PREFIX}/share/hugin/xrc/data -WX_CONFIG= ${X11BASE}/bin/wxgtk2-2.4-config +WX_CONFIG= ${X11BASE}/bin/wxgtk2-2.6-config + +.if defined(WITHOUT_NLS) +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " +.else +USE_GETTEXT= yes +PLIST_SUB+= NLS="" +.endif + +post-patch: + @${REINPLACE_CMD} -e 's|-wxrc|-${X11BASE}/bin/wxrc-gtk2-2.6|' \ + ${WRKSRC}/src/hugin/xrc/Makefile.in .include <bsd.port.mk> diff --git a/graphics/hugin/distinfo b/graphics/hugin/distinfo index f3ea80ed34d3..fb46476d4d36 100644 --- a/graphics/hugin/distinfo +++ b/graphics/hugin/distinfo @@ -1,3 +1,3 @@ -MD5 (hugin-0.5-beta2.tar.bz2) = 42649638bbd6aaff8dc56f379278d12e -SHA256 (hugin-0.5-beta2.tar.bz2) = 8d88225fa54b8e48698bb27533515cde69026458587de5e1c155e79566a5eee7 -SIZE (hugin-0.5-beta2.tar.bz2) = 1424575 +MD5 (hugin-0.5.tar.gz) = 18b38f5d6744831567b7fabfedb643fd +SHA256 (hugin-0.5.tar.gz) = 28b49663ea52ff73b61453a6b397c99b704844d6147f316f961327532f9ca1fc +SIZE (hugin-0.5.tar.gz) = 2264996 diff --git a/graphics/hugin/files/patch-src-hugin-Makefile.in b/graphics/hugin/files/patch-src-hugin-Makefile.in new file mode 100644 index 000000000000..271dc85c4e85 --- /dev/null +++ b/graphics/hugin/files/patch-src-hugin-Makefile.in @@ -0,0 +1,10 @@ +--- src/hugin/Makefile.in.marco Sun Dec 18 23:26:42 2005 ++++ src/hugin/Makefile.in Sun Dec 18 23:27:30 2005 +@@ -754,7 +754,6 @@ + install-data-am: install-desktopDATA install-gnomemimeiconDATA \ + install-sharedmimepackageDATA + @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-data-hook + + install-exec-am: install-binPROGRAMS + diff --git a/graphics/hugin/files/patch-src-include-vigra_ext-PointMatching.h b/graphics/hugin/files/patch-src-include-vigra_ext-PointMatching.h deleted file mode 100644 index 5da2b1713215..000000000000 --- a/graphics/hugin/files/patch-src-include-vigra_ext-PointMatching.h +++ /dev/null @@ -1,26 +0,0 @@ ---- src/include/vigra_ext/PointMatching.h.orig Thu Aug 11 19:34:40 2005 -+++ src/include/vigra_ext/PointMatching.h Thu Aug 11 19:48:12 2005 -@@ -33,7 +33,9 @@ - - // BAD: sgi stl extension - #if defined(__GNUC__) -+#if __GNUC__ > 2 - #include <ext/algorithm> -+#endif - #elif defined(HAVE_STLport) - #include <stlport4/algorithm> - #endif -@@ -193,8 +195,13 @@ - { - std::vector<SIFTFeature> randomfeat(feat1.size()*m_percent/100); - #if defined(__GNUC__) -+#if __GNUC__ > 2 - __gnu_cxx::random_sample(feat1.begin(), feat1.end(), - randomfeat.begin(), randomfeat.end()); -+#else -+ std::random_sample(feat1.begin(), feat1.end(), -+ randomfeat.begin(), randomfeat.end()); -+#endif - #elif defined(HAVE_STLport) - _STL::random_sample(feat1.begin(), feat1.end(), - randomfeat.begin(), randomfeat.end()); diff --git a/graphics/hugin/pkg-plist b/graphics/hugin/pkg-plist index 01bef7486c87..72d22b52186e 100644 --- a/graphics/hugin/pkg-plist +++ b/graphics/hugin/pkg-plist @@ -2,107 +2,138 @@ bin/autooptimiser bin/hugin bin/nona bin/nona_gui -bin/panosifter -bin/sift_keypoints bin/zhang_undistort -share/hugin/xrc/about.xrc -share/hugin/xrc/anchor_orientation.xrc -share/hugin/xrc/cp_editor_panel.xrc -share/hugin/xrc/cp_list_frame.xrc -share/hugin/xrc/data/1leftarrow.png -share/hugin/xrc/data/1rightarrow.png -share/hugin/xrc/data/CPCursor0.png -share/hugin/xrc/data/CPCursor1.png -share/hugin/xrc/data/CPCursor2.png -share/hugin/xrc/data/CPCursor3.png -share/hugin/xrc/data/CPCursor4.png -share/hugin/xrc/data/CPCursor5.png -share/hugin/xrc/data/CPCursor6.png -share/hugin/xrc/data/FAQ.html -share/hugin/xrc/data/FAQ_fr.html -share/hugin/xrc/data/about.htm -share/hugin/xrc/data/about_fr.htm -share/hugin/xrc/data/center_pano.xpm -share/hugin/xrc/data/close.xpm -share/hugin/xrc/data/druid.control.128.png -share/hugin/xrc/data/druid.images.128.png -share/hugin/xrc/data/druid.lenses.128.png -share/hugin/xrc/data/druid.optimize.128.png -share/hugin/xrc/data/druid.stitch.128.png -share/hugin/xrc/data/edit_add.png -share/hugin/xrc/data/editcopy.png -share/hugin/xrc/data/editcut.png -share/hugin/xrc/data/editdelete.png -share/hugin/xrc/data/editpaste.png -share/hugin/xrc/data/filenew.png -share/hugin/xrc/data/fileopen.png -share/hugin/xrc/data/filesave.png -share/hugin/xrc/data/filesaveas.png -share/hugin/xrc/data/find.png -share/hugin/xrc/data/fit_pano.xpm -share/hugin/xrc/data/horiz-guide.jpg -share/hugin/xrc/data/icon.ico -share/hugin/xrc/data/icon.png -share/hugin/xrc/data/icon_128x128.ico -share/hugin/xrc/data/icon_128x128.png -share/hugin/xrc/data/icon_16x16.ico -share/hugin/xrc/data/icon_32x32.ico -share/hugin/xrc/data/icon_48x48.ico -share/hugin/xrc/data/icon_48x48.png -share/hugin/xrc/data/icon_64x64.ico -share/hugin/xrc/data/icon_72x72.ico -share/hugin/xrc/data/icon_96x96.ico -share/hugin/xrc/data/info.xpm -share/hugin/xrc/data/keyboard.html -share/hugin/xrc/data/keyboard_fr.html -share/hugin/xrc/data/list.png -share/hugin/xrc/data/logo.png -share/hugin/xrc/data/manual.html -share/hugin/xrc/data/manual_fr.html -share/hugin/xrc/data/optimize.png -share/hugin/xrc/data/optimize.xpm -share/hugin/xrc/data/preview.png -share/hugin/xrc/data/preview_auto_update.png -share/hugin/xrc/data/preview_show_all.png -share/hugin/xrc/data/preview_show_none.png -share/hugin/xrc/data/print.xpm -share/hugin/xrc/data/problem-circle.jpg -share/hugin/xrc/data/redo.png -share/hugin/xrc/data/reload.png -share/hugin/xrc/data/searchfind.xpm -share/hugin/xrc/data/splash.png -share/hugin/xrc/data/tips.txt -share/hugin/xrc/data/tips_fr-UTF8.txt -share/hugin/xrc/data/tips_fr.txt -share/hugin/xrc/data/undo.png -share/hugin/xrc/data/zoomin.xpm -share/hugin/xrc/data/zoomout.xpm -share/hugin/xrc/edit_script_dialog.xrc -share/hugin/xrc/edit_text.xrc -share/hugin/xrc/help.xrc -share/hugin/xrc/image_center.xrc -share/hugin/xrc/images_panel.xrc -share/hugin/xrc/keyboard_help.xrc -share/hugin/xrc/lens_panel.xrc -share/hugin/xrc/main_frame.xrc -share/hugin/xrc/main_menu.xrc -share/hugin/xrc/main_menubar.xrc -share/hugin/xrc/main_tool.xrc -share/hugin/xrc/nona_panel.xrc -share/hugin/xrc/optimize_panel.xrc -share/hugin/xrc/pano_panel.xrc -share/hugin/xrc/pref_dialog.xrc -share/hugin/xrc/preview_frame.xrc -share/hugin/xrc/ptstitcher_panel.xrc -share/hugin/xrc/run_optimizer_frame.xrc -share/hugin/xrc/run_stitcher_frame.xrc -share/locale/de/LC_MESSAGES/hugin.mo -share/locale/de/LC_MESSAGES/nona_gui.mo -share/locale/fr/LC_MESSAGES/hugin.mo -share/locale/fr/LC_MESSAGES/nona_gui.mo -share/locale/it/LC_MESSAGES/hugin.mo -share/locale/pl/LC_MESSAGES/hugin.mo -share/locale/pl/LC_MESSAGES/nona_gui.mo -@dirrm share/hugin/xrc/data -@dirrm share/hugin/xrc -@dirrm share/hugin +%%DATADIR%%/xrc/about.xrc +%%DATADIR%%/xrc/anchor_orientation.xrc +%%DATADIR%%/xrc/cp_editor_panel.xrc +%%DATADIR%%/xrc/cp_editor_panel-2.5.xrc +%%DATADIR%%/xrc/cp_list_frame.xrc +%%DATADIR%%/xrc/data/about_pl.htm +%%DATADIR%%/xrc/data/1leftarrow.png +%%DATADIR%%/xrc/data/1rightarrow.png +%%DATADIR%%/xrc/data/CPCursor0.png +%%DATADIR%%/xrc/data/CPCursor1.png +%%DATADIR%%/xrc/data/CPCursor2.png +%%DATADIR%%/xrc/data/CPCursor3.png +%%DATADIR%%/xrc/data/CPCursor4.png +%%DATADIR%%/xrc/data/CPCursor5.png +%%DATADIR%%/xrc/data/CPCursor6.png +%%DATADIR%%/xrc/data/FAQ.html +%%DATADIR%%/xrc/data/FAQ_fr.html +%%DATADIR%%/xrc/data/about.htm +%%DATADIR%%/xrc/data/about_fr.htm +%%DATADIR%%/xrc/data/center_pano.xpm +%%DATADIR%%/xrc/data/close.xpm +%%DATADIR%%/xrc/data/druid.control.128.png +%%DATADIR%%/xrc/data/druid.images.128.png +%%DATADIR%%/xrc/data/druid.lenses.128.png +%%DATADIR%%/xrc/data/druid.optimize.128.png +%%DATADIR%%/xrc/data/druid.stitch.128.png +%%DATADIR%%/xrc/data/edit_add.png +%%DATADIR%%/xrc/data/editcopy.png +%%DATADIR%%/xrc/data/editcut.png +%%DATADIR%%/xrc/data/editdelete.png +%%DATADIR%%/xrc/data/editpaste.png +%%DATADIR%%/xrc/data/filenew.png +%%DATADIR%%/xrc/data/fileopen.png +%%DATADIR%%/xrc/data/filesave.png +%%DATADIR%%/xrc/data/filesaveas.png +%%DATADIR%%/xrc/data/find.png +%%DATADIR%%/xrc/data/fit_pano.xpm +%%DATADIR%%/xrc/data/hugin.png +%%DATADIR%%/xrc/data/horiz-guide.jpg +%%DATADIR%%/xrc/data/icon.ico +%%DATADIR%%/xrc/data/icon.png +%%DATADIR%%/xrc/data/icon_128x128.ico +%%DATADIR%%/xrc/data/icon_128x128.png +%%DATADIR%%/xrc/data/icon_16x16.ico +%%DATADIR%%/xrc/data/icon_32x32.ico +%%DATADIR%%/xrc/data/icon_48x48.ico +%%DATADIR%%/xrc/data/icon_48x48.png +%%DATADIR%%/xrc/data/icon_64x64.ico +%%DATADIR%%/xrc/data/icon_72x72.ico +%%DATADIR%%/xrc/data/icon_96x96.ico +%%DATADIR%%/xrc/data/info.xpm +%%DATADIR%%/xrc/data/keyboard.html +%%DATADIR%%/xrc/data/keyboard_fr.html +%%DATADIR%%/xrc/data/keyboard_pl.html +%%DATADIR%%/xrc/data/list.png +%%DATADIR%%/xrc/data/logo.png +%%DATADIR%%/xrc/data/manual.html +%%DATADIR%%/xrc/data/manual_fr.html +%%DATADIR%%/xrc/data/optimize.png +%%DATADIR%%/xrc/data/optimize.xpm +%%DATADIR%%/xrc/data/preview.png +%%DATADIR%%/xrc/data/preview_auto_update.png +%%DATADIR%%/xrc/data/preview_show_all.png +%%DATADIR%%/xrc/data/preview_show_none.png +%%DATADIR%%/xrc/data/print.xpm +%%DATADIR%%/xrc/data/problem-circle.jpg +%%DATADIR%%/xrc/data/redo.png +%%DATADIR%%/xrc/data/reload.png +%%DATADIR%%/xrc/data/searchfind.xpm +%%DATADIR%%/xrc/data/splash.png +%%DATADIR%%/xrc/data/tips.txt +%%DATADIR%%/xrc/data/undo.png +%%DATADIR%%/xrc/data/zoomin.xpm +%%DATADIR%%/xrc/data/zoomout.xpm +%%DATADIR%%/xrc/edit_script_dialog.xrc +%%DATADIR%%/xrc/edit_text.xrc +%%DATADIR%%/xrc/help.xrc +%%DATADIR%%/xrc/image_center.xrc +%%DATADIR%%/xrc/images_panel.xrc +%%DATADIR%%/xrc/images_panel-2.5.xrc +%%DATADIR%%/xrc/keyboard_help.xrc +%%DATADIR%%/xrc/lens_panel.xrc +%%DATADIR%%/xrc/lens_panel-2.5.xrc +%%DATADIR%%/xrc/main_frame.xrc +%%DATADIR%%/xrc/main_frame-2.5.xrc +%%DATADIR%%/xrc/main_menu.xrc +%%DATADIR%%/xrc/main_menubar.xrc +%%DATADIR%%/xrc/main_tool.xrc +%%DATADIR%%/xrc/nona_panel.xrc +%%DATADIR%%/xrc/optimize_panel.xrc +%%DATADIR%%/xrc/optimize_panel-2.5.xrc +%%DATADIR%%/xrc/pano_panel.xrc +%%DATADIR%%/xrc/pano_panel-2.5.xrc +%%DATADIR%%/xrc/pref_dialog.xrc +%%DATADIR%%/xrc/preview_frame.xrc +%%DATADIR%%/xrc/ptstitcher_panel.xrc +%%DATADIR%%/xrc/run_optimizer_frame.xrc +%%DATADIR%%/xrc/run_stitcher_frame.xrc +share/applications/hugin.desktop +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-ptoptimizer-script.png +%%NLS%%share/locale/ca_ES/LC_MESSAGES/hugin.mo +%%NLS%%share/locale/de/LC_MESSAGES/hugin.mo +%%NLS%%share/locale/de/LC_MESSAGES/nona_gui.mo +%%NLS%%share/locale/fr/LC_MESSAGES/hugin.mo +%%NLS%%share/locale/fr/LC_MESSAGES/nona_gui.mo +%%NLS%%share/locale/hu/LC_MESSAGES/hugin.mo +%%NLS%%share/locale/hu/LC_MESSAGES/nona_gui.mo +%%NLS%%share/locale/it/LC_MESSAGES/hugin.mo +%%NLS%%share/locale/ja/LC_MESSAGES/hugin.mo +%%NLS%%share/locale/nl/LC_MESSAGES/hugin.mo +%%NLS%%share/locale/nl/LC_MESSAGES/nona_gui.mo +%%NLS%%share/locale/pl/LC_MESSAGES/hugin.mo +%%NLS%%share/locale/pl/LC_MESSAGES/nona_gui.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/hugin.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/nona_gui.mo +%%NLS%%share/locale/ru/LC_MESSAGES/hugin.mo +%%NLS%%share/locale/ru/LC_MESSAGES/nona_gui.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/hugin.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/nona_gui.mo +share/mime/packages/hugin.xml +share/pixmaps/hugin.png +@dirrm share/applications +@dirrm share/icons/gnome/48x48/mimetypes +@dirrm share/icons/gnome/48x48 +@dirrm share/icons/gnome +@dirrm share/icons +%%NLS%%@dirrm share/locale/ca_ES/LC_MESSAGES +%%NLS%%@dirrm share/locale/ca_ES +@dirrmtry share/mime/packages +@dirrmtry share/mime +@dirrm share/pixmaps +@dirrm %%DATADIR%%/xrc/data +@dirrm %%DATADIR%%/xrc +@dirrm %%DATADIR%% |