From c9bf57300dafbfb2bd5b019c20fca77960fe0c6d Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Sat, 16 Aug 2014 16:15:19 +0000 Subject: [PATCH] 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. --- x11-servers/xephyr/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/x11-servers/xephyr/Makefile b/x11-servers/xephyr/Makefile index 6b33cf0bb6d8..c5cc7d916ee9 100644 --- a/x11-servers/xephyr/Makefile +++ b/x11-servers/xephyr/Makefile @@ -23,10 +23,10 @@ PLIST_FILES= bin/Xephyr man/man1/Xephyr.1.gz 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"