summaryrefslogtreecommitdiff
path: root/devel/glade
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2009-06-15 11:46:27 +0000
committerobache <obache@pkgsrc.org>2009-06-15 11:46:27 +0000
commit73286353abff31db7d54298935a9536b8240a271 (patch)
tree87d81544de4d91d6aa76d5b95a5a90398d35bd95 /devel/glade
parentca9b9534e1612c8a4536edce5384d599937dcba1 (diff)
downloadpkgsrc-73286353abff31db7d54298935a9536b8240a271.tar.gz
devel/glade/Makefile.common is not used elsewhere than devel/glade/Makefile.
So marge Makefile.common into Makefile, and remove Makefile.common.
Diffstat (limited to 'devel/glade')
-rw-r--r--devel/glade/Makefile24
-rw-r--r--devel/glade/Makefile.common27
2 files changed, 21 insertions, 30 deletions
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 47a341112cf..f39568c50fc 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,12 +1,30 @@
-# $NetBSD: Makefile,v 1.57 2008/06/20 01:09:12 joerg Exp $
+# $NetBSD: Makefile,v 1.58 2009/06/15 11:46:27 obache Exp $
-PKG_DESTDIR_SUPPORT= user-destdir
+DISTNAME= glade-2.12.2
+CATEGORIES= devel
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glade/2.12/}
+EXTRACT_SUFX= .tar.bz2
+
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= http://glade.gnome.org/
+COMMENT= User interface builder for the GTK2+ toolkit
-.include "Makefile.common"
+PKG_DESTDIR_SUPPORT= user-destdir
+CONFLICTS+= glade2-[0-9]* glade2-gnome-[0-9]*
CONFLICTS+= glade-gnome-[0-9]*
+GNU_CONFIGURE= YES
+USE_DIRS+= gnome2-1.5
+USE_TOOLS+= gmake intltool msgfmt pkg-config
+USE_LIBTOOL= YES
+USE_PKGLOCALEDIR= YES
+
CONFIGURE_ARGS+= --disable-gnome
CONFIGURE_ARGS+= --disable-gnome-db
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../mk/omf-scrollkeeper.mk"
+.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/glade/Makefile.common b/devel/glade/Makefile.common
deleted file mode 100644
index e87323171fc..00000000000
--- a/devel/glade/Makefile.common
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile.common,v 1.7 2009/03/08 15:56:44 wiz Exp $
-
-DISTNAME= glade-2.12.2
-CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glade/2.12/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://glade.gnome.org/
-COMMENT= User interface builder for the GTK2+ toolkit
-
-DISTINFO_FILE= ${.CURDIR}/../../devel/glade/distinfo
-PATCHDIR= ${.CURDIR}/../../devel/glade/patches
-PLIST_SRC= ${.CURDIR}/../../devel/glade/PLIST
-
-CONFLICTS+= glade2-[0-9]* glade2-gnome-[0-9]*
-
-GNU_CONFIGURE= YES
-USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake intltool msgfmt pkg-config
-USE_LIBTOOL= YES
-USE_PKGLOCALEDIR= YES
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../mk/omf-scrollkeeper.mk"
-.include "../../x11/gtk2/buildlink3.mk"