Make this port respect CC/CFLAGS properly; add secondary MASTER_SITES, and

support the install macros.  Add nice manpage too!

PR:		18884
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

8 files changed, 148 insertions, 10 deletions

diff --git a/graphics/splitmpg/Makefile b/graphics/splitmpg/Makefile
index 6f61668fdf7e..2c99e364d69b 100644
--- a/graphics/splitmpg/Makefile
+++ b/graphics/splitmpg/Makefile
@@ -8,14 +8,18 @@
 PORTNAME=	splitmpg
 PORTVERSION=	1.0
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.ecel.uwa.edu.au/users/michael/
-DISTFILES=	${PORTNAME}.tgz
+MASTER_SITES=	ftp://ftp.ecel.uwa.edu.au/users/michael/ \
+		ftp://ftp.netcom.com/pub/ms/msimmons/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+NO_WRKSUBDIR=	yes
+MAKEFILE=	makefile
 MAN1=		splitmpeg.1
-MANCOMPRESSED=	yes
 
-NO_WRKSUBDIR=	yes
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/splitmpeg ${PREFIX}/bin
+	${INSTALL_MAN} ${FILESDIR}/splitmpeg.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/graphics/splitmpg/files/patch-ac b/graphics/splitmpg/files/patch-ac
new file mode 100644
index 000000000000..85480ce801ea
--- /dev/null
+++ b/graphics/splitmpg/files/patch-ac
@@ -0,0 +1,21 @@
+--- makefile.orig	Thu Jun 23 00:07:39 1994
++++ makefile	Wed Apr 26 19:23:14 2000
+@@ -22,11 +22,14 @@
+ # Email: michael@ecel.uwa.edu.au
+ # Post: P.O. Box 506, NEDLANDS WA 6009, AUSTRALIA
+ 
++# FreeBSD
++LIBS = -lm
++
+ # Linux
+-CC=g++
+-CFLAGS=-O2 -m486 -funroll-loops -Wall -DLINUX -DINTEL_BYTE_ORDER
+-INCLUDES=-I/usr/g++-include/ -I/usr/lib/gcc-lib/i486-linux/2.5.8/include/
+-LIBS=-lm
++#CC=g++
++#CFLAGS=-O2 -m486 -funroll-loops -Wall -DLINUX -DINTEL_BYTE_ORDER
++#INCLUDES=-I/usr/g++-include/ -I/usr/lib/gcc-lib/i486-linux/2.5.8/include/
++#LIBS=-lm
+ 
+ # SunOS
+ #CFLAGS = -O2 -Wall -DSunOS -DSPARC
diff --git a/graphics/splitmpg/files/splitmpeg.1 b/graphics/splitmpg/files/splitmpeg.1
new file mode 100644
index 000000000000..1b846bd8237e
--- /dev/null
+++ b/graphics/splitmpg/files/splitmpeg.1
@@ -0,0 +1,45 @@
+.\" The following requests are required for all man pages.
+.Dd Thu Aug  1 09:36:57 CDT 1996
+.Os
+.Dt splitmpeg 1
+.Sh NAME
+.Nm splitmpeg
+.Sh SYNOPSIS
+.Nm splitmpeg
+.Op Fl vq
+.Ar filename
+.Sh DESCRIPTION
+.Nm splitmpeg
+splits an ISO 11172-1 MPEG system layer stream into its components.
+
+.Fl v
+print pack SCR and mux rate for each pack.
+
+.Fl q
+work quitely, nothing is written to stdout.
+
+.\" .Sh ENVIRONMENT
+.Sh FILES
+
+.Bl -tag -width stm188.mpg -compact
+.It Pa stm188.mpg
+is a reserved stream.
+
+.It Pa stm189.mpg
+is private stream 1.
+
+.It Pa stm190.mpg
+is the padding stream.
+
+.It Pa stm191.mpg
+is private stream 2.
+
+.It Pa stm192.mpg to stm223.mpg
+are audio streams.
+
+.It Pa stm224.mpg to stm239.mpg
+are video streams. 
+
+.Sh AUTHORS
+splitmpeg was written by Michael Simmons <michael@ecel.uwa.edu.au>.
+This man page was written by Eric L. Hernes <erich@FreeBSD.org>
diff --git a/graphics/splitmpg/pkg-descr b/graphics/splitmpg/pkg-descr
index 0eda5d3487a2..61dc3a798ca5 100644
--- a/graphics/splitmpg/pkg-descr
+++ b/graphics/splitmpg/pkg-descr
@@ -13,4 +13,3 @@ From readme.txt:
 
 eric.
 erich@FreeBSD.org
-
diff --git a/multimedia/splitmpg/Makefile b/multimedia/splitmpg/Makefile
index 6f61668fdf7e..2c99e364d69b 100644
--- a/multimedia/splitmpg/Makefile
+++ b/multimedia/splitmpg/Makefile
@@ -8,14 +8,18 @@
 PORTNAME=	splitmpg
 PORTVERSION=	1.0
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.ecel.uwa.edu.au/users/michael/
-DISTFILES=	${PORTNAME}.tgz
+MASTER_SITES=	ftp://ftp.ecel.uwa.edu.au/users/michael/ \
+		ftp://ftp.netcom.com/pub/ms/msimmons/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+NO_WRKSUBDIR=	yes
+MAKEFILE=	makefile
 MAN1=		splitmpeg.1
-MANCOMPRESSED=	yes
 
-NO_WRKSUBDIR=	yes
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/splitmpeg ${PREFIX}/bin
+	${INSTALL_MAN} ${FILESDIR}/splitmpeg.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/multimedia/splitmpg/files/patch-ac b/multimedia/splitmpg/files/patch-ac
new file mode 100644
index 000000000000..85480ce801ea
--- /dev/null
+++ b/multimedia/splitmpg/files/patch-ac
@@ -0,0 +1,21 @@
+--- makefile.orig	Thu Jun 23 00:07:39 1994
++++ makefile	Wed Apr 26 19:23:14 2000
+@@ -22,11 +22,14 @@
+ # Email: michael@ecel.uwa.edu.au
+ # Post: P.O. Box 506, NEDLANDS WA 6009, AUSTRALIA
+ 
++# FreeBSD
++LIBS = -lm
++
+ # Linux
+-CC=g++
+-CFLAGS=-O2 -m486 -funroll-loops -Wall -DLINUX -DINTEL_BYTE_ORDER
+-INCLUDES=-I/usr/g++-include/ -I/usr/lib/gcc-lib/i486-linux/2.5.8/include/
+-LIBS=-lm
++#CC=g++
++#CFLAGS=-O2 -m486 -funroll-loops -Wall -DLINUX -DINTEL_BYTE_ORDER
++#INCLUDES=-I/usr/g++-include/ -I/usr/lib/gcc-lib/i486-linux/2.5.8/include/
++#LIBS=-lm
+ 
+ # SunOS
+ #CFLAGS = -O2 -Wall -DSunOS -DSPARC
diff --git a/multimedia/splitmpg/files/splitmpeg.1 b/multimedia/splitmpg/files/splitmpeg.1
new file mode 100644
index 000000000000..1b846bd8237e
--- /dev/null
+++ b/multimedia/splitmpg/files/splitmpeg.1
@@ -0,0 +1,45 @@
+.\" The following requests are required for all man pages.
+.Dd Thu Aug  1 09:36:57 CDT 1996
+.Os
+.Dt splitmpeg 1
+.Sh NAME
+.Nm splitmpeg
+.Sh SYNOPSIS
+.Nm splitmpeg
+.Op Fl vq
+.Ar filename
+.Sh DESCRIPTION
+.Nm splitmpeg
+splits an ISO 11172-1 MPEG system layer stream into its components.
+
+.Fl v
+print pack SCR and mux rate for each pack.
+
+.Fl q
+work quitely, nothing is written to stdout.
+
+.\" .Sh ENVIRONMENT
+.Sh FILES
+
+.Bl -tag -width stm188.mpg -compact
+.It Pa stm188.mpg
+is a reserved stream.
+
+.It Pa stm189.mpg
+is private stream 1.
+
+.It Pa stm190.mpg
+is the padding stream.
+
+.It Pa stm191.mpg
+is private stream 2.
+
+.It Pa stm192.mpg to stm223.mpg
+are audio streams.
+
+.It Pa stm224.mpg to stm239.mpg
+are video streams. 
+
+.Sh AUTHORS
+splitmpeg was written by Michael Simmons <michael@ecel.uwa.edu.au>.
+This man page was written by Eric L. Hernes <erich@FreeBSD.org>
diff --git a/multimedia/splitmpg/pkg-descr b/multimedia/splitmpg/pkg-descr
index 0eda5d3487a2..61dc3a798ca5 100644
--- a/multimedia/splitmpg/pkg-descr
+++ b/multimedia/splitmpg/pkg-descr
@@ -13,4 +13,3 @@ From readme.txt:
 
 eric.
 erich@FreeBSD.org
-