diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-10-20 18:27:39 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-10-20 18:27:39 +0000 |
| commit | 2a59eb0a57324b1169c6e70d8b21d7a169cd9b2c (patch) | |
| tree | 5e62b587bcacd11bcb5df80d9cd9fc848f67d5b8 /multimedia/libmatroska | |
| parent | 7f7d5fdda7da2ee7c184e7ac815a666c38620ab3 (diff) | |
| download | ports-2a59eb0a57324b1169c6e70d8b21d7a169cd9b2c.tar.gz ports-2a59eb0a57324b1169c6e70d8b21d7a169cd9b2c.zip | |
Use proper make_args instead of patching
add the static library to the plist
Bump port revision
Notes
Notes:
svn path=/head/; revision=331049
Diffstat (limited to 'multimedia/libmatroska')
| -rw-r--r-- | multimedia/libmatroska/Makefile | 26 | ||||
| -rw-r--r-- | multimedia/libmatroska/pkg-plist | 1 |
2 files changed, 12 insertions, 15 deletions
diff --git a/multimedia/libmatroska/Makefile b/multimedia/libmatroska/Makefile index 0804418013da..768a8d937d6c 100644 --- a/multimedia/libmatroska/Makefile +++ b/multimedia/libmatroska/Makefile @@ -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> diff --git a/multimedia/libmatroska/pkg-plist b/multimedia/libmatroska/pkg-plist index 97e0715ebcba..50f7c233bdd8 100644 --- a/multimedia/libmatroska/pkg-plist +++ b/multimedia/libmatroska/pkg-plist @@ -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 |