summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2002-09-10 16:53:02 +0000
committerwiz <wiz@pkgsrc.org>2002-09-10 16:53:02 +0000
commit877214001b1d52fde31da1b171cf3988327849e7 (patch)
tree0cc8ee45ed5fd872452a494a3e0db153eaa1bd6f
parent80ee491886d0ad0b88b9dc336e476683e9cb121c (diff)
downloadpkgsrc-877214001b1d52fde31da1b171cf3988327849e7.tar.gz
Convert to buildlink2. Fix PLIST.
-rw-r--r--wm/metacity/Makefile19
-rw-r--r--wm/metacity/PLIST10
2 files changed, 14 insertions, 15 deletions
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index 781e84a2ae9..d068f821d6e 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/09/10 16:06:50 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/10 16:53:02 wiz Exp $
#
DISTNAME= metacity-2.3.377
@@ -10,17 +10,18 @@ MAINTAINER= packages@netbsd.org
#HOMEPAGE=
COMMENT= gnome-compliant window manager
+BUILD_USES_MSGFMT= yes
+
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-included-gettext
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+USE_X11= yes
+USE_BUILDLINK2= yes
-CONFIGURE_ENV+= PKG_CONFIG=${BUILDLINK_DIR}/bin/pkg-config
-
-BUILD_USES_MSGFMT= yes
-
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../devel/GConf2/buildlink.mk"
-.include "../../x11/gtk2/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/GConf2/buildlink2.mk"
+.include "../../net/ORBit2/buildlink2.mk"
+.include "../../x11/gtk2/buildlink2.mk"
+.include "../../devel/ptl2/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/metacity/PLIST b/wm/metacity/PLIST
index d5b3358bd0f..e789a69b29b 100644
--- a/wm/metacity/PLIST
+++ b/wm/metacity/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/09 21:58:43 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/09/10 16:53:02 wiz Exp $
bin/metacity
bin/metacity-message
bin/metacity-theme-viewer
@@ -104,18 +104,16 @@ share/metacity/themes/Gorilla/metacity-theme-1.xml
@dirrm share/metacity/themes
@dirrm share/metacity/icons
@dirrm share/metacity
-@dirrm share/locale/ms/LC_MESSAGES
-@dirrm share/locale/lv/LC_MESSAGES
@dirrm share/gnome/wm-properties
@dirrm etc/gconf/schemas
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/metacity/window_keybindings
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/metacity/global_keybindings
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/metacity/general
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/metacity
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps
+@unexec ${RMDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps 2>/dev/null || ${TRUE}
@dirrm etc/gconf/gconf.xml.defaults/apps/metacity/window_keybindings
@dirrm etc/gconf/gconf.xml.defaults/apps/metacity/global_keybindings
@dirrm etc/gconf/gconf.xml.defaults/apps/metacity/general
@dirrm etc/gconf/gconf.xml.defaults/apps/metacity
-@dirrm etc/gconf/gconf.xml.defaults/apps
-@dirrm etc/gconf/gconf.xml.defaults
+@unexec ${RMDIR} %D/etc/gconf/gconf.xml.defaults/apps 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/etc/gconf/gconf.xml.defaults 2>/dev/null || ${TRUE}