mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

Because this is a slave port, it cannot load bsd.port.pre.mk before defining

Browse Source 
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.
This commit is contained in:
Adam Weinberger 2014-08-16 16:15:19 +00:00
parent aaf3970fbf
commit c9bf57300d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=365098
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
x11-servers/xephyr/Makefile
View File

@ -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"