Mon Nov 15 14:50:04 2010 UTC ()
kill the redundant "GTK2_LOADERS" variable -- there is no good reason
to include "loaders.mk" other to install a loader


(drochner)
diff -r1.1 -r1.2 pkgsrc/graphics/gdk-pixbuf2/loaders.mk
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/gdk-pixbuf2-jasper/Makefile
cvs diff -r1.1 -r1.2 pkgsrc/graphics/gdk-pixbuf2/loaders.mk (expand / switch to unified diff)

--- pkgsrc/graphics/gdk-pixbuf2/loaders.mk 2010/11/14 20:11:41 1.1
+++ pkgsrc/graphics/gdk-pixbuf2/loaders.mk 2010/11/15 14:50:04 1.2
@@ -1,37 +1,29 @@ @@ -1,37 +1,29 @@
1# $NetBSD: loaders.mk,v 1.1 2010/11/14 20:11:41 drochner Exp $ 1# $NetBSD: loaders.mk,v 1.2 2010/11/15 14:50:04 drochner Exp $
2# 2#
3# This Makefile fragment is intended to be included by packages that install 3# This Makefile fragment is intended to be included by packages that install
4# GTK2 modules. It takes care of rebuilding the corresponding databases at 4# GTK2 modules. It takes care of rebuilding the corresponding databases at
5# (de)installation time. 5# (de)installation time.
6# 
7# The following variables can be defined: 
8# GTK2_LOADERS - Set to YES if the package installs pixbuf loaders. 
9# 
10 6
11.if !defined(GTK2_LOADERS_MK) 7.if !defined(GTK2_LOADERS_MK)
12GTK2_LOADERS_MK= # defined 8GTK2_LOADERS_MK= # defined
13 9
14.if defined(_BUILDING_GTK2) 10.if defined(_BUILDING_GTK2)
15BUILDLINK_PREFIX.gdk-pixbuf2= ${PREFIX} 11BUILDLINK_PREFIX.gdk-pixbuf2= ${PREFIX}
16GTK2_LOADERS= YES 
17.endif 12.endif
18 13
19GDK_PIXBUF_QUERY_LOADERS= \ 14GDK_PIXBUF_QUERY_LOADERS= \
20 ${BUILDLINK_PREFIX.gdk-pixbuf2}/bin/gdk-pixbuf-query-loaders 15 ${BUILDLINK_PREFIX.gdk-pixbuf2}/bin/gdk-pixbuf-query-loaders
21 
22.if defined(GTK2_LOADERS) && !empty(GTK2_LOADERS:M[Yy][Ee][Ss]) 
23GDK_PIXBUF_LOADERS_DB= \ 16GDK_PIXBUF_LOADERS_DB= \
24 ${BUILDLINK_PREFIX.gdk-pixbuf2}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache 17 ${BUILDLINK_PREFIX.gdk-pixbuf2}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
25FILES_SUBST+= GDK_PIXBUF_LOADERS_DB=${GDK_PIXBUF_LOADERS_DB:Q} 18FILES_SUBST+= GDK_PIXBUF_LOADERS_DB=${GDK_PIXBUF_LOADERS_DB:Q}
26FILES_SUBST+= GDK_PIXBUF_QUERY_LOADERS=${GDK_PIXBUF_QUERY_LOADERS:Q} 19FILES_SUBST+= GDK_PIXBUF_QUERY_LOADERS=${GDK_PIXBUF_QUERY_LOADERS:Q}
27INSTALL_TEMPLATES+= ../../graphics/gdk-pixbuf2/files/loaders.tmpl 20INSTALL_TEMPLATES+= ../../graphics/gdk-pixbuf2/files/loaders.tmpl
28DEINSTALL_TEMPLATES+= ../../graphics/gdk-pixbuf2/files/loaders.tmpl 21DEINSTALL_TEMPLATES+= ../../graphics/gdk-pixbuf2/files/loaders.tmpl
29.endif 
30 22
31#PRINT_PLIST_AWK+= /^lib\/gdk-pixbuf-2.0/2.10.0/loaders.cache { next; } 23#PRINT_PLIST_AWK+= /^lib\/gdk-pixbuf-2.0/2.10.0/loaders.cache { next; }
32 24
33.if !defined(_BUILDING_GTK2) 25.if !defined(_BUILDING_GTK2)
34. include "../../graphics/gdk-pixbuf2/buildlink3.mk" 26. include "../../graphics/gdk-pixbuf2/buildlink3.mk"
35.endif 27.endif
36 28
37.endif # GTK2_LOADERS_MK 29.endif # GTK2_LOADERS_MK
cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/gdk-pixbuf2-jasper/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/gdk-pixbuf2-jasper/Attic/Makefile 2010/11/14 20:13:40 1.1.1.1
+++ pkgsrc/graphics/gdk-pixbuf2-jasper/Attic/Makefile 2010/11/15 14:50:04 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1.1.1 2010/11/14 20:13:40 drochner Exp $ 1# $NetBSD: Makefile,v 1.2 2010/11/15 14:50:04 drochner Exp $
2# 2#
3 3
4DISTNAME= gdk-pixbuf-2.22.1 4DISTNAME= gdk-pixbuf-2.22.1
5PKGNAME= gdk-pixbuf2-jasper-2.22.1 5PKGNAME= gdk-pixbuf2-jasper-2.22.1
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdk-pixbuf/2.22/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdk-pixbuf/2.22/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.22/ 11HOMEPAGE= ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.22/
12COMMENT= Image loaders for gtk2 - jasper module 12COMMENT= Image loaders for gtk2 - jasper module
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -23,20 +23,19 @@ CONFIGURE_ARGS+= --with-libjasper @@ -23,20 +23,19 @@ CONFIGURE_ARGS+= --with-libjasper
23USE_LIBTOOL= yes 23USE_LIBTOOL= yes
24USE_TOOLS+= pkg-config 24USE_TOOLS+= pkg-config
25 25
26BUILD_DIRS= gdk-pixbuf 26BUILD_DIRS= gdk-pixbuf
27BUILD_TARGET= libpixbufloader-jasper.la 27BUILD_TARGET= libpixbufloader-jasper.la
28 28
29do-install: 29do-install:
30 ${INSTALL_DATA_DIR} \ 30 ${INSTALL_DATA_DIR} \
31 ${DESTDIR}${PREFIX}/lib/gdk-pixbuf-2.0/2.10.0/loaders 31 ${DESTDIR}${PREFIX}/lib/gdk-pixbuf-2.0/2.10.0/loaders
32 cd ${WRKSRC}/gdk-pixbuf && ${LIBTOOL} --mode=install \ 32 cd ${WRKSRC}/gdk-pixbuf && ${LIBTOOL} --mode=install \
33 ${INSTALL_DATA} libpixbufloader-jasper.la \ 33 ${INSTALL_DATA} libpixbufloader-jasper.la \
34 ${DESTDIR}${PREFIX}/lib/gdk-pixbuf-2.0/2.10.0/loaders 34 ${DESTDIR}${PREFIX}/lib/gdk-pixbuf-2.0/2.10.0/loaders
35 35
36GTK2_LOADERS= yes 
37.include "../../graphics/gdk-pixbuf2/loaders.mk" 36.include "../../graphics/gdk-pixbuf2/loaders.mk"
38 37
39BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0 38BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0
40.include "../../devel/glib2/buildlink3.mk" 39.include "../../devel/glib2/buildlink3.mk"
41.include "../../graphics/jasper/buildlink3.mk" 40.include "../../graphics/jasper/buildlink3.mk"
42.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"