Oops... also install x264 binary

4 files changed, 19 insertions, 7 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index 8190088c23d..5433e634736 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2012/11/08 19:55:56 adam Exp $
+# $NetBSD: Makefile,v 1.37 2012/11/08 20:28:08 adam Exp $
 
 SNAPSHOT_DATE=	20121107
 
@@ -52,7 +52,8 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX}
 MAKE_ENV+=		SH=${SH:Q}
 
 BUILD_TARGET=		default
-INSTALL_TARGET=		install-lib-static
+INSTALL_TARGET=		install-lib-static install-cli
+INSTALLATION_DIRS=	bin
 BUILDLINK_TRANSFORM+=	rm:-O4	# XXX does this mean anything to any compiler?
 REPLACE_SH=		strip_fopt.sh version.sh
 
diff --git a/multimedia/x264-devel/PLIST b/multimedia/x264-devel/PLIST
index 90c401f601b..40f90090379 100644
--- a/multimedia/x264-devel/PLIST
+++ b/multimedia/x264-devel/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2011/07/18 21:00:11 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/11/08 20:28:08 adam Exp $
+bin/x264
 include/x264.h
 include/x264_config.h
 lib/libx264.la
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index bed4f0b5887..8feab61742c 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.26 2012/11/08 19:55:56 adam Exp $
+$NetBSD: distinfo,v 1.27 2012/11/08 20:28:09 adam Exp $
 
 SHA1 (x264-snapshot-20121107-2245.tar.bz2) = 9b881d79f1dd8399451e17ac5e410280514ed1c4
 RMD160 (x264-snapshot-20121107-2245.tar.bz2) = 634a564002c84c6ab80ca1c419d0c1c503806e71
 Size (x264-snapshot-20121107-2245.tar.bz2) = 555368 bytes
 SHA1 (patch-aa) = f4505ef68e208d05d763e67625c172a85402db31
-SHA1 (patch-ab) = 548c8fcf4ec4397df69566da743ccc06b5800972
+SHA1 (patch-ab) = 796b817a9ad056fea3ccb87c051701653c78f913
 SHA1 (patch-ac) = 8e39fe0d61f31bd4624e8b2f4cc6a795cbea4e77
 SHA1 (patch-ak) = bb73c847d6f7be5cee2eee1d77060b5633e5dfc2
 SHA1 (patch-ba) = a8f12131e23953704361fb499b568f8f233c6be6
diff --git a/multimedia/x264-devel/patches/patch-ab b/multimedia/x264-devel/patches/patch-ab
index d8848869558..34ed941c913 100644
--- a/multimedia/x264-devel/patches/patch-ab
+++ b/multimedia/x264-devel/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.16 2012/11/08 19:55:56 adam Exp $
+$NetBSD: patch-ab,v 1.17 2012/11/08 20:28:09 adam Exp $
 
 --- Makefile.orig	2012-11-07 21:45:03.000000000 +0000
 +++ Makefile
@@ -88,7 +88,17 @@ $NetBSD: patch-ab,v 1.16 2012/11/08 19:55:56 adam Exp $
  
  %.o: %.S
  	$(AS) $(ASFLAGS) -o $@ $<
-@@ -250,8 +253,7 @@ install-lib-dev:
+@@ -238,8 +241,7 @@ distclean: clean
+ 	rm -f config.mak x264_config.h config.h config.log x264.pc x264.def
+ 
+ install-cli: cli
+-	install -d $(DESTDIR)$(bindir)
+-	install x264$(EXE) $(DESTDIR)$(bindir)
++	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} x264 $(DESTDIR)$(bindir)/x264
+ 
+ install-lib-dev:
+ 	install -d $(DESTDIR)$(includedir)
+@@ -250,8 +252,7 @@ install-lib-dev:
  	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
  
  install-lib-static: lib-static install-lib-dev