diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index d252673fb14..43d0b7a27c8 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2005/08/09 14:37:58 kurt Exp $
+# $OpenBSD: Makefile,v 1.6 2005/09/25 09:22:49 espie Exp $
 
 COMMENT=        "java equivalent to make"
 
 DISTNAME=	apache-ant-1.6.5
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	devel
 
 HOMEPAGE=	http://ant.apache.org/
@@ -41,6 +42,7 @@ do-install:
 	    ${INSTALL_SCRIPT} ant antRun runant.pl ${PREFIX}/bin
 	@${INSTALL_DATA_DIR} ${ANTDOCS}
 	@cp -Rp ${WRKDIST}/docs/* ${ANTDOCS}
+	@chown -R ${SHAREOWN}:${SHAREGRP} ${ANTDOCS}
 	@cd ${WRKDIST} && ${INSTALL_DATA} ${TXT} ${ANTDOCS}
 	@${INSTALL_DATA_DIR} ${PREFIX}/lib/java/ant
 	@cd ${WRKDIST}/lib && ${INSTALL_DATA} *.jar ${PREFIX}/lib/java/ant
diff --git a/games/amph/Makefile b/games/amph/Makefile
index e0b425301d6..3a788cb93fc 100644
--- a/games/amph/Makefile
+++ b/games/amph/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2004/11/28 22:41:15 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2005/09/25 09:22:49 espie Exp $
 
 COMMENT=	"jump'n run game with unique video effects"
 
 VERSION=	0.8.10
 DVERSION=	0.8.6
 DISTNAME=	amphetamine-${VERSION}
-PKGNAME=	amph-${VERSION}
+PKGNAME=	amph-${VERSION}p0
 CATEGORIES=	games x11
 EXTRACT_SUFX=	.tar.bz2
 
@@ -37,6 +37,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/amph
 	${INSTALL_DATA_DIR} ${PREFIX}/share/amph
 	@cp -Rp ${WRKDIR}/amph/* ${PREFIX}/share/amph/
+	@chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/amph
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/amph
 
 .include <bsd.port.mk>
diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index fc69b0d949e..7d3f80b6b8a 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2005/06/30 04:46:05 avsm Exp $
+# $OpenBSD: Makefile,v 1.5 2005/09/25 09:22:49 espie Exp $
 
 COMMENT=	"image manipulation functions for Objective Caml"
 CATEGORIES=	graphics
 
 DISTNAME=	camlimages-2.2.0
+PKGNAME=	${DISTNAME}p0
 EXTRACT_SUFX=	.tgz
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/
 
@@ -25,7 +26,7 @@ WRKDIST=	${WRKDIR}/camlimages-2.2
 EXAMPLES_DIR=	${PREFIX}/share/examples/camlimages
 USE_GMAKE=	Yes
 
-CAMLDIR=	${DESTDIR}/${PREFIX}/lib/ocaml
+CAMLDIR=	${DESTDIR}/${TRUEPREFIX}/lib/ocaml
 MAKE_FLAGS=	CFLAGS="${CFLAGS} -I${X11BASE}/include/freetype2 \
 		-I${X11BASE}/include -I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/libpng" LDFLAGS="-L${LOCALBASE}/lib"
@@ -42,6 +43,7 @@ pre-install:
 	${INSTALL_DATA_DIR} ${OCAML_LIBDIR}
 
 post-install:
+	@chown -R ${SHAREOWN}:${SHAREGRP} ${CAMLDIR}
 	@cp -R ${WRKSRC}/examples/ ${EXAMPLES_DIR}
 
 .include <bsd.port.mk>
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index 9ffce086cc4..74a01a53e4d 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2004/06/26 16:55:41 naddy Exp $
+# $OpenBSD: Makefile,v 1.4 2005/09/25 09:22:49 espie Exp $
 
 COMMENT=	"extensible emacs interface for TeX"
 
 DISTNAME=	auctex-11.14
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	print
 
 HOMEPAGE=	http://www.gnu.org/software/auctex/
@@ -17,10 +18,13 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${MASTER_SITE_GNU:=auctex/11.14/}
 
-FAKE_FLAGS=	lispdir=${DESTDIR}/${PREFIX}/share/emacs/site-lisp
+FAKE_FLAGS=	lispdir=${DESTDIR}${PREFIX}/share/emacs/site-lisp
 
 RUN_DEPENDS=	:emacs-21.*:editors/emacs21 \
 		:teTeX_base-*:print/teTeX/base
 BUILD_DEPENDS=	:emacs-21.*:editors/emacs21
 
+post-install:
+	@chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/emacs/site-lisp/auctex
+
 .include <bsd.port.mk>
diff --git a/security/crack/Makefile b/security/crack/Makefile
index 8e6d80ee879..77e62c23c35 100644
--- a/security/crack/Makefile
+++ b/security/crack/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.23 2004/12/27 13:28:33 alek Exp $
+# $OpenBSD: Makefile,v 1.24 2005/09/25 09:22:49 espie Exp $
 # Original from: Ejovi Nuwere <ejovi@ejovi.net>
 
 COMMENT=	'sensible unix password cracker'
 
 DISTNAME=	crack5.0
-PKGNAME=	crack-5.0p0
+PKGNAME=	crack-5.0p1
 CATEGORIES=	security
 
 HOMEPAGE=	http://www.crypticide.org/users/alecm/
@@ -48,6 +48,7 @@ do-install:
 	@rm -f ${WRKSRC}/Run/*
 	@${INSTALL_SCRIPT} ${FILESDIR}/openbsd2spf ${WRKSRC}/scripts
 	@(cd ${WRKSRC} ; tar cf - . | (cd ${PREFIX}/crack; tar xfBp -))
+	@chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/crack
 	${INSTALL_DATA} ${FILESDIR}/README.OpenBSD ${PREFIX}/crack
 	@perl -pi -e "s,%%TRUEPREFIX%%,${TRUEPREFIX}," ${PREFIX}/crack/README.OpenBSD
 	@perl -pi -e "s,^make.*,# make removed for runtime," ${PREFIX}/crack/Crack