- Readd the port with better, all-lowercase name [1]

- While here, fix several minor issues with Makefile and pkg-descr (augment
  COMMENT, utilize standard NO_BUILD and NO_WRKSUBDIR knobs, remove `x11'
  as a secondary category, use correct installation commands and merge them
  into one, give correct package name prefix (`linux-') for Linux binary-
  only software, sort PLIST_FILES -- all these things that usually happen
  when people are not reading PH well enough, do not look at other ports,
  and not using common sense.)  :-(

No objection from:	pgollucci [1]
Feature safe:		yes

5 files changed, 29 insertions, 31 deletions

diff --git a/multimedia/Makefile b/multimedia/Makefile
index f1f6387caeb0..b60e28b48970 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -165,6 +165,7 @@
     SUBDIR += linux-libtheora
     SUBDIR += linux-ov511-kmod
     SUBDIR += linux-realplayer
+    SUBDIR += linux-tsmuxer
     SUBDIR += linux-xmovie
     SUBDIR += lives
     SUBDIR += lsdvd
@@ -288,7 +289,6 @@
     SUBDIR += tovid
     SUBDIR += transcode
     SUBDIR += transkode
-    SUBDIR += tsMuxeR
     SUBDIR += tstools
     SUBDIR += tunapie
     SUBDIR += tv_grab_au
diff --git a/multimedia/linux-tsmuxer/Makefile b/multimedia/linux-tsmuxer/Makefile
new file mode 100644
index 000000000000..3d8a17b760b1
--- /dev/null
+++ b/multimedia/linux-tsmuxer/Makefile
@@ -0,0 +1,27 @@
+# New ports collection makefile for:	tsMuxeR (Linux version)
+# Date created:				2010-01-02
+# Whom:					Steve Wills <steve@mouf.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	tsmuxer
+PORTVERSION=	1.10.6
+CATEGORIES=	multimedia linux
+MASTER_SITES=	http://www.smlabs.net/tsMuxer/
+PKGNAMEPREFIX=	linux-
+DISTNAME=	tsMuxeR_${PORTVERSION}
+
+MAINTAINER=	steve@mouf.net
+COMMENT=	Utility to create TS and M2TS files for IP broadcasting
+
+USE_LINUX=	yes
+NO_WRKSUBDIR=	yes
+NO_BUILD=	yes
+PLIST_FILES=	bin/tsMuxeR bin/tsMuxerGUI
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKDIR}/tsMuxeR ${WRKDIR}/tsMuxerGUI \
+		${PREFIX}/bin
+
+.include <bsd.port.mk>
diff --git a/multimedia/tsMuxeR/distinfo b/multimedia/linux-tsmuxer/distinfo
index 457252837dca..457252837dca 100644
--- a/multimedia/tsMuxeR/distinfo
+++ b/multimedia/linux-tsmuxer/distinfo
diff --git a/multimedia/tsMuxeR/pkg-descr b/multimedia/linux-tsmuxer/pkg-descr
index 8b74984a8e81..35ab1fa708c2 100644
--- a/multimedia/tsMuxeR/pkg-descr
+++ b/multimedia/linux-tsmuxer/pkg-descr
@@ -2,4 +2,4 @@ tsMuxeR a software utility to create TS and M2TS files for IP broadcasting
 as well as for viewing at hardware video players (i.e., Dune HD Ultra, Sony
 Playstation3 and others).
 
-WWW:	http://www.smlabs.net/tsmuxer_en.html
+WWW: http://www.smlabs.net/tsmuxer_en.html
diff --git a/multimedia/tsMuxeR/Makefile b/multimedia/tsMuxeR/Makefile
deleted file mode 100644
index 753e6d5b533f..000000000000
--- a/multimedia/tsMuxeR/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# New ports collection makefile for:	tsMuxeR
-# Date created:		2010-01-02
-# Whom:			Steve Wills <steve@mouf.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	tsMuxeR
-PORTVERSION=	1.10.6
-CATEGORIES=	multimedia linux x11
-MASTER_SITES=	http://www.smlabs.net/tsMuxer/
-DISTNAME=	${PORTNAME}_${PORTVERSION}
-
-MAINTAINER=	steve@mouf.net
-COMMENT=	Utility to create TS and M2TS files
-
-WRKSRC=		${WRKDIR}
-USE_LINUX=	yes
-PLIST_FILES=	bin/tsMuxerGUI bin/tsMuxeR
-
-do-build:
-	@${DO_NADA}
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/tsMuxerGUI ${PREFIX}/bin/tsMuxerGUI
-	${INSTALL_SCRIPT} ${WRKDIR}/tsMuxeR ${PREFIX}/bin/tsMuxeR
-
-.include <bsd.port.pre.mk>
-.include <bsd.port.post.mk>