[pkgsrc/trunk]: pkgsrc/devel/glade devel/glade/Makefile.common is not used el...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5a596a62fdce
branches:  trunk
changeset: 560630:5a596a62fdce
user:      obache <obache%pkgsrc.org@localhost>
date:      Mon Jun 15 11:46:27 2009 +0000

description:
devel/glade/Makefile.common is not used elsewhere than devel/glade/Makefile.
So marge Makefile.common into Makefile, and remove Makefile.common.

diffstat:

 devel/glade/Makefile        |  24 +++++++++++++++++++++---
 devel/glade/Makefile.common |  27 ---------------------------
 2 files changed, 21 insertions(+), 30 deletions(-)

diffs (68 lines):

diff -r 92d91f807a9f -r 5a596a62fdce devel/glade/Makefile
--- a/devel/glade/Makefile      Mon Jun 15 11:14:21 2009 +0000
+++ b/devel/glade/Makefile      Mon Jun 15 11:46:27 2009 +0000
@@ -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 $
+
+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@localhost
+HOMEPAGE=      http://glade.gnome.org/
+COMMENT=       User interface builder for the GTK2+ toolkit
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-.include "Makefile.common"
+CONFLICTS+=            glade2-[0-9]* glade2-gnome-[0-9]*
+CONFLICTS+=            glade-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 -r 92d91f807a9f -r 5a596a62fdce devel/glade/Makefile.common
--- a/devel/glade/Makefile.common       Mon Jun 15 11:14:21 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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@localhost
-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"