aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--multimedia/Makefile2
-rw-r--r--multimedia/linux-tsmuxer/Makefile27
-rw-r--r--multimedia/linux-tsmuxer/distinfo (renamed from multimedia/tsMuxeR/distinfo)0
-rw-r--r--multimedia/linux-tsmuxer/pkg-descr (renamed from multimedia/tsMuxeR/pkg-descr)2
-rw-r--r--multimedia/tsMuxeR/Makefile29
6 files changed, 30 insertions, 31 deletions
diff --git a/MOVED b/MOVED
index 6de4f1681bba..3822ceb3ea2f 100644
--- a/MOVED
+++ b/MOVED
@@ -4325,3 +4325,4 @@ ports-mgmt/portbrowser||2010-02-16|No longer maintained
editors/openoffice.org-2-RC||2010-02-19|Removed
net-p2p/rblibtorrent-devel|net-p2p/libtorrent-rasterbar-14|2010-02-21|No longer devel, recognize project name
sysutils/munin-main|sysutils/munin-master|2010-02-22|Reorganized upstream
+multimedia/tsMuxeR|multimedia/linux-tsmuxer|2010-02-24|Port was given a better name
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>