Use my FreeBSD.org address for the MAINTAINER line. Spell freebsd

as "FreeBSD".  Fix the depends to work for a.out too.  Install
copyright notices.

6 files changed, 36 insertions, 12 deletions

diff --git a/lang/pm3-forms/Makefile b/lang/pm3-forms/Makefile
index 131d81e498f9..c67976969b8b 100644
--- a/lang/pm3-forms/Makefile
+++ b/lang/pm3-forms/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:	pm3-forms
 # Version required:	1.1.13
 # Date created:		6 Feb 2000
-# Whom:			John Polstra <jdp@freebsd.org>
+# Whom:			John Polstra <jdp@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -10,10 +10,10 @@ DISTNAME=	pm3-forms-${VERSION}
 CATEGORIES=	lang
 DISTFILES=
 
-MAINTAINER=	jdp@freebsd.org
+MAINTAINER=	jdp@FreeBSD.org
 
-BUILD_DEPENDS=	${PREFIX}/lib/m3/${TARGET}/libm3vbtkit.so.${SOVERSION}:${PORTSDIR}/lang/pm3-gui
-RUN_DEPENDS=	${PREFIX}/lib/m3/${TARGET}/libm3vbtkit.so.${SOVERSION}:${PORTSDIR}/lang/pm3-gui
+BUILD_DEPENDS=	${L1}libm3vbtkit${L2}:${PORTSDIR}/lang/pm3-gui
+RUN_DEPENDS=	${L1}libm3vbtkit${L2}:${PORTSDIR}/lang/pm3-gui
 DEPENDS=	${PORTSDIR}/lang/pm3-base:configure
 
 DIST_SUBDIR=	pm3
@@ -29,6 +29,7 @@ BUILDDIRS=	network/www/web \
 		graphics/forms/formsvbtpixmaps \
 		graphics/forms/formsvbt \
 		graphics/forms/formsedit
+L1=		${PREFIX}/lib/m3/${TARGET}/
 PROGS=		bin/formsedit
 SOVERSION=	7
 VERSION=	1.1.13
@@ -36,10 +37,12 @@ VERSION=	1.1.13
 .include <bsd.port.pre.mk>
 
 .if ${PORTOBJFORMAT} == "aout"
+L2=		.so.${SOVERSION}.0
 TARGET=		FreeBSD2
 TARGETDIR=	freebsd-2
 WORDSIZE=	32
 .elif ${ARCH} == "i386"
+L2=		.so.${SOVERSION}
 .if ${OSVERSION} < 400011
 TARGET=		FreeBSD3
 TARGETDIR=	freebsd-3
@@ -53,6 +56,7 @@ WORDSIZE=	32
 BROKEN=		Not supported on older versions of FreeBSD/Alpha
 .endif
 CFLAGS+=	-mieee
+L2=		.so.${SOVERSION}
 TARGET=		FBSD_ALPHA
 TARGETDIR=	fbsd-alpha
 WORDSIZE=	64
@@ -75,5 +79,7 @@ do-install:
 		${PREFIX}/bin/m3ship; \
 	done
 	@for i in ${PROGS}; do strip ${PREFIX}/$$i; done
+	@${MKDIR} ${PREFIX}/share/pm3-forms
+	@${INSTALL_DATA} ${WRKSRC}/src/COPYRIGHT ${PREFIX}/share/pm3-forms
 
 .include <bsd.port.post.mk>
diff --git a/lang/pm3-forms/pkg-plist b/lang/pm3-forms/pkg-plist
index b4923b661347..a8508456b6bf 100644
--- a/lang/pm3-forms/pkg-plist
+++ b/lang/pm3-forms/pkg-plist
@@ -165,6 +165,8 @@ lib/m3/pkg/web/%%TARGET%%/libweb.a
 lib/m3/pkg/web/%%TARGET%%/libweb.m3x
 lib/m3/pkg/web/%%TARGET%%/libweb.so
 lib/m3/pkg/web/src/Web.i3
+share/pm3-forms/COPYRIGHT
+@dirrm share/pm3-forms
 @dirrm lib/m3/pkg/web/src
 @dirrm lib/m3/pkg/web/%%TARGET%%
 @dirrm lib/m3/pkg/web
diff --git a/lang/pm3-gui/Makefile b/lang/pm3-gui/Makefile
index d1ac7a3e8c45..474b758630db 100644
--- a/lang/pm3-gui/Makefile
+++ b/lang/pm3-gui/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:	pm3-gui
 # Version required:	1.1.13
 # Date created:		6 Feb 2000
-# Whom:			John Polstra <jdp@freebsd.org>
+# Whom:			John Polstra <jdp@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -10,10 +10,10 @@ DISTNAME=	pm3-gui-${VERSION}
 CATEGORIES=	lang
 DISTFILES=
 
-MAINTAINER=	jdp@freebsd.org
+MAINTAINER=	jdp@FreeBSD.org
 
-BUILD_DEPENDS=	${PREFIX}/lib/m3/${TARGET}/libm3tcp.so.${SOVERSION}:${PORTSDIR}/lang/pm3-net
-RUN_DEPENDS=	${PREFIX}/lib/m3/${TARGET}/libm3tcp.so.${SOVERSION}:${PORTSDIR}/lang/pm3-net
+BUILD_DEPENDS=	${L1}libm3tcp${L2}:${PORTSDIR}/lang/pm3-net
+RUN_DEPENDS=	${L1}libm3tcp${L2}:${PORTSDIR}/lang/pm3-net
 DEPENDS=	${PORTSDIR}/lang/pm3-base:configure
 
 DIST_SUBDIR=	pm3
@@ -27,16 +27,19 @@ BUILDDIRS=	graphics/gr-libs/X11 \
 		graphics/gr-libs/ui \
 		graphics/gr-libs/images \
 		graphics/gr-libs/vbtkit
+L1=		${PREFIX}/lib/m3/${TARGET}/
 SOVERSION=	7
 VERSION=	1.1.13
 
 .include <bsd.port.pre.mk>
 
 .if ${PORTOBJFORMAT} == "aout"
+L2=		.so.${SOVERSION}.0
 TARGET=		FreeBSD2
 TARGETDIR=	freebsd-2
 WORDSIZE=	32
 .elif ${ARCH} == "i386"
+L2=		.so.${SOVERSION}
 .if ${OSVERSION} < 400011
 TARGET=		FreeBSD3
 TARGETDIR=	freebsd-3
@@ -50,6 +53,7 @@ WORDSIZE=	32
 BROKEN=		Not supported on older versions of FreeBSD/Alpha
 .endif
 CFLAGS+=	-mieee
+L2=		.so.${SOVERSION}
 TARGET=		FBSD_ALPHA
 TARGETDIR=	fbsd-alpha
 WORDSIZE=	64
@@ -71,5 +75,7 @@ do-install:
 	    cd ${WRKSRC}/$${i} && ${PREFIX}/bin/m3build && \
 		${PREFIX}/bin/m3ship; \
 	done
+	@${MKDIR} ${PREFIX}/share/pm3-gui
+	@${INSTALL_DATA} ${WRKSRC}/src/COPYRIGHT ${PREFIX}/share/pm3-gui
 
 .include <bsd.port.post.mk>
diff --git a/lang/pm3-gui/pkg-plist b/lang/pm3-gui/pkg-plist
index 2383e6c76bae..08c7fce5a7f4 100644
--- a/lang/pm3-gui/pkg-plist
+++ b/lang/pm3-gui/pkg-plist
@@ -304,6 +304,8 @@ lib/m3/pkg/vbtkit/src/vtext/VTVirtual.i3
 lib/m3/pkg/vbtkit/src/vtext/VText.i3
 lib/m3/pkg/vbtkit/src/vtext/VTextDef.i3
 lib/m3/pkg/vbtkit/src/vtext/VTextRegion.i3
+share/pm3-gui/COPYRIGHT
+@dirrm share/pm3-gui
 @dirrm lib/m3/pkg/vbtkit/src/vtext
 @dirrm lib/m3/pkg/vbtkit/src/vbtkitutils
 @dirrm lib/m3/pkg/vbtkit/src/mtext
diff --git a/lang/pm3-net/Makefile b/lang/pm3-net/Makefile
index 5f0f7eb473fb..67d8696ca945 100644
--- a/lang/pm3-net/Makefile
+++ b/lang/pm3-net/Makefile
@@ -1,7 +1,7 @@
 # New ports collection makefile for:	pm3-net
 # Version required:	1.1.13
 # Date created:		6 Feb 2000
-# Whom:			John Polstra <jdp@freebsd.org>
+# Whom:			John Polstra <jdp@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -10,10 +10,10 @@ DISTNAME=	pm3-net-${VERSION}
 CATEGORIES=	lang
 DISTFILES=
 
-MAINTAINER=	jdp@polstra.com
+MAINTAINER=	jdp@FreeBSD.org
 
-BUILD_DEPENDS=	${PREFIX}/lib/m3/${TARGET}/libm3.so.${SOVERSION}:${PORTSDIR}/lang/pm3-base
-RUN_DEPENDS=	${PREFIX}/lib/m3/${TARGET}/libm3.so.${SOVERSION}:${PORTSDIR}/lang/pm3-base
+BUILD_DEPENDS=	${L1}libm3${L2}:${PORTSDIR}/lang/pm3-base
+RUN_DEPENDS=	${L1}libm3${L2}:${PORTSDIR}/lang/pm3-base
 DEPENDS=	${PORTSDIR}/lang/pm3-base:configure
 
 DIST_SUBDIR=	pm3
@@ -25,16 +25,19 @@ WRKSRC=		${WRKDIRPREFIX}${.CURDIR}/../pm3-base/work/pm3-${VERSION}
 BUILDDIRS=	network/tcplibs/tcp \
 		network/tcplibs/tcpextras \
 		network/udp
+L1=		${PREFIX}/lib/m3/${TARGET}/
 SOVERSION=	7
 VERSION=	1.1.13
 
 .include <bsd.port.pre.mk>
 
 .if ${PORTOBJFORMAT} == "aout"
+L2=		.so.${SOVERSION}.0
 TARGET=		FreeBSD2
 TARGETDIR=	freebsd-2
 WORDSIZE=	32
 .elif ${ARCH} == "i386"
+L2=		.so.${SOVERSION}
 .if ${OSVERSION} < 400011
 TARGET=		FreeBSD3
 TARGETDIR=	freebsd-3
@@ -48,6 +51,7 @@ WORDSIZE=	32
 BROKEN=		Not supported on older versions of FreeBSD/Alpha
 .endif
 CFLAGS+=	-mieee
+L2=		.so.${SOVERSION}
 TARGET=		FBSD_ALPHA
 TARGETDIR=	fbsd-alpha
 WORDSIZE=	64
@@ -69,5 +73,7 @@ do-install:
 	    cd ${WRKSRC}/$${i} && ${PREFIX}/bin/m3build && \
 		${PREFIX}/bin/m3ship; \
 	done
+	@${MKDIR} ${PREFIX}/share/pm3-net
+	@${INSTALL_DATA} ${WRKSRC}/src/COPYRIGHT ${PREFIX}/share/pm3-net
 
 .include <bsd.port.post.mk>
diff --git a/lang/pm3-net/pkg-plist b/lang/pm3-net/pkg-plist
index 8205f5ade01b..8e87e09c2317 100644
--- a/lang/pm3-net/pkg-plist
+++ b/lang/pm3-net/pkg-plist
@@ -31,6 +31,8 @@ lib/m3/pkg/udp/%%TARGET%%/libUDP.a
 lib/m3/pkg/udp/%%TARGET%%/libUDP.m3x
 lib/m3/pkg/udp/%%TARGET%%/libUDP.so
 lib/m3/pkg/udp/src/Common/UDP.i3
+share/pm3-net/COPYRIGHT
+@dirrm share/pm3-net
 @dirrm lib/m3/pkg/udp/src/Common
 @dirrm lib/m3/pkg/udp/src
 @dirrm lib/m3/pkg/udp/%%TARGET%%