Fix build errors related to stage and pkg-plist consistency.

Convert NOPORTDOCS to option.

1 files changed, 9 insertions, 4 deletions

diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile
index b01a6e625e88..880f8587e4f9 100644
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@@ -29,13 +29,14 @@ MAKE_ENV+=	IMAKEINCLUDE=${IMAKEINCLUDE}
 ALL_TARGET=	World
 SUB_FILES=	pkg-message
 CFLAGS+=	-Wno-return-type
+DESTDIRNAME=	NONEXISTENT
 
 X11BASE2FIX=	clients/olwmslave/help_file.c	lib/libxview/help/help_file.c	\
 		lib/libxview/misc/gettext.h	lib/libxview/textsw/txt_e_menu.c
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
 
-IMAKECPPFLAGS+=	-DXVDestDir=${STAGEDIR}${PREFIX}
+.include <bsd.port.pre.mk>
 
 .if ${OSVERSION} > 800089
 CFLAGS+=	-DCOMPAT_43TTY
@@ -53,7 +54,7 @@ pre-configure:
 	@${REINPLACE_CMD} -e "s/-DCOMPAT_43TTY//" \
 	  ${WRKSRC}/config/XView.tmpl
 .endif
-	@${REINPLACE_CMD} -e 's+/usr/X11/+${LOCALBASE}/+g;' \
+	@${REINPLACE_CMD} -e 's+/usr/X11/+${PREFIX}/+g;' \
 	  ${WRKSRC}/clients/olwm/screen.c
 	${REINPLACE_CMD} -e 's+/usr/lib+${PREFIX}/lib+'	\
 		${X11BASE2FIX:C|^|${WRKSRC}/|}
@@ -63,8 +64,12 @@ pre-configure:
 	's|^#endif.*$$|#endif|;s|^#else.*$$|#else|;\
 	s|^/\*\*/#*|XCOMM |'
 
+pre-install:
+	@${FIND} ${WRKSRC} -type f -name Makefile | ${XARGS} ${REINPLACE_CMD} -e '/XVDESTDIR = /s+${PREFIX}+${STAGEDIR}${PREFIX}+'
+	@${FIND} ${WRKSRC}/config ${WRKSRC}/fonts -type f -name Makefile | ${XARGS} ${REINPLACE_CMD} -e '/PROJECTROOT = /!s+${PREFIX}+${STAGEDIR}${PREFIX}+g'
+
 post-install:
-.if !defined{NOPORTDOCS}
+.if ${PORT_OPTIONS:MDOCS}
 	@(cd ${WRKSRC}/doc; ${MAKE} install)
 .endif
 	@${CAT} ${PKGMESSAGE}