diff options
| -rw-r--r-- | x11/qt3-libs/Makefile | 4 | ||||
| -rw-r--r-- | x11/qt3-libs/Makefile.common | 4 | ||||
| -rw-r--r-- | x11/qt3-libs/buildlink3.mk | 3 | ||||
| -rw-r--r-- | x11/qt3-libs/patches/patch-an | 32 |
4 files changed, 39 insertions, 4 deletions
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile index 08548430421..264e789d0a6 100644 --- a/x11/qt3-libs/Makefile +++ b/x11/qt3-libs/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.54 2006/06/09 08:07:46 abs Exp $ +# $NetBSD: Makefile,v 1.55 2006/07/26 13:30:24 joerg Exp $ PKGNAME= qt3-libs-${QTVERSION} -PKGREVISION= 1 +PKGREVISION= 2 MAINTAINER= adam@NetBSD.org COMMENT= C++ X GUI toolkit diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common index 8ec09c94d10..1ac61607341 100644 --- a/x11/qt3-libs/Makefile.common +++ b/x11/qt3-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.60 2006/02/25 03:55:57 minskim Exp $ +# $NetBSD: Makefile.common,v 1.61 2006/07/26 13:30:24 joerg Exp $ DISTNAME= qt-x11-free-${QTVERSION} CATEGORIES= x11 @@ -68,6 +68,8 @@ LDFLAGS+= -lresolv . endif .endif +CONFIGURE_ARGS+= -verbose + QMAKE_RANLIB?= ${TRUE} .if !exists(${X11BASE}/lib/libXinerama.so) && \ diff --git a/x11/qt3-libs/buildlink3.mk b/x11/qt3-libs/buildlink3.mk index e4723fc9190..9d435044d12 100644 --- a/x11/qt3-libs/buildlink3.mk +++ b/x11/qt3-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2006/07/18 19:55:47 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2006/07/26 13:30:24 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ QT3_LIBS_BUILDLINK3_MK:= ${QT3_LIBS_BUILDLINK3_MK}+ @@ -33,6 +33,7 @@ PTHREAD_OPTS+= require .include "../../graphics/mng/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" +.include "../../x11/xcursor/buildlink3.mk" .include "../../x11/Xrandr/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/x11/qt3-libs/patches/patch-an b/x11/qt3-libs/patches/patch-an new file mode 100644 index 00000000000..e9b97123fb9 --- /dev/null +++ b/x11/qt3-libs/patches/patch-an @@ -0,0 +1,32 @@ +$NetBSD: patch-an,v 1.1 2006/07/26 13:30:24 joerg Exp $ + +--- config.tests/x11/xrandr.test.orig 2006-07-26 12:20:40.000000000 +0000 ++++ config.tests/x11/xrandr.test +@@ -51,16 +51,24 @@ if [ "$XRANDR" = "yes" ]; then + XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG` + INCDIRS="$IN_INCDIRS $XDIRS /usr/include /include" + F= ++ F2= + for INCDIR in $INCDIRS; do +- if [ -f $INCDIR/$INC -a -f $INCDIR/$INC2 ]; then ++ if [ -f $INCDIR/$INC ]; then + F=yes + XRANDR_H=$INCDIR/$INC +- RANDR_H=$INCDIR/$INC2 + [ "$VERBOSE" = "yes" ] && echo " Found $INC in $INCDIR" + break + fi + done +- if [ -z "$F" ] ++ for INCDIR in $INCDIRS; do ++ if [ -f $INCDIR/$INC2 ]; then ++ F2=yes ++ RANDR_H=$INCDIR/$INC2 ++ [ "$VERBOSE" = "yes" ] && echo " Found $INC2 in $INCDIR" ++ break ++ fi ++ done ++ if [ -z "$F" -o -z "$F2"] + then + XRANDR=no + [ "$VERBOSE" = "yes" ] && echo " Could not find $INC anywhere in $INCDIRS" |