From 85b6eb79cc900b1bb7951bece4693d632f882388 Mon Sep 17 00:00:00 2001 From: nemysis Date: Mon, 24 Mar 2014 17:49:42 +0000 Subject: - Change license BSD to BSD3CLAUSE - Add MAJORVER, VER - Strip library - Recreate patches with make makepatch --- graphics/OpenEXR/Makefile | 16 +++++++---- .../files/extra-patch-IlmImfExamples-Makefile.in | 33 ---------------------- .../files/extra-patch-IlmImfExamples__Makefile.in | 33 ++++++++++++++++++++++ graphics/OpenEXR/files/patch-exrenvmap-main.cpp | 10 ------- graphics/OpenEXR/files/patch-exrenvmap__main.cpp | 10 +++++++ graphics/OpenEXR/files/patch-exrmaketiled-main.cpp | 10 ------- .../OpenEXR/files/patch-exrmaketiled__main.cpp | 10 +++++++ 7 files changed, 64 insertions(+), 58 deletions(-) delete mode 100644 graphics/OpenEXR/files/extra-patch-IlmImfExamples-Makefile.in create mode 100644 graphics/OpenEXR/files/extra-patch-IlmImfExamples__Makefile.in delete mode 100644 graphics/OpenEXR/files/patch-exrenvmap-main.cpp create mode 100644 graphics/OpenEXR/files/patch-exrenvmap__main.cpp delete mode 100644 graphics/OpenEXR/files/patch-exrmaketiled-main.cpp create mode 100644 graphics/OpenEXR/files/patch-exrmaketiled__main.cpp (limited to 'graphics') diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile index 4a43af36b29d..e201b00966d3 100644 --- a/graphics/OpenEXR/Makefile +++ b/graphics/OpenEXR/Makefile @@ -11,7 +11,7 @@ DISTNAME= openexr-${DISTVERSION} MAINTAINER= nemysis@FreeBSD.org COMMENT= High dynamic-range (HDR) image file format -LICENSE= BSD +LICENSE= BSD3CLAUSE LIB_DEPENDS= libImath.so:${PORTSDIR}/graphics/ilmbase @@ -45,25 +45,31 @@ LARGE_STACK_CONFIGURE_ENABLE= large-stack .include -PLIST_SUB= MAJORVER=2_1 -PLIST_SUB+= VER=21 +MAJORVER= 2_1 +VER= 21 + +PLIST_SUB= MAJORVER=${MAJORVER} +PLIST_SUB+= VER=${VER} post-patch: @${REINPLACE_CMD} -e 's|== x|= x|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|$$(datadir)/doc/OpenEXR-@OPENEXR_VERSION@/examples|$$(prefix)/share/examples/${PORTNAME}|' \ + @${REINPLACE_CMD} \ + -e 's|$$(datadir)/doc/OpenEXR-@OPENEXR_VERSION@/examples|$$(prefix)/share/examples/${PORTNAME}|' \ ${WRKSRC}/IlmImfExamples/Makefile.in @${REINPLACE_CMD} -e 's|$$(datadir)/doc/OpenEXR-@OPENEXR_VERSION@||' \ -e 's|$$(EXTRA_DIST)||' \ ${WRKSRC}/doc/Makefile.am ${WRKSRC}/doc/Makefile.in .if ! ${PORT_OPTIONS:MEXAMPLES} -EXTRA_PATCHES+=${FILESDIR}/extra-patch-IlmImfExamples-Makefile.in +EXTRA_PATCHES+=${FILESDIR}/extra-patch-IlmImfExamples__Makefile.in .endif regression-test regression test check: build @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check) post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libIlmImf-Imf_${MAJORVER}.so.${VER} + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR2} diff --git a/graphics/OpenEXR/files/extra-patch-IlmImfExamples-Makefile.in b/graphics/OpenEXR/files/extra-patch-IlmImfExamples-Makefile.in deleted file mode 100644 index cbb7d5c3caea..000000000000 --- a/graphics/OpenEXR/files/extra-patch-IlmImfExamples-Makefile.in +++ /dev/null @@ -1,33 +0,0 @@ ---- IlmImfExamples/Makefile.in.orig 2013-07-12 02:09:22.000000000 +0200 -+++ IlmImfExamples/Makefile.in 2013-10-06 22:56:21.000000000 +0200 -@@ -356,18 +356,18 @@ - - clean-libtool: - -rm -rf .libs _libs --install-examplesDATA: $(examples_DATA) -- @$(NORMAL_INSTALL) -- test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)" -- @list='$(examples_DATA)'; test -n "$(examplesdir)" || list=; \ -- for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- echo "$$d$$p"; \ -- done | $(am__base_list) | \ -- while read files; do \ -- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(examplesdir)'"; \ -- $(INSTALL_DATA) $$files "$(DESTDIR)$(examplesdir)" || exit $$?; \ -- done -+#install-examplesDATA: $(examples_DATA) -+# @$(NORMAL_INSTALL) -+# test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)" -+# @list='$(examples_DATA)'; test -n "$(examplesdir)" || list=; \ -+# for p in $$list; do \ -+# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+# echo "$$d$$p"; \ -+# done | $(am__base_list) | \ -+# while read files; do \ -+# echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(examplesdir)'"; \ -+# $(INSTALL_DATA) $$files "$(DESTDIR)$(examplesdir)" || exit $$?; \ -+# done - - uninstall-examplesDATA: - @$(NORMAL_UNINSTALL) diff --git a/graphics/OpenEXR/files/extra-patch-IlmImfExamples__Makefile.in b/graphics/OpenEXR/files/extra-patch-IlmImfExamples__Makefile.in new file mode 100644 index 000000000000..2f984b895fdf --- /dev/null +++ b/graphics/OpenEXR/files/extra-patch-IlmImfExamples__Makefile.in @@ -0,0 +1,33 @@ +--- ./IlmImfExamples/Makefile.in.orig 2014-03-24 18:28:37.886449236 +0100 ++++ ./IlmImfExamples/Makefile.in 2014-03-24 18:33:52.637113427 +0100 +@@ -356,18 +356,18 @@ + + clean-libtool: + -rm -rf .libs _libs +-install-examplesDATA: $(examples_DATA) +- @$(NORMAL_INSTALL) +- test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)" +- @list='$(examples_DATA)'; test -n "$(examplesdir)" || list=; \ +- for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- echo "$$d$$p"; \ +- done | $(am__base_list) | \ +- while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(examplesdir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(examplesdir)" || exit $$?; \ +- done ++#install-examplesDATA: $(examples_DATA) ++# @$(NORMAL_INSTALL) ++# test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)" ++# @list='$(examples_DATA)'; test -n "$(examplesdir)" || list=; \ ++# for p in $$list; do \ ++# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++# echo "$$d$$p"; \ ++# done | $(am__base_list) | \ ++# while read files; do \ ++# echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(examplesdir)'"; \ ++# $(INSTALL_DATA) $$files "$(DESTDIR)$(examplesdir)" || exit $$?; \ ++# done + + uninstall-examplesDATA: + @$(NORMAL_UNINSTALL) diff --git a/graphics/OpenEXR/files/patch-exrenvmap-main.cpp b/graphics/OpenEXR/files/patch-exrenvmap-main.cpp deleted file mode 100644 index a1207bb8cd70..000000000000 --- a/graphics/OpenEXR/files/patch-exrenvmap-main.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- exrenvmap/main.cpp.orig 2013-06-18 21:51:40.000000000 +0200 -+++ exrenvmap/main.cpp 2013-10-05 18:45:26.000000000 +0200 -@@ -47,6 +47,7 @@ - #include - - #include -+#include - #include - #include - #include diff --git a/graphics/OpenEXR/files/patch-exrenvmap__main.cpp b/graphics/OpenEXR/files/patch-exrenvmap__main.cpp new file mode 100644 index 000000000000..0a2501473816 --- /dev/null +++ b/graphics/OpenEXR/files/patch-exrenvmap__main.cpp @@ -0,0 +1,10 @@ +--- ./exrenvmap/main.cpp.orig 2013-11-25 20:49:55.000000000 +0100 ++++ ./exrenvmap/main.cpp 2014-03-24 18:28:37.906458972 +0100 +@@ -47,6 +47,7 @@ + #include + + #include ++#include + #include + #include + #include diff --git a/graphics/OpenEXR/files/patch-exrmaketiled-main.cpp b/graphics/OpenEXR/files/patch-exrmaketiled-main.cpp deleted file mode 100644 index b01736f2cadf..000000000000 --- a/graphics/OpenEXR/files/patch-exrmaketiled-main.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- exrmaketiled/main.cpp.orig 2013-06-18 21:51:40.000000000 +0200 -+++ exrmaketiled/main.cpp 2013-10-05 18:49:14.000000000 +0200 -@@ -43,6 +43,7 @@ - #include "makeTiled.h" - - #include -+#include - #include - #include - #include diff --git a/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp b/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp new file mode 100644 index 000000000000..e9d021bd964c --- /dev/null +++ b/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp @@ -0,0 +1,10 @@ +--- ./exrmaketiled/main.cpp.orig 2013-11-25 20:49:56.000000000 +0100 ++++ ./exrmaketiled/main.cpp 2014-03-24 18:28:37.916466529 +0100 +@@ -43,6 +43,7 @@ + #include "makeTiled.h" + + #include ++#include + #include + #include + #include -- cgit