pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/dia Convert to use bsd.options.mk, I don't bu...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2402dcbbf478
branches: trunk
changeset: 483717:2402dcbbf478
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Wed Nov 17 21:42:11 2004 +0000
description:
Convert to use bsd.options.mk, I don't bump PKGREVISION because the
binary will be the same (all options turned on by default), currently
there are two options: python gnome.
If you want to disable them, use PKG_OPTIONS.dia=-python -gnome
diffstat:
graphics/dia/Makefile | 22 +++++--------------
graphics/dia/PLIST | 56 ++++++++++++++++++++++++------------------------
graphics/dia/options.mk | 45 +++++++++++++++++++++++++++++++++++++++
3 files changed, 79 insertions(+), 44 deletions(-)
diffs (202 lines):
diff -r da0163c6604b -r 2402dcbbf478 graphics/dia/Makefile
--- a/graphics/dia/Makefile Wed Nov 17 21:32:10 2004 +0000
+++ b/graphics/dia/Makefile Wed Nov 17 21:42:11 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2004/10/14 17:04:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.36 2004/11/17 21:42:11 xtraeme Exp $
DISTNAME= dia-0.94
CATEGORIES= graphics
@@ -9,40 +9,30 @@
COMMENT= Program for creating diagrams of all kinds
USE_BUILDLINK3= YES
-USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
USE_X11= YES
USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
-CONFIGURE_ARGS+= --enable-gnome
-CONFIGURE_ARGS+= --enable-bonobo
-CONFIGURE_ARGS+= --with-python
-
-PYTHON_PATCH_SCRIPTS= po-checktrans.py
-PYTHON_PATCH_SCRIPTS+= plug-ins/python/gtkcons.py
-PYTHON_PATCH_SCRIPTS+= sheets/checktrans.py
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}
+ @${MV} ${INTL_FILE} ${INTL_FILE}.pre
+ @${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${INTL_FILE}.pre > ${INTL_FILE}
+
+.include "options.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../devel/pkgconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
-.include "../../lang/python/application.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
-.include "../../x11/py-gtk2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r da0163c6604b -r 2402dcbbf478 graphics/dia/PLIST
--- a/graphics/dia/PLIST Wed Nov 17 21:32:10 2004 +0000
+++ b/graphics/dia/PLIST Wed Nov 17 21:42:11 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/10/14 17:04:08 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/11/17 21:42:11 xtraeme Exp $
bin/dia
lib/dia/libbondgraph_objects.la
lib/dia/libcairo_filter.la
@@ -20,7 +20,7 @@
lib/dia/libnetwork_objects.la
lib/dia/libpixbuf_filter.la
lib/dia/libpstricks_filter.la
-lib/dia/libpython_plugin.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 +43,15 @@
share/dia/images/unbroken-chain.xpm
share/dia/images/visible-empty.png
share/dia/images/visible.png
-share/dia/python-startup.py
-share/dia/python/diasvg.py
-share/dia/python/diasvg_import.py
-share/dia/python/group_props.py
-share/dia/python/gtkcons.py
-share/dia/python/otypes.py
-share/dia/python/pydiadoc.py
-share/dia/python/scascale.py
-share/dia/python/select_by.py
+${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
@@ -1321,16 +1321,16 @@
share/dia/xslt/dia-uml2owl.xsl
share/dia/xslt/dia-uml2python.xsl
share/dia/xslt/stylesheets.xml
-share/gnome/help/dia/C
-share/gnome/help/dia/en/dia.xml
-share/gnome/help/dia/en/graphics/greendots.png
-share/gnome/help/dia/en/graphics/home_network.png
-share/gnome/help/dia/en/graphics/line_icon.png
-share/gnome/help/dia/en/graphics/line_props.png
-share/gnome/help/dia/pl/dia.xml
-share/gnome/help/dia/pl/graphics/greendots.png
-share/gnome/help/dia/pl/graphics/home_network.png
-share/gnome/help/dia/pl/graphics/line_props.png
+${GNOME_OPTION}share/gnome/help/dia/C
+${GNOME_OPTION}share/gnome/help/dia/en/dia.xml
+${GNOME_OPTION}share/gnome/help/dia/en/graphics/greendots.png
+${GNOME_OPTION}share/gnome/help/dia/en/graphics/home_network.png
+${GNOME_OPTION}share/gnome/help/dia/en/graphics/line_icon.png
+${GNOME_OPTION}share/gnome/help/dia/en/graphics/line_props.png
+${GNOME_OPTION}share/gnome/help/dia/pl/dia.xml
+${GNOME_OPTION}share/gnome/help/dia/pl/graphics/greendots.png
+${GNOME_OPTION}share/gnome/help/dia/pl/graphics/home_network.png
+${GNOME_OPTION}share/gnome/help/dia/pl/graphics/line_props.png
${PKGLOCALEDIR}/locale/am/LC_MESSAGES/dia.mo
${PKGLOCALEDIR}/locale/az/LC_MESSAGES/dia.mo
${PKGLOCALEDIR}/locale/be/LC_MESSAGES/dia.mo
@@ -1386,12 +1386,12 @@
@exec ${MKDIR} %D/share/oaf
@dirrm share/oaf
@comment in xdg-dirs: @dirrm share/mime-info
-@dirrm share/gnome/help/dia/pl/graphics
-@dirrm share/gnome/help/dia/pl
-@dirrm share/gnome/help/dia/en/graphics
-@dirrm share/gnome/help/dia/en
-@dirrm share/gnome/help/dia
-@comment in gnome2-dirs: @dirrm share/gnome/help
+${GNOME_OPTION}@dirrm share/gnome/help/dia/pl/graphics
+${GNOME_OPTION}@dirrm share/gnome/help/dia/pl
+${GNOME_OPTION}@dirrm share/gnome/help/dia/en/graphics
+${GNOME_OPTION}@dirrm share/gnome/help/dia/en
+${GNOME_OPTION}@dirrm share/gnome/help/dia
+${GNOME_OPTION}@comment in gnome2-dirs: @dirrm share/gnome/help
@dirrm share/dia/xslt
@dirrm share/dia/sheets/UML
@dirrm share/dia/sheets/KAOS
@@ -1421,7 +1421,7 @@
@dirrm share/dia/shapes/ChemEng
@dirrm share/dia/shapes/Assorted
@dirrm share/dia/shapes
-@dirrm share/dia/python
+${PYTHON_OPTION}@dirrm share/dia/python
@dirrm share/dia/images
@dirrm share/dia
@comment in xdg-dirs: @dirrm share/applications
diff -r da0163c6604b -r 2402dcbbf478 graphics/dia/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/dia/options.mk Wed Nov 17 21:42:11 2004 +0000
@@ -0,0 +1,45 @@
+# $NetBSD: options.mk,v 1.1 2004/11/17 21:42:11 xtraeme Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.dia
+#PKG_SUPPORTED_OPTIONS= python gnome cairo
+PKG_SUPPORTED_OPTIONS= python gnome
+PKG_DEFAULT_OPTIONS= python 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
+. include "../../devel/libgnome/buildlink3.mk"
+. include "../../devel/libgnomeui/buildlink3.mk"
+PLIST_SUBST+= GNOME_OPTION=
+.else
+CONFIGURE_ARGS+= --disable-gnome
+PLIST_SUBST+= GNOME_OPTION='@comment '
+.endif
+
+# Disabled, freedesktop is down.
+.if !empty(PKG_OPTIONS:Mcairo)
+CONFIGURE_ARGS+= --with-cairo
+. include "../../graphics/cairo/buildlink3.mk"
+PLIST_SUBST+= CAIRO_OPTION=
+.else
+CONFIGURE_ARGS+= --without-cairo
+PLIST_SUBST+= CAIRO_OPTION='@comment '
+.endif
+
Home |
Main Index |
Thread Index |
Old Index