pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics graphics/gdk-pixbuf2*: Fix base sync problem ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c7aa2dcaf545
branches:  trunk
changeset: 609665:c7aa2dcaf545
user:      marino <marino%pkgsrc.org@localhost>
date:      Mon Oct 08 08:04:28 2012 +0000

description:
graphics/gdk-pixbuf2*: Fix base sync problem permanently

gdk-pixbuf2, gdk-pixbuf2-jasper, and gdk-pixbuf2-xlib have been manually
synced.  Usually the base package would get updated and the others would
be forgotten resulting in an unnecessary mismatch.

Create a common makefile to permanently fix this problem.

diffstat:

 graphics/gdk-pixbuf2-jasper/Makefile  |  11 ++++++-----
 graphics/gdk-pixbuf2-xlib/Makefile    |  10 ++++++----
 graphics/gdk-pixbuf2/Makefile         |   9 +++++----
 graphics/gdk-pixbuf2/Makefile.version |   2 ++
 4 files changed, 19 insertions(+), 13 deletions(-)

diffs (87 lines):

diff -r be50ec13aa87 -r c7aa2dcaf545 graphics/gdk-pixbuf2-jasper/Makefile
--- a/graphics/gdk-pixbuf2-jasper/Makefile      Mon Oct 08 05:40:11 2012 +0000
+++ b/graphics/gdk-pixbuf2-jasper/Makefile      Mon Oct 08 08:04:28 2012 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2012/10/06 14:10:50 asau Exp $
+# $NetBSD: Makefile,v 1.13 2012/10/08 08:04:28 marino Exp $
 #
 
-DISTNAME=      gdk-pixbuf-2.26.3
-PKGNAME=       gdk-pixbuf2-jasper-2.26.3
-PKGREVISION=   1
+DISTNAME=      gdk-pixbuf-${PIXBUF2_VERSION}
+PKGNAME=       gdk-pixbuf2-jasper-${PIXBUF2_VERSION}
 CATEGORIES=    graphics
-MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gdk-pixbuf/2.26/}
+MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gdk-pixbuf/${MSITE_VERSION}/}
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -16,6 +15,8 @@
 DISTINFO_FILE= ${.CURDIR}/../../graphics/gdk-pixbuf2/distinfo
 PATCHDIR=      ${.CURDIR}/../../graphics/gdk-pixbuf2/patches
 
+.include "../../graphics/gdk-pixbuf2/Makefile.version"
+
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --without-libtiff --without-libjpeg --without-libpng
 CONFIGURE_ARGS+=       --with-libjasper
diff -r be50ec13aa87 -r c7aa2dcaf545 graphics/gdk-pixbuf2-xlib/Makefile
--- a/graphics/gdk-pixbuf2-xlib/Makefile        Mon Oct 08 05:40:11 2012 +0000
+++ b/graphics/gdk-pixbuf2-xlib/Makefile        Mon Oct 08 08:04:28 2012 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2012/10/06 14:10:51 asau Exp $
+# $NetBSD: Makefile,v 1.13 2012/10/08 08:04:29 marino Exp $
 
-DISTNAME=      gdk-pixbuf-2.26.4
-PKGNAME=       gdk-pixbuf2-xlib-2.26.4
+DISTNAME=      gdk-pixbuf-${PIXBUF2_VERSION}
+PKGNAME=       gdk-pixbuf2-xlib-${PIXBUF2_VERSION}
 PKGREVISION=   1
 CATEGORIES=    graphics
-MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gdk-pixbuf/2.26/}
+MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gdk-pixbuf/${MSITE_VERSION}/}
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -19,6 +19,8 @@
 
 CONFLICTS+=    gtk2+<2.22
 
+.include "../../graphics/gdk-pixbuf2/Makefile.version"
+
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --without-libtiff --without-libjpeg --without-libpng
 CONFIGURE_ARGS+=       --with-x11
diff -r be50ec13aa87 -r c7aa2dcaf545 graphics/gdk-pixbuf2/Makefile
--- a/graphics/gdk-pixbuf2/Makefile     Mon Oct 08 05:40:11 2012 +0000
+++ b/graphics/gdk-pixbuf2/Makefile     Mon Oct 08 08:04:28 2012 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2012/10/06 14:10:50 asau Exp $
-# Remember to also update graphics/gdk-pixbuf2-xlib
+# $NetBSD: Makefile,v 1.22 2012/10/08 08:04:28 marino Exp $
 
-DISTNAME=      gdk-pixbuf-2.26.4
+DISTNAME=      gdk-pixbuf-${PIXBUF2_VERSION}
 PKGNAME=       ${DISTNAME:S/pixbuf/pixbuf2/}
 CATEGORIES=    graphics
-MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gdk-pixbuf/2.26/}
+MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gdk-pixbuf/${MSITE_VERSION}/}
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -14,6 +13,8 @@
 
 CONFLICTS+=    gtk2+<2.22
 
+.include "../../graphics/gdk-pixbuf2/Makefile.version"
+
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes
 USE_TOOLS+=            pkg-config gmake
diff -r be50ec13aa87 -r c7aa2dcaf545 graphics/gdk-pixbuf2/Makefile.version
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gdk-pixbuf2/Makefile.version     Mon Oct 08 08:04:28 2012 +0000
@@ -0,0 +1,2 @@
+PIXBUF2_VERSION=       2.26.4
+MSITE_VERSION=         2.26



Home | Main Index | Thread Index | Old Index