Date: Sat, 16 Aug 2014 16:15:20 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365098 - head/x11-servers/xephyr Message-ID: <201408161615.s7GGFK7L027048@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Sat Aug 16 16:15:19 2014 New Revision: 365098 URL: http://svnweb.freebsd.org/changeset/ports/365098 QAT: https://qat.redports.org/buildarchive/r365098/ Log: Because this is a slave port, it cannot load bsd.port.pre.mk before defining the do-install target. This means that the test for .if defined(WITH_NEW_XORG) will always be false unless it's actually set in make.conf. WITH_NEW_XORG is automatically set for OSVERSION > 100704, but the port can't access that. Apply a really inelegant kludge that simply tries to install the manpage from both possible places. One will fail, and one will succeed. Modified: head/x11-servers/xephyr/Makefile Modified: head/x11-servers/xephyr/Makefile ============================================================================== --- head/x11-servers/xephyr/Makefile Sat Aug 16 16:13:22 2014 (r365097) +++ head/x11-servers/xephyr/Makefile Sat Aug 16 16:15:19 2014 (r365098) @@ -23,10 +23,10 @@ PLIST_FILES= bin/Xephyr man/man1/Xephyr. do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hw/kdrive/ephyr/Xephyr ${STAGEDIR}${PREFIX}/bin/ -.if defined(WITH_NEW_XORG) - ${INSTALL_MAN} ${WRKSRC}/hw/kdrive/ephyr/man/Xephyr.1 ${STAGEDIR}${PREFIX}/man/man1/ -.else - ${INSTALL_MAN} ${WRKSRC}/hw/kdrive/ephyr/Xephyr.1 ${STAGEDIR}${PREFIX}/man/man1/ -.endif +#.if defined(WITH_NEW_XORG) + -${INSTALL_MAN} ${WRKSRC}/hw/kdrive/ephyr/man/Xephyr.1 ${STAGEDIR}${PREFIX}/man/man1/ +#.else + -${INSTALL_MAN} ${WRKSRC}/hw/kdrive/ephyr/Xephyr.1 ${STAGEDIR}${PREFIX}/man/man1/ +#.endif .include "${MASTERDIR}/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408161615.s7GGFK7L027048>