Date: Fri, 27 Jun 2014 04:53:38 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359453 - head/x11-toolkits/xview Message-ID: <201406270453.s5R4rc8v040736@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406270453.s5R4rc8v040736>