On 13.09.2012 13:55, Hannes wrote: > Hi everyone, > > a while back I created a new (updated) port of graphics/luminance and > discussed with the original port maintainer (in CC) that he wants to > transfer ownership of the port to me. > > I also worked with danfe@freebsd (also in CC) on the port and he wanted > to double check some things before committing it. However I haven't > heard from him in a while, and while I would still like his help and > feedback, I think the new port should be committed anyway, because it is > a huge progress over the current one. > > Please see the attached patch, feel free to comment or commit if it > looks right. >
Ah, the patch had an outdated exiv dependency, sorry about that. Please use the attached files. -- Best, Hannes
diff -ur graphics/luminance/Makefile graphics/luminanceNEW/Makefile --- graphics/luminance/Makefile 2012-07-31 17:29:26.000000000 +0200 +++ graphics/luminanceNEW/Makefile 2012-09-13 14:08:11.158478777 +0200 @@ -2,17 +2,16 @@ # Date created: 28 Jul 2007 # Whom: Yinghong Liu <relax...@gmail.com> # -# $FreeBSD: ports/graphics/luminance/Makefile,v 1.30 2012/07/31 15:29:26 bsam Exp $ +# $FreeBSD: ports/graphics/luminance/Makefile,v 1.27 2011/10/17 10:08:30 bf Exp $ # PORTNAME= luminance -DISTVERSION= 2.0.1-1 -PORTREVISION= 5 +DISTVERSION= 2.3.0 CATEGORIES= graphics -MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION:S/-1//}/ -DISTNAME= ${PORTNAME}-v${DISTVERSION} +MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION}/ +DISTNAME= ${PORTNAME}-hdr-${DISTVERSION} -MAINTAINER= goffr...@gmail.com +MAINTAINER= h2+fbsdpo...@fsfe.org COMMENT= An open source workflow for HDR imaging LICENSE= GPLv2 @@ -23,40 +22,17 @@ IlmImf.6:${PORTSDIR}/graphics/OpenEXR \ tiff.4:${PORTSDIR}/graphics/tiff \ fftw3f:${PORTSDIR}/math/fftw3-float \ - gsl.16:${PORTSDIR}/math/gsl + gsl.16:${PORTSDIR}/math/gsl \ + raw_r.5:${PORTSDIR}/graphics/libraw USE_QT4= gui xml webkit imageformats_run linguist_build \ - moc_build qmake_build rcc_build uic_build -QMAKE_ARGS= PREFIX=${PREFIX} DOCDIR=${DOCSDIR} I18NDIR=${DATADIR}/i18n -MAKE_JOBS_SAFE= yes -INSTALLS_ICONS= yes + moc_build rcc_build uic_build -LRELEASE= ${QT_PREFIX}/bin/lrelease-qt4 +USE_CMAKE= yes +USE_BZIP2= yes -.include <bsd.port.pre.mk> +MAKE_JOBS_SAFE= yes +INSTALLS_ICONS= yes -post-patch: -# FreeBSD has log2() since recently, remove local #define's which conflict -# with prototypes in /usr/include/math.h (when applicable) -.if ${OSVERSION} > 802501 - @${REINPLACE_CMD} -e '/log2/d' ${WRKSRC}/src/arch/freebsd/math.h -.endif - @cd ${WRKSRC}/src && ${REINPLACE_CMD} \ - -e 's|/usr/share/luminance|${DOCSDIR}|g' \ - -e 's|/usr/local/share/luminance|${DATADIR}|g' \ - MainWindow/MainWindow.cpp \ - Preferences/PreferencesDialog.cpp \ - TonemappingWindow/TonemappingWindow.cpp \ - TransplantExif/TransplantExifDialog.cpp - @${REINPLACE_CMD} -e 's|%%HELPDIR%%|${DOCSDIR}|g' \ - ${WRKSRC}/src/HelpBrowser/LuminancePaths.cpp -.if defined(NOPORTDOCS) - @${REINPLACE_CMD} -E '/INSTALLS/s,help|docs,,g' ${WRKSRC}/project.pro -.endif - -do-configure: - @${LRELEASE} ${WRKSRC}/project.pro - @cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKE_ARGS} ${QMAKEFLAGS} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -ur graphics/luminance/distinfo graphics/luminanceNEW/distinfo --- graphics/luminance/distinfo 2010-11-12 13:25:34.000000000 +0100 +++ graphics/luminanceNEW/distinfo 2012-07-23 14:22:46.000000000 +0200 @@ -1,2 +1,2 @@ -SHA256 (luminance-v2.0.1-1.tar.gz) = 16ddead236f7b8d81fc67cbd7d8f384e51ebe5263c3a11afa6046821fb02e922 -SIZE (luminance-v2.0.1-1.tar.gz) = 2435362 +SHA256 (luminance-hdr-2.3.0.tar.bz2) = dada0795b58843912bcb57ce61dcd615bcb9f9437b610a37ff813ad2c899c676 +SIZE (luminance-hdr-2.3.0.tar.bz2) = 5398576 Only in graphics/luminance: files diff -ur graphics/luminance/pkg-plist graphics/luminanceNEW/pkg-plist --- graphics/luminance/pkg-plist 2011-04-26 14:49:32.000000000 +0200 +++ graphics/luminanceNEW/pkg-plist 2012-07-23 14:39:56.600112479 +0200 @@ -1,78 +1,106 @@ -bin/luminance -share/applications/luminance.desktop -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/BUGS -%%PORTDOCS%%%%DOCSDIR%%/Changelog -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/help/en/README -%%PORTDOCS%%%%DOCSDIR%%/help/en/additional.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/basics.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/contributing.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/contributing_donating.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/contributing_programming.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/contributing_testing.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/contributing_translating.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/copying_exif.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/creating_hdr.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/creating_hdr_cli.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/creating_hdr_interactive.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/dcraw.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/editing_hdr.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/external.png -%%PORTDOCS%%%%DOCSDIR%%/help/en/faq.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/features.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/hints.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/images/batch-tmo.png -%%PORTDOCS%%%%DOCSDIR%%/help/en/images/copy-exif.png -%%PORTDOCS%%%%DOCSDIR%%/help/en/images/mainwin.jpeg -%%PORTDOCS%%%%DOCSDIR%%/help/en/images/not-translated-menu-item.png -%%PORTDOCS%%%%DOCSDIR%%/help/en/images/projectiveTransformationDialog.png -%%PORTDOCS%%%%DOCSDIR%%/help/en/images/resize.png -%%PORTDOCS%%%%DOCSDIR%%/help/en/images/tonemapdialog.jpg -%%PORTDOCS%%%%DOCSDIR%%/help/en/images/translated-menu-item.png -%%PORTDOCS%%%%DOCSDIR%%/help/en/index.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/manual.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/menu.xml -%%PORTDOCS%%%%DOCSDIR%%/help/en/news.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/prefs.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/prefs_hdr.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/prefs_tonemapping.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/prefs_tools.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/prefs_ui.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/projective_transformation.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/style.css -%%PORTDOCS%%%%DOCSDIR%%/help/en/tmap_ref.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/tmap_ref_drago.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/tmap_ref_durand.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/tmap_ref_mantiuk06.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/tonemapping.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/tonemapping_batch.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/tonemapping_cli.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/tonemapping_interactive.html -%%PORTDOCS%%%%DOCSDIR%%/help/en/workflow.html -%%PORTDOCS%%%%DOCSDIR%%/help/js/jquery.js -%%PORTDOCS%%%%DOCSDIR%%/help/js/jquery.jtabs.pack.js -share/icons/hicolor/32x32/apps/luminance.png -%%DATADIR%%/i18n/lang_cs.qm -%%DATADIR%%/i18n/lang_de.qm -%%DATADIR%%/i18n/lang_es.qm -%%DATADIR%%/i18n/lang_fr.qm -%%DATADIR%%/i18n/lang_it.qm -%%DATADIR%%/i18n/lang_pl.qm -%%DATADIR%%/i18n/lang_ru.qm -%%DATADIR%%/i18n/lang_tr.qm -@dirrm %%DATADIR%%/i18n -@dirrm %%DATADIR%% -@dirrmtry share/icons/hicolor/32x32/apps -@dirrmtry share/icons/hicolor/32x32 -@dirrmtry share/icons/hicolor -@dirrmtry share/icons -%%PORTDOCS%%@dirrm %%DOCSDIR%%/help/js -%%PORTDOCS%%@dirrm %%DOCSDIR%%/help/img -%%PORTDOCS%%@dirrm %%DOCSDIR%%/help/en/images -%%PORTDOCS%%@dirrm %%DOCSDIR%%/help/en -%%PORTDOCS%%@dirrm %%DOCSDIR%%/help -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrmtry share/applications +bin/luminance-hdr +bin/luminance-hdr-cli +share/applications/luminance-hdr.desktop +share/icons/hicolor/48x48/apps/luminance-hdr.png +share/luminance-hdr/AUTHORS +share/luminance-hdr/Changelog +share/luminance-hdr/LICENSE +share/luminance-hdr/README +share/luminance-hdr/help/en/README +share/luminance-hdr/help/en/additional.html +share/luminance-hdr/help/en/basics.html +share/luminance-hdr/help/en/color_management.html +share/luminance-hdr/help/en/contributing.html +share/luminance-hdr/help/en/contributing_donating.html +share/luminance-hdr/help/en/contributing_programming.html +share/luminance-hdr/help/en/contributing_testing.html +share/luminance-hdr/help/en/contributing_translating.html +share/luminance-hdr/help/en/copying_exif.html +share/luminance-hdr/help/en/creating_hdr.html +share/luminance-hdr/help/en/creating_hdr_batch.html +share/luminance-hdr/help/en/creating_hdr_cli.html +share/luminance-hdr/help/en/creating_hdr_interactive.html +share/luminance-hdr/help/en/dcraw.html +share/luminance-hdr/help/en/editing_hdr.html +share/luminance-hdr/help/en/external.png +share/luminance-hdr/help/en/faq.html +share/luminance-hdr/help/en/features.html +share/luminance-hdr/help/en/hints.html +share/luminance-hdr/help/en/images/batch-hdr.png +share/luminance-hdr/help/en/images/batch-tmo.png +share/luminance-hdr/help/en/images/color_management.png +share/luminance-hdr/help/en/images/copy-exif.png +share/luminance-hdr/help/en/images/cropping_frame.png +share/luminance-hdr/help/en/images/mainwin.png +share/luminance-hdr/help/en/images/not-translated-menu-item.png +share/luminance-hdr/help/en/images/preferences.png +share/luminance-hdr/help/en/images/prefs-cms.png +share/luminance-hdr/help/en/images/prefs-ext.png +share/luminance-hdr/help/en/images/prefs-hdr.png +share/luminance-hdr/help/en/images/prefs-raw.png +share/luminance-hdr/help/en/images/prefs-tm.png +share/luminance-hdr/help/en/images/projectiveTransformationDialog.png +share/luminance-hdr/help/en/images/resize.png +share/luminance-hdr/help/en/images/translated-menu-item.png +share/luminance-hdr/help/en/index.html +share/luminance-hdr/help/en/manual.html +share/luminance-hdr/help/en/menu.xml +share/luminance-hdr/help/en/news.html +share/luminance-hdr/help/en/prefs.html +share/luminance-hdr/help/en/prefs_cms.html +share/luminance-hdr/help/en/prefs_hdr.html +share/luminance-hdr/help/en/prefs_rawconversion.html +share/luminance-hdr/help/en/prefs_tonemapping.html +share/luminance-hdr/help/en/prefs_tools.html +share/luminance-hdr/help/en/prefs_ui.html +share/luminance-hdr/help/en/projective_transformation.html +share/luminance-hdr/help/en/style.css +share/luminance-hdr/help/en/tmap_ref.html +share/luminance-hdr/help/en/tmap_ref_drago.html +share/luminance-hdr/help/en/tmap_ref_durand.html +share/luminance-hdr/help/en/tmap_ref_mantiuk06.html +share/luminance-hdr/help/en/tonemapping.html +share/luminance-hdr/help/en/tonemapping_batch.html +share/luminance-hdr/help/en/tonemapping_cli.html +share/luminance-hdr/help/en/tonemapping_interactive.html +share/luminance-hdr/help/en/workflow.html +share/luminance-hdr/help/js/jquery.js +share/luminance-hdr/help/js/jquery.jtabs.pack.js +share/luminance-hdr/i18n/lang_cs.qm +share/luminance-hdr/i18n/lang_de.qm +share/luminance-hdr/i18n/lang_es.qm +share/luminance-hdr/i18n/lang_fi.qm +share/luminance-hdr/i18n/lang_fr.qm +share/luminance-hdr/i18n/lang_hi.qm +share/luminance-hdr/i18n/lang_hu.qm +share/luminance-hdr/i18n/lang_id.qm +share/luminance-hdr/i18n/lang_it.qm +share/luminance-hdr/i18n/lang_pl.qm +share/luminance-hdr/i18n/lang_ro.qm +share/luminance-hdr/i18n/lang_ru.qm +share/luminance-hdr/i18n/lang_sk.qm +share/luminance-hdr/i18n/lang_tr.qm +share/luminance-hdr/i18n/lang_zh.qm +share/luminance-hdr/i18n/qt_cs.qm +share/luminance-hdr/i18n/qt_de.qm +share/luminance-hdr/i18n/qt_es.qm +share/luminance-hdr/i18n/qt_fi.qm +share/luminance-hdr/i18n/qt_fr.qm +share/luminance-hdr/i18n/qt_hu.qm +share/luminance-hdr/i18n/qt_it.qm +share/luminance-hdr/i18n/qt_pl.qm +share/luminance-hdr/i18n/qt_ro.qm +share/luminance-hdr/i18n/qt_ru.qm +share/luminance-hdr/i18n/qt_tr.qm +share/luminance-hdr/i18n/qt_zh.qm +@dirrm share/luminance-hdr/i18n +@dirrm share/luminance-hdr/help/js +@dirrm share/luminance-hdr/help/en/images +@dirrm share/luminance-hdr/help/en +@dirrm share/luminance-hdr/help +@dirrm share/luminance-hdr +@dirrm share/icons/hicolor/48x48/apps +@dirrm share/icons/hicolor/48x48 +@dirrm share/icons/hicolor +@dirrm share/icons +@dirrm share/applications
luminanceNEW2.txz
Description: Binary data
_______________________________________________ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"