summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarino <marino>2012-10-08 08:04:28 +0000
committermarino <marino>2012-10-08 08:04:28 +0000
commit6be7fbb83c1cad3b3e8e116f4768416990a0d582 (patch)
tree6a458fea0927dd49ba77400d69671f5ffe434273
parente334ea42c8b22553ff17cc47f3c5b24c076ee135 (diff)
downloadpkgsrc-6be7fbb83c1cad3b3e8e116f4768416990a0d582.tar.gz
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.
-rw-r--r--graphics/gdk-pixbuf2-jasper/Makefile11
-rw-r--r--graphics/gdk-pixbuf2-xlib/Makefile10
-rw-r--r--graphics/gdk-pixbuf2/Makefile9
-rw-r--r--graphics/gdk-pixbuf2/Makefile.version2
4 files changed, 19 insertions, 13 deletions
diff --git a/graphics/gdk-pixbuf2-jasper/Makefile b/graphics/gdk-pixbuf2-jasper/Makefile
index 1b732a853ff..b4bbb061d72 100644
--- a/graphics/gdk-pixbuf2-jasper/Makefile
+++ b/graphics/gdk-pixbuf2-jasper/Makefile
@@ -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
@@ -16,6 +15,8 @@ LICENSE= gnu-gpl-v2
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 --git a/graphics/gdk-pixbuf2-xlib/Makefile b/graphics/gdk-pixbuf2-xlib/Makefile
index 78a8e774e15..6969fe443e7 100644
--- a/graphics/gdk-pixbuf2-xlib/Makefile
+++ b/graphics/gdk-pixbuf2-xlib/Makefile
@@ -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
@@ -19,6 +19,8 @@ INSTALL_DIRS= contrib/gdk-pixbuf-xlib
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 --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index 6353b754fd0..6362a7e48e6 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -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
@@ -14,6 +13,8 @@ LICENSE= gnu-gpl-v2
CONFLICTS+= gtk2+<2.22
+.include "../../graphics/gdk-pixbuf2/Makefile.version"
+
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config gmake
diff --git a/graphics/gdk-pixbuf2/Makefile.version b/graphics/gdk-pixbuf2/Makefile.version
new file mode 100644
index 00000000000..ccca6449d7b
--- /dev/null
+++ b/graphics/gdk-pixbuf2/Makefile.version
@@ -0,0 +1,2 @@
+PIXBUF2_VERSION= 2.26.4
+MSITE_VERSION= 2.26