summaryrefslogtreecommitdiff
path: root/polish
diff options
context:
space:
mode:
authorNiclas Zeising <zeising@FreeBSD.org>2013-05-25 14:37:02 +0000
committerNiclas Zeising <zeising@FreeBSD.org>2013-05-25 14:37:02 +0000
commit92ea0d614b10bd99ce43a611721c7c4003cd79a5 (patch)
treecf13f962932aab3646f0af684b2923c4e0f0825b /polish
parent- Unbreak build when devel/libsysinfo is installed (diff)
The FreeBSD x11 team proudly presents
an zeising, kwm, miwi, bapt, eadler production: Xorg 7.7 Starring: xserver 1.12.4 (new xorg only) Mesa 8.0.4, including libGL, libGLU and dri (new xorg only) libX11 1.5.0 libxcb 1.9 libdrm 2.4.42 (new xorg only) freeglut 2.8.1 Also starring: Updates to drivers and other libraries and utilities Additional notes: Change pkgconf to be a build dependency. Add a new USE_XORG, xcb, to depend on libxcb and update all ports to use this. Trim makefile headers. Take maintanership of x11/xcb-proto, ok'd by ashish. If you are running WITH_NEW_XORG=, you need to rebuild all installed drivers, see UPDATING for more information. Various fixes to make ports compile. PR: ports/177942 Exp-run by: miwi Approved by: portmgr (miwi) Thanks to all who helped testing!
Notes
Notes: svn path=/head/; revision=319055
Diffstat (limited to 'polish')
-rw-r--r--polish/kadu/Makefile5
-rw-r--r--polish/qnapi/Makefile3
2 files changed, 3 insertions, 5 deletions
diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile
index 93b63c1a7f62..aaf1332c343f 100644
--- a/polish/kadu/Makefile
+++ b/polish/kadu/Makefile
@@ -33,8 +33,7 @@ LIB_DEPENDS= mpdclient:${PORTSDIR}/audio/libmpdclient \
qzeitgeist:${PORTSDIR}/sysutils/qzeitgeist \
enchant:${PORTSDIR}/textproc/enchant \
expat:${PORTSDIR}/textproc/expat2 \
- fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
- xcb:${PORTSDIR}/x11/libxcb
+ fontconfig:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
# TODO enable devel/libexecinfo
# TODO ntrack and ntrack-qt (needs porting) ?
@@ -45,7 +44,7 @@ GG7_EMOTS_DISTFILE= dodatkowe_emoty_GG7.tar.gz
USE_BZIP2= yes
USES= cmake pkgconfig gettext iconv
-USE_XORG= ice sm x11 xau xdmcp xext xfixes xrender xscrnsaver
+USE_XORG= ice sm x11 xau xcb xdmcp xext xfixes xrender xscrnsaver
CMAKE_ARGS= -DKADU_VERSION:STRING="${DISTVERSION}" -DWITH_ENCHANT=ON
# Setting KADU_VERSION disables git invocation
MAKE_JOBS_SAFE= yes
diff --git a/polish/qnapi/Makefile b/polish/qnapi/Makefile
index 99ff9d4e7d03..2bf5428c3def 100644
--- a/polish/qnapi/Makefile
+++ b/polish/qnapi/Makefile
@@ -17,12 +17,11 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
png15:${PORTSDIR}/graphics/png \
freetype:${PORTSDIR}/print/freetype2 \
expat:${PORTSDIR}/textproc/expat2 \
- xcb:${PORTSDIR}/x11/libxcb \
fontconfig:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS= 7z:${PORTSDIR}/archivers/p7zip
USES= gettext iconv
-USE_XORG= ice sm x11 xau xdmcp xext xrender
+USE_XORG= ice sm x11 xau xcb xdmcp xext xrender
USE_QT4= corelib gui network xml qmake_build moc_build uic_build rcc_build
USE_KDE4= kdehier
QMAKE_ARGS= PREFIX=${PREFIX} KDE4_PREFIX=${KDE4_PREFIX}