[pkgsrc/trunk]: pkgsrc/x11/xfce Convert to buildlink3.

[snj <snj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8730cda3e0c2
branches:  trunk
changeset: 473079:8730cda3e0c2
user:      snj <snj%pkgsrc.org@localhost>
date:      Thu Apr 15 22:13:31 2004 +0000

description:
Convert to buildlink3.

diffstat:

 x11/xfce/Makefile         |  15 +++++++--------
 x11/xfce/distinfo         |   3 ++-
 x11/xfce/patches/patch-aa |  13 +++++++++++++
 3 files changed, 22 insertions(+), 9 deletions(-)

diffs (63 lines):

diff -r 193cc9bb7c80 -r 8730cda3e0c2 x11/xfce/Makefile
--- a/x11/xfce/Makefile Thu Apr 15 22:08:36 2004 +0000
+++ b/x11/xfce/Makefile Thu Apr 15 22:13:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2004/02/14 17:21:56 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2004/04/15 22:13:31 snj Exp $
 
 DISTNAME=              xfce-3.8.18
 PKGREVISION=           3
@@ -11,7 +11,7 @@
 
 BUILD_USES_MSGFMT=     yes
 
-USE_BUILDLINK2=                # defined
+USE_BUILDLINK3=                yes
 USE_X11BASE=           # defined
 USE_PKGLOCALEDIR=      # defined
 USE_LIBTOOL=           # defined
@@ -33,11 +33,10 @@
 # work around bug in configure script
 #CONFIGURE_ENV+=               gt_cv_func_gettext_libintl="yes"
 
-CPPFLAGS+=             -I${X11BASE}/include    # dependent includes for xpm.h
-
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../graphics/imlib/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/imlib/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 193cc9bb7c80 -r 8730cda3e0c2 x11/xfce/distinfo
--- a/x11/xfce/distinfo Thu Apr 15 22:08:36 2004 +0000
+++ b/x11/xfce/distinfo Thu Apr 15 22:13:31 2004 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2002/11/12 12:27:56 martti Exp $
+$NetBSD: distinfo,v 1.8 2004/04/15 22:13:31 snj Exp $
 
 SHA1 (xfce-3.8.18.tar.gz) = d4ab39c4ddeb68d2cc1ceb03af14b0e95b8f5c61
 Size (xfce-3.8.18.tar.gz) = 5166881 bytes
+SHA1 (patch-aa) = 483963bb078ec5bf15cd7c51f34b4f4184848ceb
 SHA1 (patch-ac) = 522fda7357121014b3570ebce1f64aaca3141a54
diff -r 193cc9bb7c80 -r 8730cda3e0c2 x11/xfce/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xfce/patches/patch-aa Thu Apr 15 22:13:31 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.5 2004/04/15 22:13:31 snj Exp $
+
+--- xfsound/Makefile.in.orig   2004-04-15 15:04:49.000000000 -0700
++++ xfsound/Makefile.in        2004-04-15 15:05:13.000000000 -0700
+@@ -200,7 +200,7 @@ xfsound_SOURCES = \
+ xfsound_LDADD = ../libs/libxfcecore.la ../libs/libxfwmcore.la \
+  @DMALLOC_LIB@ @GTK_LIBS@ @GDK_IMLIB_LIBS@ @GDK_PIXBUF_LIBS@ \
+  @AUDIOFILE_LIBS@ @ARTS_LIBS@ @INTLLIBS@ @LIBS@ ../libs/libxfwmcore.la \
+- ${X_LIBS} ${X_PRE_LIBS} -lXpm @XFT_LIBS@
++ ${X_LIBS} ${X_PRE_LIBS} -lXpm @XFT_LIBS@ ${LIBOSSAUDIO}
+ 
+ 
+ xfsound_DEPENDENCIES = ../libs/libxfcecore.la ../libs/libxfwmcore.la