svn commit: r331049 - head/multimedia/libmatroska

[Baptiste Daroussin]

Author: bapt
Date: Sun Oct 20 18:27:39 2013
New Revision: 331049
URL: http://svnweb.freebsd.org/changeset/ports/331049

Log:
  Use proper make_args instead of patching
  add the static library to the plist
  Bump port revision

Modified:
  head/multimedia/libmatroska/Makefile
  head/multimedia/libmatroska/pkg-plist

Modified: head/multimedia/libmatroska/Makefile
==============================================================================
--- head/multimedia/libmatroska/Makefile	Sun Oct 20 18:19:28 2013	(r331048)
+++ head/multimedia/libmatroska/Makefile	Sun Oct 20 18:27:39 2013	(r331049)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libmatroska
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://dl.matroska.org/downloads/libmatroska/ \
 		http://www.bunkus.org/videotools/mkvtoolnix/sources/
@@ -24,6 +25,16 @@ USE_LDCONFIG=	yes
 # Installs dir with proper permissions
 INSTALL_DATA_DIR=	${INSTALL} -d -m 755
 
+MAKE_ARGS=	INSTALL_DIR_OPTS="${INSTALL} -d -m 755" \
+		INSTALL_OPTS="${INSTALL_DATA}" \
+		INSTALL_OPTS_LIB="${INSTALL_LIB}" \
+		INSTALL="" \
+		prefix=${PREFIX} \
+		CXX="${CXX}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LIBEBML_INCLUDE_DIR="${LOCALBASE}/include" \
+		LIBEBML_LIB_DIR="${LOCALBASE}/lib"
+
 post-patch:
 # XXX - revise at every port update
 # the tests are botched. do not run them
@@ -31,19 +42,4 @@ post-patch:
 		-e 's|^(all:.*)test|\1|' \
 		${WRKSRC}/make/linux/Makefile
 
-do-configure:
-	@${REINPLACE_CMD} -E \
-		-e 's|^(prefix).*$$|\1=${PREFIX}|; \
-			s,^(CXX|LD)[[:space:]]*=.*$$,\1=${CXX},; \
-			s|^(CXXFLAGS)[[:space:]]*=(.*)$$|\1+=\2|; \
-			s|^(LIBEBML_INCLUDE_DIR)[[:space:]]*=.*|\1=${LOCALBASE}/include|; \
-			s|^(LIBEBML_LIB_DIR)[[:space:]]*=.*|\1=${LOCALBASE}/lib|; \
-			s|^(INSTALL)[[:space:]]*=.*$$|\1=|; \
-			s|^(INSTALL_DIR_OPTS)[[:space:]]*=.*$$|\1=${INSTALL_DATA_DIR}|; \
-			s,^(INSTALL_OPTS)[[:space:]]*=.*$$,\1=${INSTALL_DATA},; \
-			s,^(INSTALL_OPTS_LIB)[[:space:]]*=.*$$,\1=${INSTALL_LIB},; \
-			/install:/s|install_staticlib||;/all:/s|staticlib||; \
-			s,(-lebml)$$,-L${LOCALBASE}/lib \1,' \
-		${WRKSRC}/make/linux/Makefile
-
 .include <bsd.port.mk>

Modified: head/multimedia/libmatroska/pkg-plist
==============================================================================
--- head/multimedia/libmatroska/pkg-plist	Sun Oct 20 18:19:28 2013	(r331048)
+++ head/multimedia/libmatroska/pkg-plist	Sun Oct 20 18:27:39 2013	(r331049)
@@ -27,6 +27,7 @@ include/matroska/KaxTypes.h
 include/matroska/KaxVersion.h
 include/matroska/c/libmatroska.h
 include/matroska/c/libmatroska_t.h
+lib/libmatroska.a
 lib/libmatroska.so
 lib/libmatroska.so.6
 @dirrm include/matroska/c