10 files changed, 42 insertions, 29 deletions

diff --git a/sysutils/disktool/Makefile b/sysutils/disktool/Makefile
index 24fbff13da1b..8a7e9e5ebf6c 100644
--- a/sysutils/disktool/Makefile
+++ b/sysutils/disktool/Makefile
@@ -11,22 +11,20 @@ DISTNAME=	disktool-2.0c
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	XView sysadmin tool for monitoring diskfull situations
 
-LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
+LIB_DEPENDS=	libxview.so:${PORTSDIR}/x11-toolkits/xview
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 ALL_TARGET=	disktool
 
-MAN1=		disktool.1
-PLIST_FILES=	bin/disktool
+PLIST_FILES=	bin/disktool man/man1/disktool.1.gz
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/disktool ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/disktool ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/disktool.man \
-	${PREFIX}/man/man1/disktool.1
+		${STAGEDIR}${PREFIX}/man/man1/disktool.1
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/slingshot/Makefile b/x11-toolkits/slingshot/Makefile
index cf09882888f7..379af11c04c0 100644
--- a/x11-toolkits/slingshot/Makefile
+++ b/x11-toolkits/slingshot/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Supplemental Libraries to extend Xview
 
-LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
+LIB_DEPENDS=	libxview.so:${PORTSDIR}/x11-toolkits/xview
 
 WRKSRC=		${WRKDIR}/sspkg2.1
 USE_LDCONFIG=	yes
@@ -24,13 +24,17 @@ USES=		gmake
 MAKE_JOBS_UNSAFE=	yes
 MAKE_ENV=	OPENWINHOME=${LOCALBASE}
 
-NO_STAGE=	yes
+.include <bsd.port.pre.mk>
+
+IMAKECPPFLAGS+=	-DXVDestDir=${STAGEDIR}${PREFIX}
+MAKE_ARGS=	STAGEDIR=${STAGEDIR}
+
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.ps ${DOCSDIR}
-	${GZIP_CMD} ${DOCSDIR}/README ${DOCSDIR}/*.ps
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.ps ${STAGEDIR}${DOCSDIR}
+	${GZIP_CMD} ${STAGEDIR}${DOCSDIR}/README ${STAGEDIR}${DOCSDIR}/*.ps
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/slingshot/files/patch-aa b/x11-toolkits/slingshot/files/patch-aa
index 7902fdc3c825..43af6bca1a09 100644
--- a/x11-toolkits/slingshot/files/patch-aa
+++ b/x11-toolkits/slingshot/files/patch-aa
@@ -13,7 +13,7 @@
   #	@(#) Makefile 1.21 93/10/25 
   
   SSPKGHOME = 	.
-! INSTALL_DIR =	$(PREFIX)
+! INSTALL_DIR =	${STAGEDIR}$(PREFIX)
   TARFILE =	/home2/tmp/sspkgs-tar
   
   SRCDIR =	$(SSPKGHOME)/src
diff --git a/x11-toolkits/xview-clients/Makefile b/x11-toolkits/xview-clients/Makefile
index ce46bcd90d6a..2bee84e4ef3a 100644
--- a/x11-toolkits/xview-clients/Makefile
+++ b/x11-toolkits/xview-clients/Makefile
@@ -20,19 +20,18 @@ CONFLICTS=	props-1.0
 MAKE_JOBS_UNSAFE=	yes
 PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/x11-toolkits/xview:patch
 CONFIGURE_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/x11-toolkits/xview:configure
-LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
+LIB_DEPENDS=	libxview.so:${PORTSDIR}/x11-toolkits/xview
 
 USES=		imake
 USE_XORG=	x11 xext
 WRKSRC=		${WRKDIRPREFIX}${.CURDIR}/../xview/work/${DISTNAME}
 ALL_TARGET=	Clients
 
-MAN1=		clock.1 cmdtool.1 olwm.1 olwmslave.1 props.1 shelltool.1 \
-		textedit.1
-MANCOMPRESSED=	yes
+.include <bsd.port.pre.mk>
+
+IMAKECPPFLAGS+=	-DXVDestDir=${STAGEDIR}${PREFIX}
 
-NO_STAGE=	yes
 do-install:
 	@cd ${WRKSRC}/clients; ${MAKE} install install.man
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/xview-clients/pkg-plist b/x11-toolkits/xview-clients/pkg-plist
index 5f151652969a..137178060b87 100644
--- a/x11-toolkits/xview-clients/pkg-plist
+++ b/x11-toolkits/xview-clients/pkg-plist
@@ -5,6 +5,16 @@ bin/olwmslave
 bin/props
 bin/shelltool
 bin/textedit
+lib/help/clock.info
+lib/help/olwm.info
+lib/help/props.info
 lib/help/workspace.info
 lib/openwin-menu
 lib/openwin-menu-programs
+man/man1/clock.1.gz
+man/man1/cmdtool.1.gz
+man/man1/olwm.1.gz
+man/man1/olwmslave.1.gz
+man/man1/props.1.gz
+man/man1/shelltool.1.gz
+man/man1/textedit.1.gz
diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile
index 5b38665116bb..b01a6e625e88 100644
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@@ -30,14 +30,13 @@ ALL_TARGET=	World
 SUB_FILES=	pkg-message
 CFLAGS+=	-Wno-return-type
 
-MAN1=		XView.1
-
 X11BASE2FIX=	clients/olwmslave/help_file.c	lib/libxview/help/help_file.c	\
 		lib/libxview/misc/gettext.h	lib/libxview/textsw/txt_e_menu.c
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
+IMAKECPPFLAGS+=	-DXVDestDir=${STAGEDIR}${PREFIX}
+
 .if ${OSVERSION} > 800089
 CFLAGS+=	-DCOMPAT_43TTY
 .endif
diff --git a/x11-toolkits/xview/pkg-plist b/x11-toolkits/xview/pkg-plist
index 4ee47cf3e52a..f2e48e55deaa 100644
--- a/x11-toolkits/xview/pkg-plist
+++ b/x11-toolkits/xview/pkg-plist
@@ -701,6 +701,7 @@ lib/X11/fonts/olmisc/olgl19.pcf.gz
 lib/X11/fonts/olmisc/fonts.scale
 lib/X11/fonts/olmisc/fonts.dir
 lib/X11/fonts/olmisc/fonts.alias
+man/man1/XView.1.gz
 @dirrm lib/X11/fonts/olmisc
 %%PORTDOCS%%%%DOCSDIR%%/bugform
 %%PORTDOCS%%%%DOCSDIR%%/dnd_api.txt
diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile
index 7207685d3dd9..18a6d23fca0d 100644
--- a/x11-wm/olvwm/Makefile
+++ b/x11-wm/olvwm/Makefile
@@ -23,7 +23,7 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	OpenLook Virtual Window manager
 
-LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
+LIB_DEPENDS=	libxview.so:${PORTSDIR}/x11-toolkits/xview
 
 REINPLACE_ARGS= -i ""
 NO_WRKSUBDIR=	yes
@@ -32,7 +32,8 @@ USE_XORG=	xpm
 MAN1=		olvwm.1 olvwmrc.1
 XFREE86_HTML_MAN=	no
 
-NO_STAGE=	yes
+IMAKECPPFLAGS+=	-DXVDestDir=${STAGEDIR}${PREFIX}
+
 pre-configure:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \
 	's|^#endif.*$$|#endif|;s|^#else.*$$|#else|;\
diff --git a/x11-wm/olvwm/pkg-plist b/x11-wm/olvwm/pkg-plist
index 6be61568ad4d..d884008d8f2b 100644
--- a/x11-wm/olvwm/pkg-plist
+++ b/x11-wm/olvwm/pkg-plist
@@ -1,2 +1,4 @@
 bin/olvwm
 lib/help/olvwm.info
+man/man1/olvwm.1.gz
+man/man1/olvwmrc.1.gz
diff --git a/x11/props/Makefile b/x11/props/Makefile
index 0688756effed..19abcb3f1fe6 100644
--- a/x11/props/Makefile
+++ b/x11/props/Makefile
@@ -14,7 +14,7 @@ COMMENT=	The OpenLook props application
 
 CONFLICTS=	xview-clients-3.2.1.4.19*
 
-LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
+LIB_DEPENDS=	libxview.so:${PORTSDIR}/x11-toolkits/xview
 
 MAKE_JOBS_UNSAFE=	yes
 WRKSRC=		${WRKDIR}/props
@@ -22,9 +22,8 @@ USES=		imake
 USE_XORG=	x11 xext
 MAKE_ARGS=	INFOFILES=""
 
-NO_STAGE=	yes
 post-install:
-		${MKDIR} ${PREFIX}/lib/X11/locale/C/props; \
-		${INSTALL_DATA} ${WRKSRC}/C/* ${PREFIX}/lib/X11/locale/C/props
+		${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/locale/C/props; \
+		${INSTALL_DATA} ${WRKSRC}/C/* ${STAGEDIR}${PREFIX}/lib/X11/locale/C/props
 
 .include <bsd.port.mk>