Remove python support from this package and bump PKGREVISION to 1.

Reason: drop a build time option.

While here, split the Makefile in two parts to allow the addition
of the upcoming dia-python package, which will provide the missing
bits.

4 files changed, 67 insertions, 62 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 4e59a34219d..f73401010b0 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,38 +1,12 @@
-# $NetBSD: Makefile,v 1.36 2004/11/17 21:42:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.37 2005/01/20 18:49:33 jmmv Exp $
+#
 
-DISTNAME=	dia-0.94
-CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dia/0.94/}
+.include "Makefile.common"
 
-MAINTAINER=	jmcneill@invisible.yi.org
-HOMEPAGE=	http://www.gnome.org/projects/dia/
-COMMENT=	Program for creating diagrams of all kinds
+PKGREVISION=	1
 
-USE_BUILDLINK3=		YES
-USE_PKGLOCALEDIR=	YES
-USE_X11=		YES
-USE_GNU_TOOLS+=		make
-USE_LIBTOOL=		YES
-
-GNU_CONFIGURE=		YES
-
-INTL_FILE=     ${WRKSRC}/lib/intl.c
-
-post-patch:
-	@${MV} ${INTL_FILE} ${INTL_FILE}.pre
-	@${SED}  -e "s,%%PREFIX%%,${PREFIX},g" ${INTL_FILE}.pre > ${INTL_FILE}
+USE_DIRS+=	xdg-1.1
 
 .include "options.mk"
 
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/dia/Makefile.common b/graphics/dia/Makefile.common
new file mode 100644
index 00000000000..650ce7a1fbb
--- /dev/null
+++ b/graphics/dia/Makefile.common
@@ -0,0 +1,57 @@
+# $NetBSD: Makefile.common,v 1.1 2005/01/20 18:49:33 jmmv Exp $
+#
+
+DISTNAME=	dia-0.94
+PKGNAME=	${DISTNAME:S/dia-/dia${DIA_SUBPKG}-/}
+CATEGORIES=	graphics
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dia/0.94/}
+
+MAINTAINER=	jmcneill@invisible.yi.org
+HOMEPAGE=	http://www.gnome.org/projects/dia/
+COMMENT=	Program for creating diagrams of all kinds
+
+DISTINFO_FILE=		${.CURDIR}/../../graphics/dia/distinfo
+PATCHDIR=		${.CURDIR}/../../graphics/dia/patches
+
+GNU_CONFIGURE=		YES
+USE_BUILDLINK3=		YES
+USE_GNU_TOOLS+=		make
+USE_LIBTOOL=		YES
+USE_PKGLOCALEDIR=	YES
+USE_X11=		YES
+
+CONFIGURE_ARGS+=	--without-python
+
+SUBST_CLASSES+=		intl
+SUBST_MESSAGE.intl=	"Fixing path to installed files."
+SUBST_STAGE.intl=	pre-configure
+SUBST_FILES.intl=	${WRKSRC}/lib/intl.c
+SUBST_SED.intl=		-e 's,%%PREFIX%%,${PREFIX},g'
+
+.if empty(PKGNAME:Mdia-[0-9]*)
+DEPENDS+=		dia>=0.94nb1:../../graphics/dia
+
+BUILDLINK_DEPMETHOD.gettext-lib+=	build
+BUILDLINK_DEPMETHOD.glib2+=		build
+BUILDLINK_DEPMETHOD.pango+=		build
+BUILDLINK_DEPMETHOD.pkgconfig+=		build
+BUILDLINK_DEPMETHOD.freetype2+=		build
+BUILDLINK_DEPMETHOD.libart2+=		build
+BUILDLINK_DEPMETHOD.intltool+=		build
+BUILDLINK_DEPMETHOD.libxml2+=		build
+BUILDLINK_DEPMETHOD.libxslt+=		build
+BUILDLINK_DEPMETHOD.scrollkeeper+=	build
+BUILDLINK_DEPMETHOD.gtk2+=		build
+.endif
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/libart2/buildlink3.mk"
+.include "../../textproc/intltool/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../x11/gtk2/buildlink3.mk"
diff --git a/graphics/dia/PLIST b/graphics/dia/PLIST
index 31bacac74e2..184ee97c68c 100644
--- a/graphics/dia/PLIST
+++ b/graphics/dia/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/11/17 21:42:11 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/01/20 18:49:33 jmmv Exp $
 bin/dia
 lib/dia/libbondgraph_objects.la
 lib/dia/libcairo_filter.la
@@ -20,7 +20,6 @@ lib/dia/libmisc_objects.la
 lib/dia/libnetwork_objects.la
 lib/dia/libpixbuf_filter.la
 lib/dia/libpstricks_filter.la
-${PYTHON_OPTION}lib/dia/libpython_plugin.la
 lib/dia/libsadt_objects.la
 lib/dia/libshape_filter.la
 lib/dia/libstandard_objects.la
@@ -43,15 +42,6 @@ share/dia/images/selectable.png
 share/dia/images/unbroken-chain.xpm
 share/dia/images/visible-empty.png
 share/dia/images/visible.png
-${PYTHON_OPTION}share/dia/python-startup.py
-${PYTHON_OPTION}share/dia/python/diasvg.py
-${PYTHON_OPTION}share/dia/python/diasvg_import.py
-${PYTHON_OPTION}share/dia/python/group_props.py
-${PYTHON_OPTION}share/dia/python/gtkcons.py
-${PYTHON_OPTION}share/dia/python/otypes.py
-${PYTHON_OPTION}share/dia/python/pydiadoc.py
-${PYTHON_OPTION}share/dia/python/scascale.py
-${PYTHON_OPTION}share/dia/python/select_by.py
 share/dia/shapes/Assorted/arrow-chevron.png
 share/dia/shapes/Assorted/arrow-chevron.shape
 share/dia/shapes/Assorted/arrow-down.png
@@ -1421,7 +1411,6 @@ ${GNOME_OPTION}@comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/dia/shapes/ChemEng
 @dirrm share/dia/shapes/Assorted
 @dirrm share/dia/shapes
-${PYTHON_OPTION}@dirrm share/dia/python
 @dirrm share/dia/images
 @dirrm share/dia
 @comment in xdg-dirs: @dirrm share/applications
diff --git a/graphics/dia/options.mk b/graphics/dia/options.mk
index 4a0fd41cb44..8a083095abc 100644
--- a/graphics/dia/options.mk
+++ b/graphics/dia/options.mk
@@ -1,27 +1,12 @@
-# $NetBSD: options.mk,v 1.1 2004/11/17 21:42:11 xtraeme Exp $
+# $NetBSD: options.mk,v 1.2 2005/01/20 18:49:33 jmmv Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dia
-#PKG_SUPPORTED_OPTIONS=	python gnome cairo
-PKG_SUPPORTED_OPTIONS=	python gnome
-PKG_DEFAULT_OPTIONS=	python gnome 
+#PKG_SUPPORTED_OPTIONS=	gnome cairo
+PKG_SUPPORTED_OPTIONS=	gnome
+PKG_DEFAULT_OPTIONS=	gnome 
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mpython)
-CONFIGURE_ENV+=		PYTHON=${PYTHONBIN}
-CONFIGURE_ARGS+=	--with-python
-
-PYTHON_PATCH_SCRIPTS=	po-checktrans.py
-PYTHON_PATCH_SCRIPTS+=	plug-ins/python/gtkcons.py
-PYTHON_PATCH_SCRIPTS+=	sheets/checktrans.py
-.  include "../../lang/python/application.mk"
-.  include "../../x11/py-gtk2/buildlink3.mk"
-PLIST_SUBST+=		PYTHON_OPTION=
-.else
-CONFIGURE_ARGS+=	--without-python
-PLIST_SUBST+=		PYTHON_OPTION='@comment '
-.endif
-
 .if !empty(PKG_OPTIONS:Mgnome)
 USE_DIRS+=		gnome2-1.5
 CONFIGURE_ARGS+=	--enable-gnome