diff options
| author | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-03-19 20:35:55 +0800 |
|---|---|---|
| committer | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-03-19 20:35:55 +0800 |
| commit | 62672aeeb60670e4e35e74f33ab653558a58a406 (patch) | |
| tree | d54a69386f693b133f099d10ba249cfeff0c954f | |
| parent | 2981e876e8e19aeb6c12f9af164d4eeea4334f12 (diff) | |
| download | xorg-devel-ports-62672aeeb60670e4e35e74f33ab653558a58a406.tar.gz xorg-devel-ports-62672aeeb60670e4e35e74f33ab653558a58a406.tar.zst xorg-devel-ports-62672aeeb60670e4e35e74f33ab653558a58a406.zip | |
Merge r741 and r742 by eadler:
OptionsNG
Remove alpha support
Forgot this part too
git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/xorg-7.7@749 058c260c-8361-11dd-a0ac-aa2bafec7d09
| -rw-r--r-- | x11/libxcb/Makefile | 4 | ||||
| -rw-r--r-- | x11/xorg/Makefile | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile index 1606f81..27a6564 100644 --- a/x11/libxcb/Makefile +++ b/x11/libxcb/Makefile @@ -44,8 +44,10 @@ XPROTO_LIBS= -L${LOCALBASE}/lib .include "${.CURDIR}/manpages" +.include <bsd.port.options.mk> + post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MAKE} -C ${WRKSRC}/doc ${INSTALL_TARGET} .endif diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile index 5f66452..ab1da96 100644 --- a/x11/xorg/Makefile +++ b/x11/xorg/Makefile @@ -19,8 +19,10 @@ RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \ ${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes +.include <bsd.port.options.mk> + # doc -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} RUN_DEPENDS+= ${LOCALBASE}/share/doc/xorg-docs/README.xml:${PORTSDIR}/x11/xorg-docs .endif @@ -53,8 +55,4 @@ DEPENDS_TARGET="package" .endif .endif -.if ${ARCH} != "alpha" -RUN_DEPENDS+= ${LOCALBASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server -.endif - .include <bsd.port.post.mk> |