From da6b75442977ff3fc818b01693f46936e8520871 Mon Sep 17 00:00:00 2001 From: reed Date: Sat, 8 Apr 2006 21:02:26 +0000 Subject: Add a Makefile.common for evince and evince-nautilus. They used a sharded distinfo, but the version was not updated for evince-nautilus as seen in recent bulk build report. So evince-nautilus is being updated to 0.5.2 version also. I am not sure of all the changes, other than: Check if date is invalid. Fix for bug 318134. Some build fixes for cygwin. Patch by yselkowitz@users.sourceforge.net --- print/evince-nautilus/Makefile | 42 +++++------------------------------------- print/evince/Makefile | 36 +++--------------------------------- print/evince/Makefile.common | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 70 deletions(-) create mode 100644 print/evince/Makefile.common (limited to 'print') diff --git a/print/evince-nautilus/Makefile b/print/evince-nautilus/Makefile index db5139a1a22..4de1a04f3dd 100644 --- a/print/evince-nautilus/Makefile +++ b/print/evince-nautilus/Makefile @@ -1,49 +1,17 @@ -# $NetBSD: Makefile,v 1.3 2006/03/21 06:00:48 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2006/04/08 21:02:26 reed Exp $ # -DISTNAME= evince-0.4.0 -PKGNAME= evince-nautilus-0.4.0 +.include "../../print/evince/Makefile.common" + +PKGNAME= ${DISTNAME:S/evince/evince-nautilus/} PKGREVISION= 1 -CATEGORIES= print -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evince/0.4/} -EXTRACT_SUFX= .tar.bz2 -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.gnome.org/projects/evince/ COMMENT= File properties plugin for evince files -#PATCHDIR= ${.CURDIR}/../evince/patches -DISTINFO_FILE= ${.CURDIR}/../evince/distinfo - -GNU_CONFIGURE= yes -USE_DIRS+= gnome2-1.5 -USE_LIBTOOL= yes -USE_MSGFMT_PLURALS= yes -USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake pkg-config - BUILD_DIRS= libbackend lib properties INSTALL_DIRS= properties -# XXX fake for "configure" to allow build w/o a gs installed -# (avoid hard dependency on a specific version) -CONFIGURE_ARGS+= --with-gs=${LOCALBASE}/bin/gs -pre-configure: - ${ECHO} "echo 8.51" >${BUILDLINK_DIR}/bin/gs - ${CHMOD} +x ${BUILDLINK_DIR}/bin/gs - -.include "../../devel/GConf2/schemas.mk" -.include "../../devel/glib2/buildlink3.mk" -.include "../../devel/libglade2/buildlink3.mk" -.include "../../devel/libgnomeui/buildlink3.mk" .include "../../print/libgnomeprint/buildlink3.mk" -.include "../../print/libgnomeprintui/buildlink3.mk" -.include "../../print/poppler-glib/buildlink3.mk" -.include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../sysutils/nautilus/buildlink3.mk" -.include "../../textproc/gnome-doc-utils/buildlink3.mk" -.include "../../textproc/intltool/buildlink3.mk" -.include "../../textproc/scrollkeeper/omf.mk" -.include "../../x11/gtk2/buildlink3.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/print/evince/Makefile b/print/evince/Makefile index 0bf2873e7b5..61c2714b3b3 100644 --- a/print/evince/Makefile +++ b/print/evince/Makefile @@ -1,45 +1,15 @@ -# $NetBSD: Makefile,v 1.13 2006/03/30 21:30:42 jmmv Exp $ +# $NetBSD: Makefile,v 1.14 2006/04/08 21:02:26 reed Exp $ # -DISTNAME= evince-0.5.2 -CATEGORIES= print -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evince/0.5/} -EXTRACT_SUFX= .tar.bz2 +.include "../../print/evince/Makefile.common" -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.gnome.org/projects/evince/ COMMENT= Document viewer for the GNOME Desktop -GNU_CONFIGURE= yes -USE_DIRS+= gnome2-1.5 -USE_LIBTOOL= yes -USE_MSGFMT_PLURALS= yes -USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake pkg-config - GCONF2_SCHEMAS= evince.schemas GCONF2_SCHEMAS+= evince-thumbnailer.schemas -# XXX fake for "configure" to allow build w/o a gs installed -# (avoid hard dependency on a specific version) -CONFIGURE_ARGS+= --with-gs=${LOCALBASE}/bin/gs -pre-configure: - ${ECHO} "echo 8.51" >${BUILDLINK_DIR}/bin/gs - ${CHMOD} +x ${BUILDLINK_DIR}/bin/gs - -.include "../../devel/GConf2/schemas.mk" -.include "../../devel/glib2/buildlink3.mk" -.include "../../devel/libglade2/buildlink3.mk" -.include "../../devel/libgnomeui/buildlink3.mk" -.include "../../print/libgnomeprintui/buildlink3.mk" -.include "../../print/poppler-glib/buildlink3.mk" .include "../../security/gnome-keyring/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" -.include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" -.include "../../textproc/gnome-doc-utils/buildlink3.mk" -.include "../../textproc/intltool/buildlink3.mk" -.include "../../textproc/scrollkeeper/omf.mk" -.include "../../x11/gtk2/buildlink3.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/print/evince/Makefile.common b/print/evince/Makefile.common new file mode 100644 index 00000000000..b1f6d4f96e5 --- /dev/null +++ b/print/evince/Makefile.common @@ -0,0 +1,40 @@ +# $NetBSD: Makefile.common,v 1.1 2006/04/08 21:02:26 reed Exp $ +# + +DISTNAME= evince-0.5.2 +CATEGORIES= print +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evince/0.5/} +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://www.gnome.org/projects/evince/ + +#PATCHDIR= ${.CURDIR}/../evince/patches +DISTINFO_FILE= ${.CURDIR}/../evince/distinfo + +GNU_CONFIGURE= yes +USE_DIRS+= gnome2-1.5 +USE_LIBTOOL= yes +USE_MSGFMT_PLURALS= yes +USE_PKGLOCALEDIR= yes +USE_TOOLS+= gmake pkg-config + +# XXX fake for "configure" to allow build w/o a gs installed +# (avoid hard dependency on a specific version) +CONFIGURE_ARGS+= --with-gs=${LOCALBASE}/bin/gs +pre-configure: + ${ECHO} "echo 8.51" >${BUILDLINK_DIR}/bin/gs + ${CHMOD} +x ${BUILDLINK_DIR}/bin/gs + +.include "../../devel/GConf2/schemas.mk" +.include "../../devel/glib2/buildlink3.mk" +.include "../../devel/libglade2/buildlink3.mk" +.include "../../devel/libgnomeui/buildlink3.mk" +.include "../../print/libgnomeprintui/buildlink3.mk" +.include "../../print/poppler-glib/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../textproc/gnome-doc-utils/buildlink3.mk" +.include "../../textproc/intltool/buildlink3.mk" +.include "../../textproc/scrollkeeper/omf.mk" +.include "../../x11/gtk2/buildlink3.mk" -- cgit v1.2.3