Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Mar 2014 17:49:42 +0000 (UTC)
From:      Rusmir Dusko <nemysis@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r349037 - in head/graphics/OpenEXR: . files
Message-ID:  <201403241749.s2OHngrD011730@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nemysis
Date: Mon Mar 24 17:49:42 2014
New Revision: 349037
URL: http://svnweb.freebsd.org/changeset/ports/349037
QAT: https://qat.redports.org/buildarchive/r349037/

Log:
  - Change license BSD to BSD3CLAUSE
  - Add MAJORVER, VER
  - Strip library
  - Recreate patches with make makepatch

Added:
  head/graphics/OpenEXR/files/extra-patch-IlmImfExamples__Makefile.in   (contents, props changed)
  head/graphics/OpenEXR/files/patch-exrenvmap__main.cpp   (contents, props changed)
  head/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp   (contents, props changed)
Deleted:
  head/graphics/OpenEXR/files/extra-patch-IlmImfExamples-Makefile.in
  head/graphics/OpenEXR/files/patch-exrenvmap-main.cpp
  head/graphics/OpenEXR/files/patch-exrmaketiled-main.cpp
Modified:
  head/graphics/OpenEXR/Makefile

Modified: head/graphics/OpenEXR/Makefile
==============================================================================
--- head/graphics/OpenEXR/Makefile	Mon Mar 24 17:49:30 2014	(r349036)
+++ head/graphics/OpenEXR/Makefile	Mon Mar 24 17:49:42 2014	(r349037)
@@ -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-stac
 
 .include <bsd.port.options.mk>
 
-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}

Added: head/graphics/OpenEXR/files/extra-patch-IlmImfExamples__Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/OpenEXR/files/extra-patch-IlmImfExamples__Makefile.in	Mon Mar 24 17:49:42 2014	(r349037)
@@ -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)

Added: head/graphics/OpenEXR/files/patch-exrenvmap__main.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/OpenEXR/files/patch-exrenvmap__main.cpp	Mon Mar 24 17:49:42 2014	(r349037)
@@ -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 <ImfHeader.h>
+ 
+ #include <iostream>
++#include <cstring>
+ #include <exception>
+ #include <string>
+ #include <string.h>

Added: head/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp	Mon Mar 24 17:49:42 2014	(r349037)
@@ -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 <iostream>
++#include <cstring>
+ #include <exception>
+ #include <string>
+ #include <string.h>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403241749.s2OHngrD011730>