help people not mix up X11 with xenocara, by making sure they link against

X11 >= 10, and bump those major numbers accordingly, so that bug-reports
will get easier to process.

(artificial `flag day' as discussed with deraadt@)
This commit is contained in:
espie 2007-03-26 21:22:13 +00:00
parent c6d84b2cac
commit 30059c7ebb
9 changed files with 30 additions and 22 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.49 2007/01/21 14:47:58 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.50 2007/03/26 21:22:13 espie Exp $
# Uses pthreads
COMMENT= "cross-platform multimedia library"
VERSION= 1.2.9
DISTNAME= SDL-${VERSION}
PKGNAME= ${DISTNAME:L}p2
PKGNAME= ${DISTNAME:L}p3
CATEGORIES= devel
HOMEPAGE= http://www.libsdl.org/
@ -34,7 +34,7 @@ AUTOMAKE_VERSION= 1.9
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= autoconf
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/test
SHARED_LIBS= SDL 6.0
SHARED_LIBS= SDL 7.0
CONFIGURE_ENV+= X11BASE="${X11BASE}" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
@ -100,7 +100,7 @@ CONFIGURE_ARGS+= --without-x \
--disable-video-x11
.else
USE_X11= Yes
WANTLIB+= X11 Xext
WANTLIB+= X11.>=10 Xext
.endif
NO_REGRESS= Yes

View File

@ -4,5 +4,7 @@ RMD160 (SDL-1.2.9.tar.gz) = 9faeeda9cf8f649a2b506e9db7c5cedb4512cfe7
RMD160 (patch-libsd1.2.7-libcaca0.9.diff) = e74a1ece864577b6fdaf8516a9e4b400958e575b
SHA1 (SDL-1.2.9.tar.gz) = 8140de00e73ccdbdee196fa8fd9952ddb3cc75f1
SHA1 (patch-libsd1.2.7-libcaca0.9.diff) = 4e4d3f5f0286e6960e0e5cdad2f90c54997a6c04
SHA256 (SDL-1.2.9.tar.gz) = d5a168968051536641ab5a3ba5fc234383511c77a8bc5ceb8bed619bdd42e5f9
SHA256 (patch-libsd1.2.7-libcaca0.9.diff) = 7e77f529896a05f71c4874ed8d1f67a55b6df7bea2db316b0a5c4dfde8e8012f
SIZE (SDL-1.2.9.tar.gz) = 2688179
SIZE (patch-libsd1.2.7-libcaca0.9.diff) = 28259

View File

@ -1,17 +1,17 @@
# $OpenBSD: Makefile,v 1.10 2007/03/18 14:48:45 kurt Exp $
# $OpenBSD: Makefile,v 1.11 2007/03/26 21:22:13 espie Exp $
COMMENT= "vector graphics library"
DISTNAME= cairo-1.2.6
PKGNAME= ${DISTNAME}p0
SHARED_LIBS += cairo 5.0 # .11.3
PKGNAME= ${DISTNAME}p1
SHARED_LIBS += cairo 6.0 # .11.3
CATEGORIES= graphics
HOMEPAGE= http://cairographics.org/introduction
MAINTAINER= Eric Faurot <eric.faurot@gmail.com>
WANTLIB= ICE SM X11 Xext Xrender freetype fontconfig m z
WANTLIB= ICE SM X11.>=10 Xext Xrender freetype fontconfig m z
# LGPL
PERMIT_PACKAGE_CDROM= Yes

View File

@ -1,4 +1,5 @@
MD5 (cairo-1.2.6.tar.gz) = 487b3d7515752fe57f780d0fd707b01a
RMD160 (cairo-1.2.6.tar.gz) = 4469a661b294e342ee77e726c1cefccd4837ae2e
SHA1 (cairo-1.2.6.tar.gz) = b86b4017a9abd565ef11c72b7faee9082a04118f
SHA256 (cairo-1.2.6.tar.gz) = 7d36449c9a05c2c9b44248b10e9f82f0bca99f30e24848435e65aca77c28b3f9
SIZE (cairo-1.2.6.tar.gz) = 2973689

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.62 2006/09/18 10:21:48 espie Exp $
# $OpenBSD: Makefile,v 1.63 2007/03/26 21:22:13 espie Exp $
COMMENT= "General Toolkit for X11 GUI"
DISTNAME= gtk+-1.2.10
PKGNAME= ${DISTNAME}p4
SHARED_LIBS= gdk 2.0 \
gtk 2.0
PKGNAME= ${DISTNAME}p5
SHARED_LIBS= gdk 3.0 \
gtk 3.0
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/1.2/}
@ -20,7 +20,7 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext Xi m
WANTLIB= X11.>=10 Xext Xi m
USE_X11= Yes
USE_LIBTOOL= Yes

View File

@ -1,4 +1,5 @@
MD5 (gtk+-1.2.10.tar.gz) = 4d5cb2fc7fb7830e4af9747a36bfce20
RMD160 (gtk+-1.2.10.tar.gz) = 9b38310d2768e947c4f6173db009243dd11db288
SHA1 (gtk+-1.2.10.tar.gz) = a5adcb909257da01ae4d4761e1d41081d06e4d7c
SHA256 (gtk+-1.2.10.tar.gz) = 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34
SIZE (gtk+-1.2.10.tar.gz) = 2868322

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.73 2007/02/17 18:59:04 espie Exp $
# $OpenBSD: Makefile,v 1.74 2007/03/26 21:22:13 espie Exp $
# $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $
COMMENT-main= "C++ X11 GUI toolkit"
@ -12,10 +12,10 @@ PKGNAME= qt3-${VERSION}
PKGNAME-mysql= qt3-mysql-${VERSION}
PKGNAME-postgresql= qt3-postgresql-${VERSION}
PKGNAME-examples= qt3-examples-${VERSION}
PKGNAME-main= qt3-mt-${VERSION}p1
PKGNAME-main= qt3-mt-${VERSION}p2
FULLPKGNAME-html= qt3-html-${VERSION}
PKGNAME-sqlite2= qt3-sqlite2-${VERSION}
SHARED_LIBS= qt-mt 30.3 \
SHARED_LIBS= qt-mt 31.0 \
qui 2.0 \
qui-mt 2.0
@ -138,7 +138,8 @@ CONFIGURE_ARGS+= -plugin-sql-sqlite
LIB_DEPENDS= png.>=2::graphics/png \
mng.>=1::graphics/libmng
WANTLIB= GL GLU ICE SM X11 Xcursor Xext Xft Xi Xinerama Xmu \
WANTLIB= GL GLU ICE SM X11.>=10 Xcursor Xext Xft Xi Xinerama \
Xmu \
Xrandr Xrender fontconfig freetype jpeg lcms m z

View File

@ -4,5 +4,7 @@ RMD160 (qt-x11-free-3.3.7.tar.gz) = bc786cf808fe152d233c9ba47ae1f299788d32e8
RMD160 (qt-x11-immodule-unified-qt3.3.7-20061229.diff.bz2) = ecfddee896e170294f6f48dd185568c332a3be14
SHA1 (qt-x11-free-3.3.7.tar.gz) = f3276f316647dbbd67ea4e131d794bf5bff5af2b
SHA1 (qt-x11-immodule-unified-qt3.3.7-20061229.diff.bz2) = ff750959322db0320990c03aa02fc57183b708db
SHA256 (qt-x11-free-3.3.7.tar.gz) = ad30725e66daef45cea627a8a904ed899013438d1d91bdbe5f35805f98ef9583
SHA256 (qt-x11-immodule-unified-qt3.3.7-20061229.diff.bz2) = dc57d5f131ab1331b89c17a3a303a018442770bc06e70b0207c983cb5cfaadef
SIZE (qt-x11-free-3.3.7.tar.gz) = 17558991
SIZE (qt-x11-immodule-unified-qt3.3.7-20061229.diff.bz2) = 99876

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.33 2007/03/17 17:58:16 espie Exp $
# $OpenBSD: Makefile,v 1.34 2007/03/26 21:22:13 espie Exp $
COMMENT-main= "C++ X11 GUI toolkit"
COMMENT-examples= "examples for qt4"
@ -8,7 +8,7 @@ COMMENT-mysql= "MySQL plugin for qt4"
COMMENT-sqlite2= "sqlite2 plugin for qt4"
COMMENT-sqlite= "sqlite plugin for qt4"
PKGNAME= qt4-${VERSION}
PKGNAME= qt4-${VERSION}p0
PKGNAME-mysql= qt4-mysql-${VERSION}
PKGNAME-postgresql= qt4-postgresql-${VERSION}
PKGNAME-examples= qt4-examples-${VERSION}
@ -16,11 +16,11 @@ PKGNAME-sqlite2= qt4-sqlite2-${VERSION}
PKGNAME-sqlite= qt4-sqlite-${VERSION}
PKGNAME-main= qt4-${VERSION}
FULLPKGNAME-html= qt4-html-${VERSION}
SHARED_LIBS= Qt3Support 6.2 \
SHARED_LIBS= Qt3Support 7.0 \
QtCore 6.2 \
QtDesigner 6.1 \
QtDesignerComponents 6.1 \
QtGui 6.3 \
QtGui 7.0 \
QtNetwork 6.2 \
QtOpenGL 6.2 \
QtSql 6.2 \
@ -127,7 +127,8 @@ LIB_DEPENDS= glib-2.0,gthread-2.0::devel/glib2
WANTLIB= iconv intl
commonWANTLIB= ICE Xrender c GLU SM freetype pthread Xrandr Xinerama \
stdc++ Xcursor Xext GL Xi m X11 z fontconfig Xfixes
stdc++ Xcursor Xext GL Xi m X11.>=10 z fontconfig \
Xfixes
commonLIB_DEPENDS= png.>=2::graphics/png \
dbus-1::x11/dbus