diff options
| author | snj <snj> | 2004-04-15 22:13:31 +0000 |
|---|---|---|
| committer | snj <snj> | 2004-04-15 22:13:31 +0000 |
| commit | 044b2e93ea3dbbc2d4953c2514844b29eaa401af (patch) | |
| tree | 0f4476458a2ebc18a2e6c193a956e57ec400497e /x11 | |
| parent | 2e0e9c0691ea0b46245f4a275651015996d523b1 (diff) | |
| download | pkgsrc-044b2e93ea3dbbc2d4953c2514844b29eaa401af.tar.gz | |
Convert to buildlink3.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xfce/Makefile | 15 | ||||
| -rw-r--r-- | x11/xfce/distinfo | 3 | ||||
| -rw-r--r-- | x11/xfce/patches/patch-aa | 13 |
3 files changed, 22 insertions, 9 deletions
diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile index abe0d61205a..dd3b643953a 100644 --- a/x11/xfce/Makefile +++ b/x11/xfce/Makefile @@ -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 @@ COMMENT= Lightweight desktop environment with CDE look and feel BUILD_USES_MSGFMT= yes -USE_BUILDLINK2= # defined +USE_BUILDLINK3= yes USE_X11BASE= # defined USE_PKGLOCALEDIR= # defined USE_LIBTOOL= # defined @@ -33,11 +33,10 @@ CONFIGURE_ARGS+= --disable-audiofile # 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 --git a/x11/xfce/distinfo b/x11/xfce/distinfo index 874260e08c3..8064999c637 100644 --- a/x11/xfce/distinfo +++ b/x11/xfce/distinfo @@ -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 --git a/x11/xfce/patches/patch-aa b/x11/xfce/patches/patch-aa new file mode 100644 index 00000000000..425b849165c --- /dev/null +++ b/x11/xfce/patches/patch-aa @@ -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 |