From owner-svn-ports-all@FreeBSD.ORG  Fri Jun 27 04:53:38 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8468BB2B;
 Fri, 27 Jun 2014 04:53:38 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7258E2EF8;
 Fri, 27 Jun 2014 04:53:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5R4rcC0040737;
 Fri, 27 Jun 2014 04:53:38 GMT (envelope-from cy@svn.freebsd.org)
Received: (from cy@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5R4rc8v040736;
 Fri, 27 Jun 2014 04:53:38 GMT (envelope-from cy@svn.freebsd.org)
Message-Id: <201406270453.s5R4rc8v040736@svn.freebsd.org>
From: Cy Schubert <cy@FreeBSD.org>
Date: Fri, 27 Jun 2014 04:53:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r359453 - head/x11-toolkits/xview
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Jun 2014 04:53:38 -0000

Author: cy
Date: Fri Jun 27 04:53:37 2014
New Revision: 359453
URL: http://svnweb.freebsd.org/changeset/ports/359453
QAT: https://qat.redports.org/buildarchive/r359453/

Log:
  Fix build errors related to stage and pkg-plist consistency.
  
  Convert NOPORTDOCS to option.

Modified:
  head/x11-toolkits/xview/Makefile

Modified: head/x11-toolkits/xview/Makefile
==============================================================================
--- head/x11-toolkits/xview/Makefile	Fri Jun 27 04:38:31 2014	(r359452)
+++ head/x11-toolkits/xview/Makefile	Fri Jun 27 04:53:37 2014	(r359453)
@@ -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}