3 files changed, 18 insertions, 14 deletions

diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index f51e8aa7e74c..2ac1db72d746 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -33,7 +33,6 @@ SCRIPTS_ENV+=	USE_NMH=YES
 # full mime support needs mmencode/mmdecode from metamail
 RUN_DEPENDS+=	mmencode:${PORTSDIR}/mail/metamail
 
-NO_STAGE=	yes
 # Additionally, exmh will use the following ports if present:
 # lang/expect
 # textproc/glimpse
@@ -45,8 +44,6 @@ NO_STAGE=	yes
 
 PLIST_SUB=	EXMH_VERSION=${PORTVERSION}
 
-MAN1=		exmh.1
-
 .if defined(JAPANESE_EXMH)
 do-build:
 	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} TCLSH=${TCLSH} \
@@ -60,7 +57,7 @@ do-build:
 .endif
 
 do-install:
-	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} \
+	@cd ${WRKSRC} && ${SETENV} PREFIX=${STAGEDIR}${PREFIX} \
 		WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/install
 
 
diff --git a/mail/exmh2/pkg-plist b/mail/exmh2/pkg-plist
index 2d1901274b2a..a7113685ac97 100644
--- a/mail/exmh2/pkg-plist
+++ b/mail/exmh2/pkg-plist
@@ -1,9 +1,15 @@
+@mode 555
+@owner bin
+@group bin
 bin/exmh
 bin/exmh-async
 bin/exmh-bg
 bin/exmh-strip
 bin/ftp.expect
 bin/inc.expect
+@mode 444
+@owner bin
+@group bin
 lib/exmh-%%EXMH_VERSION%%/PgpDecryptExpect
 lib/exmh-%%EXMH_VERSION%%/addr.tcl
 lib/exmh-%%EXMH_VERSION%%/aliases.tcl
@@ -219,6 +225,7 @@ lib/exmh-%%EXMH_VERSION%%/widgetText.tcl
 lib/exmh-%%EXMH_VERSION%%/widgets.tcl
 lib/exmh-%%EXMH_VERSION%%/xns.tcl
 lib/exmh-%%EXMH_VERSION%%/xnsgetmail.exp
+man/man1/exmh.1.gz
 @dirrm lib/exmh-%%EXMH_VERSION%%/bitmaps
 @dirrm lib/exmh-%%EXMH_VERSION%%/html
 @dirrm lib/exmh-%%EXMH_VERSION%%
diff --git a/mail/exmh2/scripts/install b/mail/exmh2/scripts/install
index bc2417570faa..1bf11895d41e 100644
--- a/mail/exmh2/scripts/install
+++ b/mail/exmh2/scripts/install
@@ -8,14 +8,14 @@ VERSION="`sed -ne 's/^set vers \(.*\)/\1/p' ${WRKSRC}/exmh.install`"
 # Rename while installing..
 for i in exmh
 do
-	echo "install -c -o bin -g bin -m 444 $i.l ${PREFIX}/man/man1/$i.1"
-	install -c -o bin -g bin -m 444 $i.l ${PREFIX}/man/man1/$i.1
+	echo "install -c $i.l ${PREFIX}/man/man1/$i.1"
+	install -c $i.l ${PREFIX}/man/man1/$i.1
 done
 
 BINS="exmh-async exmh-bg exmh-strip exmh ftp.expect inc.expect"
 
-echo "install -c -o bin -g bin -m 755 ${BINS} ${PREFIX}/bin"
-install -c -o bin -g bin -m 755 ${BINS} ${PREFIX}/bin
+echo "install -c ${BINS} ${PREFIX}/bin"
+install -c ${BINS} ${PREFIX}/bin
 
 if [ ! -d ${PREFIX}/lib/exmh-${VERSION} ]
 then
@@ -25,8 +25,8 @@ fi
 
 LIBFILES='lib/*.tcl lib/*.bitmap lib/*.gif lib/*.ppm lib/help.* lib/tclIndex lib/app-defaults lib/app-defaults-* lib/*.mask lib/*.exp lib/mime.types lib/*.au lib/PgpDecryptExpect'
 
-echo "install -c -o bin -g bin -m 444 ${LIBFILES} ${PREFIX}/lib/exmh-${VERSION}"
-install -c -o bin -g bin -m 444 ${LIBFILES} ${PREFIX}/lib/exmh-${VERSION}
+echo "install -c ${LIBFILES} ${PREFIX}/lib/exmh-${VERSION}"
+install -c ${LIBFILES} ${PREFIX}/lib/exmh-${VERSION}
 
 if [ ! -d ${PREFIX}/lib/exmh-${VERSION}/html ]
 then
@@ -34,8 +34,8 @@ then
 	mkdir ${PREFIX}/lib/exmh-${VERSION}/html
 fi
 
-echo "install -c -o bin -g bin -m 444 lib/html/* lib/html/*.gif ${PREFIX}/lib/exmh-${VERSION}/html"
-install -c -o bin -g bin -m 444 lib/html/*.html lib/html/*.gif ${PREFIX}/lib/exmh-${VERSION}/html
+echo "install -c lib/html/* lib/html/*.gif ${PREFIX}/lib/exmh-${VERSION}/html"
+install -c lib/html/*.html lib/html/*.gif ${PREFIX}/lib/exmh-${VERSION}/html
 
 if [ ! -d ${PREFIX}/lib/exmh-${VERSION}/bitmaps ]
 then
@@ -43,7 +43,7 @@ then
 	mkdir ${PREFIX}/lib/exmh-${VERSION}/bitmaps
 fi
 
-echo "install -c -o bin -g bin -m 444 lib/bitmaps/bitmaps.defaults lib/bitmaps/*.xbm ${PREFIX}/lib/exmh-${VERSION}/bitmaps"
-install -c -o bin -g bin -m 444 lib/bitmaps/bitmaps.defaults lib/bitmaps/*.xbm ${PREFIX}/lib/exmh-${VERSION}/bitmaps
+echo "install -c lib/bitmaps/bitmaps.defaults lib/bitmaps/*.xbm ${PREFIX}/lib/exmh-${VERSION}/bitmaps"
+install -c lib/bitmaps/bitmaps.defaults lib/bitmaps/*.xbm ${PREFIX}/lib/exmh-${VERSION}/bitmaps