diff options
Diffstat (limited to 'x11')
40 files changed, 85 insertions, 85 deletions
diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile index 0f2359593bd..735ce1c8fad 100644 --- a/x11/XmHTML/Makefile +++ b/x11/XmHTML/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2010/06/13 22:45:35 wiz Exp $ +# $NetBSD: Makefile,v 1.48 2010/12/23 11:44:59 dsainty Exp $ # DISTNAME= XmHTML-1.1.7 @@ -23,7 +23,7 @@ do-install: ${WRKSRC}/lib/libXmHTML.la ${DESTDIR}${PREFIX}/lib ${INSTALL_DATA} ${WRKSRC}/include/XmHTML/*.h ${DESTDIR}${PREFIX}/include/XmHTML -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../mk/motif.buildlink3.mk" diff --git a/x11/XmHTML/buildlink3.mk b/x11/XmHTML/buildlink3.mk index a326b7c6672..cd6e8f95f35 100644 --- a/x11/XmHTML/buildlink3.mk +++ b/x11/XmHTML/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:45:35 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2010/12/23 11:44:59 dsainty Exp $ BUILDLINK_TREE+= XmHTML @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.XmHTML+= XmHTML>=1.1.7nb2 BUILDLINK_ABI_DEPENDS.XmHTML+= XmHTML>=1.1.7nb9 BUILDLINK_PKGSRCDIR.XmHTML?= ../../x11/XmHTML -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .endif # XMHTML_BUILDLINK3_MK diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile index c8099fe1125..9dd9d2ed075 100644 --- a/x11/aterm/Makefile +++ b/x11/aterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2010/06/13 22:45:35 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2010/12/23 11:44:59 dsainty Exp $ # DISTNAME= aterm-1.0.0 @@ -27,8 +27,8 @@ CONFIGURE_ARGS+=--enable-background-image \ --with-xpm-includes=${BUILDLINK_PREFIX.libXpm}/include \ --with-xpm-library=${BUILDLINK_PREFIX.libXpm}/lib \ --with-jpeg \ - --with-jpeg-includes=${BUILDLINK_PREFIX.jpeg}/include \ - --with-jpeg-library=${BUILDLINK_PREFIX.jpeg}/lib \ + --with-jpeg-includes=${JPEGBASE}/include \ + --with-jpeg-library=${JPEGBASE}/lib \ --with-png \ --with-png-library=${BUILDLINK_PREFIX.png}/lib \ --with-png-includes=${BUILDLINK_PREFIX.png}/include \ @@ -49,7 +49,7 @@ SPECIAL_PERMS= ${PREFIX}/bin/aterm ${SETUID_ROOT_PERMS} BUILDLINK_DEPMETHOD.libXt?= build -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" diff --git a/x11/efltk/Makefile b/x11/efltk/Makefile index 5519c4fb59d..1f79009de83 100644 --- a/x11/efltk/Makefile +++ b/x11/efltk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:36 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2010/12/23 11:44:59 dsainty Exp $ # DISTNAME= efltk-2.0.5 @@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --disable-shared .include "options.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/x11/efltk/buildlink3.mk b/x11/efltk/buildlink3.mk index 5ae31347152..bc1cc086ea7 100644 --- a/x11/efltk/buildlink3.mk +++ b/x11/efltk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:45:36 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2010/12/23 11:44:59 dsainty Exp $ BUILDLINK_TREE+= efltk @@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.efltk?= efltk>=2.0.5nb10 BUILDLINK_PKGSRCDIR.efltk?= ../../x11/efltk .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile index 929ca9890e1..a88d1997370 100644 --- a/x11/fltk/Makefile +++ b/x11/fltk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.72 2010/06/13 22:45:36 wiz Exp $ +# $NetBSD: Makefile,v 1.73 2010/12/23 11:45:00 dsainty Exp $ DISTNAME= fltk-1.1.10-source PKGNAME= ${DISTNAME:S/-source//} @@ -38,7 +38,7 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" diff --git a/x11/fltk/buildlink3.mk b/x11/fltk/buildlink3.mk index 94f7265a085..c796637cd83 100644 --- a/x11/fltk/buildlink3.mk +++ b/x11/fltk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:45:36 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2010/12/23 11:45:00 dsainty Exp $ BUILDLINK_TREE+= fltk @@ -12,7 +12,7 @@ BUILDLINK_FILES.fltk+= include/Fl/* .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/x11/fltk2/Makefile b/x11/fltk2/Makefile index b41bc1c65bb..5324410434d 100644 --- a/x11/fltk2/Makefile +++ b/x11/fltk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:36 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2010/12/23 11:45:00 dsainty Exp $ VERS= 6129 PKGREVISION= 4 @@ -27,7 +27,7 @@ CONFIGURE_ARGS+= ac_cv_have_overlay=yes .include "options.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" diff --git a/x11/fltk2/buildlink3.mk b/x11/fltk2/buildlink3.mk index c747c02a271..c143661aff9 100644 --- a/x11/fltk2/buildlink3.mk +++ b/x11/fltk2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:36 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2010/12/23 11:45:00 dsainty Exp $ BUILDLINK_TREE+= fltk2 @@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.fltk2?= ../../x11/fltk2 .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" diff --git a/x11/fox/Makefile b/x11/fox/Makefile index 0ce8a777e9c..9f45ab0ecca 100644 --- a/x11/fox/Makefile +++ b/x11/fox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2010/06/13 22:45:36 wiz Exp $ +# $NetBSD: Makefile,v 1.44 2010/12/23 11:45:00 dsainty Exp $ DISTNAME= fox-1.6.33 PKGREVISION= 3 @@ -35,7 +35,7 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../archivers/bzip2/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/x11/fox/buildlink3.mk b/x11/fox/buildlink3.mk index 6f7fe3c69d5..910efdfd5d1 100644 --- a/x11/fox/buildlink3.mk +++ b/x11/fox/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2010/06/13 22:45:36 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2010/12/23 11:45:00 dsainty Exp $ BUILDLINK_TREE+= fox @@ -12,7 +12,7 @@ BUILDLINK_INCDIRS.fox?= include/fox-1.6 .include "../../archivers/bzip2/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" diff --git a/x11/gnustep-gui/Makefile b/x11/gnustep-gui/Makefile index 8f8adf75def..f5773280f75 100644 --- a/x11/gnustep-gui/Makefile +++ b/x11/gnustep-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2010/06/13 22:45:38 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2010/12/23 11:45:00 dsainty Exp $ DISTNAME= gnustep-gui-0.16.0 PKGREVISION= 3 @@ -22,7 +22,7 @@ INSTALLATION_DIRS+= share/GNUstep/Applications .include "../../audio/libaudiofile/buildlink3.mk" .include "../../devel/gnustep-base/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index 50b59109e89..c0f121ffcc8 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.209 2010/11/23 13:31:33 tnn Exp $ +# $NetBSD: Makefile,v 1.210 2010/12/23 11:45:01 dsainty Exp $ DISTNAME= gtk+-2.22.1 PKGNAME= ${DISTNAME:S/gtk/gtk2/} @@ -104,7 +104,7 @@ BUILDLINK_API_DEPENDS.pango+= pango>=1.20.0 BUILDLINK_API_DEPENDS.cairo+= cairo>=1.6.0 .include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -#.include "../../graphics/jpeg/buildlink3.mk" +#.include "../../mk/jpeg.buildlink3.mk" #.include "../../graphics/png/buildlink3.mk" #.include "../../graphics/tiff/buildlink3.mk" .include "../../lang/python/application.mk" diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 1dff854e61c..55e0a356ea5 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.150 2010/07/14 11:11:14 sbd Exp $ +# $NetBSD: Makefile,v 1.151 2010/12/23 11:45:01 dsainty Exp $ DISTNAME= kdelibs-${_KDE_VERSION} PKGREVISION= 9 @@ -101,7 +101,7 @@ GCC_REQD+= 2.95 .include "../../devel/libidn/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libart/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" diff --git a/x11/kdelibs3/buildlink3.mk b/x11/kdelibs3/buildlink3.mk index 2fb9b4cc638..a5f344c7754 100644 --- a/x11/kdelibs3/buildlink3.mk +++ b/x11/kdelibs3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.35 2010/07/14 11:11:14 sbd Exp $ +# $NetBSD: buildlink3.mk,v 1.36 2010/12/23 11:45:01 dsainty Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -23,7 +23,7 @@ pkgbase := kdelibs .include "../../devel/libidn/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libart/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 6b7d8b3a47c..9d4a7fdace3 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2010/12/06 11:43:43 markd Exp $ +# $NetBSD: Makefile,v 1.20 2010/12/23 11:45:01 dsainty Exp $ DISTNAME= kdelibs-${_KDE_VERSION} CATEGORIES= x11 @@ -77,7 +77,7 @@ BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.4 .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" .include "../../misc/attica/buildlink3.mk" diff --git a/x11/kdelibs4/buildlink3.mk b/x11/kdelibs4/buildlink3.mk index b0ed19becf2..ea439629fee 100644 --- a/x11/kdelibs4/buildlink3.mk +++ b/x11/kdelibs4/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2010/11/15 22:59:04 abs Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2010/12/23 11:45:01 dsainty Exp $ BUILDLINK_TREE+= kdelibs @@ -14,7 +14,7 @@ BUILDLINK_PKGSRCDIR.kdelibs?= ../../x11/kdelibs4 .include "../../devel/pcre/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" .include "../../multimedia/phonon/buildlink3.mk" diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile index 5efc04f1667..ad803226194 100644 --- a/x11/mrxvt/Makefile +++ b/x11/mrxvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2010/06/13 22:45:48 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2010/12/23 11:45:01 dsainty Exp $ # DISTNAME= mrxvt-0.5.4 @@ -50,7 +50,7 @@ SPECIAL_PERMS= ${PREFIX}/bin/mrxvt ${SETUID_ROOT_PERMS} BUILDLINK_DEPMETHOD.libXt+= build -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile index 3bb943d8c86..613a6e77508 100644 --- a/x11/openmotif/Makefile +++ b/x11/openmotif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2010/06/13 22:45:48 wiz Exp $ +# $NetBSD: Makefile,v 1.66 2010/12/23 11:45:01 dsainty Exp $ PKGVER= 2.3.1 DISTNAME= openmotif-${PKGVER} @@ -53,8 +53,8 @@ SUBST_SED.man_rename+= -e 's: Shell.3: XShell.3:g' CONFIGURE_ARGS+= \ --enable-jpeg --enable-png \ - --with-libjpeg-includes=${BUILDLINK_PREFIX.jpeg}/include \ - --with-libjpeg-lib=${BUILDLINK_PREFIX.jpeg}/lib \ + --with-libjpeg-includes=${JPEGBASE}/include \ + --with-libjpeg-lib=${JPEGBASE}/lib \ --with-libpng-includes=${BUILDLINK_PREFIX.png}/include \ --with-libpng-lib=${BUILDLINK_PREFIX.png}/lib \ --x-libraries=${X11BASE}/lib @@ -109,7 +109,7 @@ post-build: ${MV} -f $${manpage}.tblized $${manpage}; \ done -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk" diff --git a/x11/openmotif/buildlink3.mk b/x11/openmotif/buildlink3.mk index 45ae625b333..91d01410073 100644 --- a/x11/openmotif/buildlink3.mk +++ b/x11/openmotif/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:45:48 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2010/12/23 11:45:01 dsainty Exp $ BUILDLINK_TREE+= openmotif @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.openmotif+= openmotif>=2.3.1 BUILDLINK_ABI_DEPENDS.openmotif?= openmotif>=2.3.1nb4 BUILDLINK_PKGSRCDIR.openmotif?= ../../x11/openmotif -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk" diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile index 526ee6899b2..37486c0f3f2 100644 --- a/x11/p5-Tk/Makefile +++ b/x11/p5-Tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2010/09/12 12:59:47 wiz Exp $ +# $NetBSD: Makefile,v 1.69 2010/12/23 11:45:02 dsainty Exp $ DISTNAME= Tk-804.029 PKGNAME= p5-${DISTNAME} @@ -36,6 +36,6 @@ pre-configure: .include "../../lang/perl5/module.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile index 10e6818f19a..3c0ef745fcc 100644 --- a/x11/qt3-libs/Makefile +++ b/x11/qt3-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2010/06/13 22:45:50 wiz Exp $ +# $NetBSD: Makefile,v 1.76 2010/12/23 11:45:02 dsainty Exp $ PKGNAME= qt3-libs-${QTVERSION} PKGREVISION= 14 @@ -55,7 +55,7 @@ SUBST_SED.socklen= -e 's/QT_SOCKLEN_T.*/QT_SOCKLEN_T socklen_t/' .endif .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../graphics/mng/buildlink3.mk" diff --git a/x11/qt3-libs/buildlink3.mk b/x11/qt3-libs/buildlink3.mk index a93462e475e..d26cccc020a 100644 --- a/x11/qt3-libs/buildlink3.mk +++ b/x11/qt3-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.26 2010/11/18 07:48:45 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.27 2010/12/23 11:45:02 dsainty Exp $ BUILDLINK_TREE+= qt3-libs @@ -19,7 +19,7 @@ QTDIR= ${BUILDLINK_PREFIX.qt3-libs}/qt3 PTHREAD_OPTS+= require .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../graphics/mng/buildlink3.mk" diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile index 7fa53bdf176..874448b190c 100644 --- a/x11/qt4-libs/Makefile +++ b/x11/qt4-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2010/11/15 22:59:09 abs Exp $ +# $NetBSD: Makefile,v 1.53 2010/12/23 11:45:02 dsainty Exp $ PKG_DESTDIR_SUPPORT= user-destdir @@ -116,7 +116,7 @@ SUBST_SED.socklen= -e 's/QT_SOCKLEN_T.*/QT_SOCKLEN_T socklen_t/' .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" diff --git a/x11/qt4-libs/buildlink3.mk b/x11/qt4-libs/buildlink3.mk index 8924dda4fec..3a564182e83 100644 --- a/x11/qt4-libs/buildlink3.mk +++ b/x11/qt4-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2010/11/18 07:48:46 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2010/12/23 11:45:02 dsainty Exp $ BUILDLINK_TREE+= qt4-libs @@ -21,7 +21,7 @@ PTHREAD_OPTS+= require .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libXcursor/buildlink3.mk" diff --git a/x11/ssystem/Makefile b/x11/ssystem/Makefile index 9dc017bc793..fac3073bb0e 100644 --- a/x11/ssystem/Makefile +++ b/x11/ssystem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2010/01/18 09:59:44 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2010/12/23 11:45:02 dsainty Exp $ # DISTNAME= ssystem-1.6 @@ -34,5 +34,5 @@ do-install: ${INSTALL_DATA} hires/README ${DESTDIR}${PREFIX}/share/ssystem/hires .include "../../graphics/Mesa/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile index 31e497079fe..559a55a12f6 100644 --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2010/06/13 22:45:53 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2010/12/23 11:45:02 dsainty Exp $ DISTNAME= wdm-1.28 PKGREVISION= 4 @@ -54,7 +54,7 @@ CONFIGURE_ARGS+= --with-winmgr=${wmanager:Q} INSTALLATION_DIRS += share/pixmaps/wdm share/examples/wdm -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" diff --git a/x11/wxGTK24/Makefile.common b/x11/wxGTK24/Makefile.common index 8822812a207..d3ffd0523ae 100644 --- a/x11/wxGTK24/Makefile.common +++ b/x11/wxGTK24/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2010/08/18 10:05:08 obache Exp $ +# $NetBSD: Makefile.common,v 1.8 2010/12/23 11:45:02 dsainty Exp $ # DISTNAME= wxGTK-2.4.2 @@ -43,7 +43,7 @@ PLIST_SUBST+= GTKVER=2 .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/wxGTK24/buildlink3.mk b/x11/wxGTK24/buildlink3.mk index 7f7c0cdd20a..01cecc50456 100644 --- a/x11/wxGTK24/buildlink3.mk +++ b/x11/wxGTK24/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2010/11/15 22:59:14 abs Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2010/12/23 11:45:02 dsainty Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -13,7 +13,7 @@ BUILDLINK_PKGSRCDIR.wxGTK24?= ../../x11/wxGTK24 .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/wxGTK26-contrib/buildlink3.mk b/x11/wxGTK26-contrib/buildlink3.mk index d0702854519..2b91aa0ef83 100644 --- a/x11/wxGTK26-contrib/buildlink3.mk +++ b/x11/wxGTK26-contrib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2010/11/15 22:59:14 abs Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2010/12/23 11:45:03 dsainty Exp $ BUILDLINK_TREE+= wxGTK-contrib @@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.wxGTK-contrib?= ../../x11/wxGTK26-contrib .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/wxGTK26/Makefile.common b/x11/wxGTK26/Makefile.common index 513f6345286..92c1d4ec07c 100644 --- a/x11/wxGTK26/Makefile.common +++ b/x11/wxGTK26/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2008/09/22 19:58:52 joerg Exp $ +# $NetBSD: Makefile.common,v 1.3 2010/12/23 11:45:03 dsainty Exp $ # DISTNAME= wxGTK-2.6.3 @@ -46,7 +46,7 @@ DOCDIR= ${PREFIX}/share/doc/wxGTK .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/wxGTK26/buildlink3.mk b/x11/wxGTK26/buildlink3.mk index 9445dbcc813..afded6a2d1a 100644 --- a/x11/wxGTK26/buildlink3.mk +++ b/x11/wxGTK26/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2010/11/15 22:59:14 abs Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2010/12/23 11:45:03 dsainty Exp $ BUILDLINK_TREE+= wxGTK @@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK26 .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/wxGTK28-contrib/buildlink3.mk b/x11/wxGTK28-contrib/buildlink3.mk index 3d419b71d0e..736d84ea90d 100644 --- a/x11/wxGTK28-contrib/buildlink3.mk +++ b/x11/wxGTK28-contrib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2010/11/15 22:59:14 abs Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2010/12/23 11:45:03 dsainty Exp $ BUILDLINK_TREE+= wxGTK28-contrib @@ -14,7 +14,7 @@ BUILDLINK_PKGSRCDIR.wxGTK28-contrib?= ../../x11/wxGTK28-contrib .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/wxGTK28/Makefile.common b/x11/wxGTK28/Makefile.common index 9eeebe6797d..7a3f60db993 100644 --- a/x11/wxGTK28/Makefile.common +++ b/x11/wxGTK28/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2010/06/15 13:15:15 dsainty Exp $ +# $NetBSD: Makefile.common,v 1.7 2010/12/23 11:45:03 dsainty Exp $ # # used by x11/wxGTK28/Makefile @@ -62,7 +62,7 @@ pre-configure: .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" diff --git a/x11/wxGTK28/buildlink3.mk b/x11/wxGTK28/buildlink3.mk index b28dad70f87..3cbfdab9465 100644 --- a/x11/wxGTK28/buildlink3.mk +++ b/x11/wxGTK28/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2010/11/15 22:59:14 abs Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2010/12/23 11:45:03 dsainty Exp $ BUILDLINK_TREE+= wxGTK28 @@ -13,7 +13,7 @@ BUILDLINK_PKGSRCDIR.wxGTK28?= ../../x11/wxGTK28 .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile index b928820dd19..0b7f3489d1d 100644 --- a/x11/xforms/Makefile +++ b/x11/xforms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2010/01/18 09:59:45 wiz Exp $ +# $NetBSD: Makefile,v 1.65 2010/12/23 11:45:03 dsainty Exp $ # DISTNAME= xforms-1.0 @@ -18,7 +18,7 @@ MAKE_ENV= DEPEND_DEFINES=${CPPFLAGS:M*:Q} MAKE_FLAGS+= MANPATH=${PREFIX}/${PKGMANDIR} SCRIPTS_ENV= DEPEND_DEFINES="${CPPFLAGS}" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" diff --git a/x11/xforms/buildlink3.mk b/x11/xforms/buildlink3.mk index a65b0b3d254..5c98f7fbbc9 100644 --- a/x11/xforms/buildlink3.mk +++ b/x11/xforms/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2010/01/18 09:59:45 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2010/12/23 11:45:03 dsainty Exp $ BUILDLINK_TREE+= xforms @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.xforms+= xforms>=1.0nb2 BUILDLINK_ABI_DEPENDS.xforms+= xforms>=1.0nb7 BUILDLINK_PKGSRCDIR.xforms?= ../../x11/xforms -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .endif # XFORMS_BUILDLINK3_MK diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile index 2e94376356b..2b9942413ac 100644 --- a/x11/xplanet/Makefile +++ b/x11/xplanet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2010/09/14 11:13:17 wiz Exp $ +# $NetBSD: Makefile,v 1.48 2010/12/23 11:45:04 dsainty Exp $ DISTNAME= xplanet-1.2.1 PKGREVISION= 4 @@ -25,7 +25,7 @@ INSTALLATION_DIRS+= ${XPLANET_DIRS:C,.*,share/xplanet/&,g} .include "options.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/netpbm/buildlink3.mk" diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index e2d6b089b43..e34d89974a5 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.103 2010/11/29 18:04:35 drochner Exp $ +# $NetBSD: Makefile.common,v 1.104 2010/12/23 11:45:04 dsainty Exp $ # # When updating the package, @@ -19,7 +19,7 @@ USE_TOOLS+= msgfmt perl GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-hackdir=${PREFIX}/libexec/xscreensaver -CONFIGURE_ARGS+= --with-jpeg=${BUILDLINK_PREFIX.jpeg} +CONFIGURE_ARGS+= --with-jpeg=${JPEGBASE} CONFIGURE_ARGS+= --with-zippy=/usr/games/fortune CONFIGURE_ARGS+= --without-motif @@ -63,6 +63,6 @@ GCC_REQD+= 2.95.3 INSTALL_MAKE_FLAGS= install_prefix=${DESTDIR} .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" diff --git a/x11/xvidcap/Makefile.common b/x11/xvidcap/Makefile.common index 2f0f9649f3e..c0b8f10bccf 100644 --- a/x11/xvidcap/Makefile.common +++ b/x11/xvidcap/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2008/12/18 17:28:17 bjs Exp $ +# $NetBSD: Makefile.common,v 1.8 2010/12/23 11:45:04 dsainty Exp $ # DISTNAME= xvidcap-1.1.3 @@ -16,7 +16,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-forced-embedded-ffmpeg .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../multimedia/ffmpeg/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" |