- Change license BSD to BSD3CLAUSE

- Add MAJORVER, VER
- Strip library
- Recreate patches with make makepatch

4 files changed, 17 insertions, 11 deletions

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 <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}
diff --git a/graphics/OpenEXR/files/extra-patch-IlmImfExamples-Makefile.in b/graphics/OpenEXR/files/extra-patch-IlmImfExamples__Makefile.in
index cbb7d5c3caea..2f984b895fdf 100644
--- a/graphics/OpenEXR/files/extra-patch-IlmImfExamples-Makefile.in
+++ b/graphics/OpenEXR/files/extra-patch-IlmImfExamples__Makefile.in
@@ -1,5 +1,5 @@
---- IlmImfExamples/Makefile.in.orig	2013-07-12 02:09:22.000000000 +0200
-+++ IlmImfExamples/Makefile.in	2013-10-06 22:56:21.000000000 +0200
+--- ./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:
diff --git a/graphics/OpenEXR/files/patch-exrenvmap-main.cpp b/graphics/OpenEXR/files/patch-exrenvmap__main.cpp
index a1207bb8cd70..0a2501473816 100644
--- a/graphics/OpenEXR/files/patch-exrenvmap-main.cpp
+++ b/graphics/OpenEXR/files/patch-exrenvmap__main.cpp
@@ -1,5 +1,5 @@
---- exrenvmap/main.cpp.orig	2013-06-18 21:51:40.000000000 +0200
-+++ exrenvmap/main.cpp	2013-10-05 18:45:26.000000000 +0200
+--- ./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>
  
diff --git a/graphics/OpenEXR/files/patch-exrmaketiled-main.cpp b/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp
index b01736f2cadf..e9d021bd964c 100644
--- a/graphics/OpenEXR/files/patch-exrmaketiled-main.cpp
+++ b/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp
@@ -1,5 +1,5 @@
---- exrmaketiled/main.cpp.orig	2013-06-18 21:51:40.000000000 +0200
-+++ exrmaketiled/main.cpp	2013-10-05 18:49:14.000000000 +0200
+--- ./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"