diff options
| author | jlam <jlam> | 2003-01-29 06:45:47 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-01-29 06:45:47 +0000 |
| commit | c4521f16edaa8ce89bd801f7dcf8ce4fa3197770 (patch) | |
| tree | 43ed8a65eab446ccca76aa746a8dea7e276179b9 /chat | |
| parent | 092c1d7f3141a3f6f641a116b7e9593a47147447 (diff) | |
| download | pkgsrc-c4521f16edaa8ce89bd801f7dcf8ce4fa3197770.tar.gz | |
Clean up hard-coded /usr/X11R6/include from the header search path, and
just have BUILD_DEPENDency on qt3-tools instead of the full one.
Diffstat (limited to 'chat')
| -rw-r--r-- | chat/psi/Makefile | 10 | ||||
| -rw-r--r-- | chat/psi/distinfo | 4 | ||||
| -rw-r--r-- | chat/psi/patches/patch-ab | 11 |
3 files changed, 12 insertions, 13 deletions
diff --git a/chat/psi/Makefile b/chat/psi/Makefile index 262d626b04c..6db3d8ed4ef 100644 --- a/chat/psi/Makefile +++ b/chat/psi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/01/03 20:05:21 lha Exp $ +# $NetBSD: Makefile,v 1.5 2003/01/29 06:45:47 jlam Exp $ DISTNAME= psi-0.8.7 CATEGORIES= chat @@ -9,6 +9,9 @@ MAINTAINER= jdolecek@netbsd.org HOMEPAGE= http://psi.affinix.com/ COMMENT= PSI Jabber Client +# need qt3 3.0.4nb2, for qmake +BUILD_DEPENDS+= qt3-tools>=3.0.4nb2:../../x11/qt3-tools + USE_BUILDLINK2= yes USE_GMAKE= yes USE_LIBTOOL= yes @@ -19,12 +22,7 @@ BUILD_DIRS= ${WRKSRC}/src CONFIGURE_ARGS+= -p ${PREFIX} -BUILDLINK_DEPENDS_METHOD.qt3-tools= build -# need qt3 3.0.4nb2, for qmake -BUILDLINK_DEPENDS.qt3-tools= qt3-tools>=3.0.4nb2 - .include "../../graphics/freetype2/buildlink2.mk" .include "../../x11/qt3-libs/buildlink2.mk" -.include "../../x11/qt3-tools/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/psi/distinfo b/chat/psi/distinfo index 4d3876dd600..e4265a8a4c4 100644 --- a/chat/psi/distinfo +++ b/chat/psi/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2003/01/03 20:05:21 lha Exp $ +$NetBSD: distinfo,v 1.4 2003/01/29 06:45:47 jlam Exp $ SHA1 (psi-0.8.7.tar.bz2) = 40431331a56f63cb61738538604c75f8363203eb Size (psi-0.8.7.tar.bz2) = 465036 bytes -SHA1 (patch-ab) = 98a46d0014fedc425c05c0a54e8a2c0b961953a0 +SHA1 (patch-ab) = d1fd061a233e3d36b7dc154fd3f28b8da755c247 SHA1 (patch-ad) = a753869d279434dfd62d9f3330a0302f1b504b4d SHA1 (patch-af) = 5fb9b727156e774773e937ddd4c42d3b7b66d371 diff --git a/chat/psi/patches/patch-ab b/chat/psi/patches/patch-ab index bb4b5113542..0f2f7431112 100644 --- a/chat/psi/patches/patch-ab +++ b/chat/psi/patches/patch-ab @@ -1,11 +1,12 @@ -$NetBSD: patch-ab,v 1.2 2003/01/03 20:05:22 lha Exp $ +$NetBSD: patch-ab,v 1.3 2003/01/29 06:45:48 jlam Exp $ ---- src/psi.pro.orig Wed Oct 30 11:09:34 2002 -+++ src/psi.pro Tue Dec 17 13:10:29 2002 -@@ -154,7 +154,7 @@ +--- src/psi.pro.orig Wed Oct 30 02:09:34 2002 ++++ src/psi.pro +@@ -153,8 +153,7 @@ INCLUDEPATH += kmp + # System-specific build settings unix:!mac { - INCLUDEPATH += /usr/include /usr/X11R6/include +- INCLUDEPATH += /usr/include /usr/X11R6/include - LIBS += -lz -lXss + LIBS += -lz -lXss -lqt-mt SOURCES += trayicon_x11.cpp |