diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile
index 0a25ee6ee12..fd6f2ce6384 100644
--- a/graphics/libungif/Makefile
+++ b/graphics/libungif/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2003/04/14 15:02:09 wilfried Exp $
+# $OpenBSD: Makefile,v 1.5 2003/08/21 14:46:52 naddy Exp $
 
 COMMENT=	"tools and library routines for working with GIF images"
 
@@ -38,7 +38,7 @@ post-install:
 		ln -sf $$f $$g; \
 	done && \
 	sed -e s#libungif#libgif#g libungif.la > libgif.la && \
-	chown root:bin libgif.la && \
+	chown ${LIBOWN}:${LIBGRP} libgif.la && \
 	chmod 755 libgif.la
 	${INSTALL_DATA_DIR} ${DOCSDIR}
 	cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
diff --git a/graphics/libungif/pkg/DESCR b/graphics/libungif/pkg/DESCR
index 2cb0d3cb6ae..00d3baf5f70 100644
--- a/graphics/libungif/pkg/DESCR
+++ b/graphics/libungif/pkg/DESCR
@@ -3,5 +3,3 @@ algorithm that does not use LZW compression.)
 
 See the ${PREFIX}/share/doc/libungif directory for more information
 on libungif's capabilities.
-
-WWW: ${HOMEPAGE}
diff --git a/lang/pm3/Makefile b/lang/pm3/Makefile
index 1ad1b1b2de1..f7b6a55f971 100644
--- a/lang/pm3/Makefile
+++ b/lang/pm3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2003/05/11 22:42:32 naddy Exp $
+# $OpenBSD: Makefile,v 1.5 2003/08/21 14:46:52 naddy Exp $
 
 CATEGORIES=	lang
 ONLY_FOR_ARCHS=	i386
@@ -37,7 +37,7 @@ PATCH_DIST_STRIP=-p1
 WRKINST=${WRKDIST}/binaries/OpenBSD_386
 
 do-install:
-	chown -R root:bin ${WRKINST}
+	chown -R ${LIBOWN}:${LIBGRP} ${WRKINST}
 	-cd ${PREFIX}/pm3/bin && strip *
 
 M3ARCH=OpenBSD_386
diff --git a/lang/pm3/pkg/DESCR b/lang/pm3/pkg/DESCR
index 9354c2714e1..fb10ca1fb61 100644
--- a/lang/pm3/pkg/DESCR
+++ b/lang/pm3/pkg/DESCR
@@ -6,5 +6,3 @@ enhancements.
 
 Please read "${PREFIX}/share/pm3/COPYRIGHT" for the DEC copyright
 notice.
-
-WWW: ${HOMEPAGE}
diff --git a/net/samba/stable/Makefile b/net/samba/stable/Makefile
index 1f5cc0b8a2d..088ac85b8ad 100644
--- a/net/samba/stable/Makefile
+++ b/net/samba/stable/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2003/06/28 22:14:45 jolan Exp $
+# $OpenBSD: Makefile,v 1.20 2003/08/21 14:46:52 naddy Exp $
 
 COMMENT=	"SMB and CIFS client and server for UNIX"
 
@@ -76,7 +76,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/samba/textdocs
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/samba
 	@cp -R ${WRKSRC}/../examples/* ${PREFIX}/share/examples/samba
-	@chown -R root:bin ${PREFIX}/share/examples/samba
+	@chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/samba
 	${INSTALL_DATA} ${FILESDIR}/README.OpenBSD ${PREFIX}/share/doc/samba
 	@for i in ${SAMBA_DOCS}; do \
 	 ${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba ;	\
@@ -94,7 +94,7 @@ post-install:
 	 ${WRKSRC}/../examples/smb.conf.default > ${SAMPLE_CONFIG}
 	${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/script/convert_smbpasswd ${PREFIX}/bin
-	@chown root:bin ${PREFIX}/bin/smbpasswd
+	@chown ${BINOWN}:${BINGRP} ${PREFIX}/bin/smbpasswd
 	@chmod 111 ${PREFIX}/bin/smbpasswd
 
 .include <bsd.port.mk>
diff --git a/net/samba/stable/pkg/DESCR b/net/samba/stable/pkg/DESCR
index 1c0d429e153..f82007c40c0 100644
--- a/net/samba/stable/pkg/DESCR
+++ b/net/samba/stable/pkg/DESCR
@@ -8,5 +8,3 @@ or UNIX printers as if they were local printers.
 
 Some of the most popular Lan Manager compatible clients include Lan
 Manager itself, Windows for Workgroups, OS/2 and Windows NT.
-
-WWW: ${HOMEPAGE}