devel/glade/Makefile.common is not used elsewhere than devel/glade/Makefile.

So marge Makefile.common into Makefile, and remove Makefile.common.
This commit is contained in:
obache 2009-06-15 11:46:27 +00:00
parent ebe1e6805c
commit 353cb02478
2 changed files with 21 additions and 30 deletions

View file

@ -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
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]*
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"

View file

@ -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"