summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authordsainty <dsainty>2010-12-23 11:44:24 +0000
committerdsainty <dsainty>2010-12-23 11:44:24 +0000
commit12cb97aee5a221de0ef52d6d283b031e561dbc13 (patch)
tree370b3e11e9340fe354eee027148337aef6427d42 /wm
parent2f054f5fab748fc7eb8b701eca53487d6102715d (diff)
downloadpkgsrc-12cb97aee5a221de0ef52d6d283b031e561dbc13.tar.gz
Mechanically replace references to graphics/jpeg with the suitable
alternative from mk/jpeg.buildlink3.mk This allows selection of an alternative jpeg library (namely the x86 MMX, SSE, SSE2 accelerated libjpeg-turbo) via JPEG_DEFAULT=libjpeg-turbo, and follows the current standard model for alternatives (fam, motif, fuse etc). The mechanical edits were applied via the following script: #!/bin/sh for d in */*; do [ -d "$d" ] || continue for i in "$d/"Makefile* "$d/"*.mk; do case "$i" in *.orig|*"*"*) continue;; esac out="$d/x" sed -e 's;graphics/jpeg/buildlink3\.mk;mk/jpeg.buildlink3.mk;g' \ -e 's;BUILDLINK_PREFIX\.jpeg;JPEGBASE;g' \ < "$i" > "$out" if cmp -s "$i" "$out"; then rm -f "$out" else echo "Edited $i" mv -f "$i" "$i.orig" && mv "$out" "$i" fi done done
Diffstat (limited to 'wm')
-rw-r--r--wm/compiz-fusion-plugins-extra/Makefile4
-rw-r--r--wm/compiz-fusion-plugins-main/Makefile4
-rw-r--r--wm/ctwm/Makefile8
-rw-r--r--wm/jwm/options.mk4
-rw-r--r--wm/pekwm/Makefile4
-rw-r--r--wm/windowmaker/Makefile4
-rw-r--r--wm/windowmaker/buildlink3.mk4
7 files changed, 16 insertions, 16 deletions
diff --git a/wm/compiz-fusion-plugins-extra/Makefile b/wm/compiz-fusion-plugins-extra/Makefile
index a8eeca1d09b..0cf3799f990 100644
--- a/wm/compiz-fusion-plugins-extra/Makefile
+++ b/wm/compiz-fusion-plugins-extra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/11/15 22:58:46 abs Exp $
+# $NetBSD: Makefile,v 1.10 2010/12/23 11:44:57 dsainty Exp $
#
PKGVER= 0.8.4
@@ -55,7 +55,7 @@ GCONF_SCHEMAS+= compiz-widget.schemas
.include "../../devel/GConf/schemas.mk"
.include "../../devel/compiz-bcop/buildlink3.mk"
.include "../../wm/compiz-fusion-plugins-main/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
.include "../../wm/compiz/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/compiz-fusion-plugins-main/Makefile b/wm/compiz-fusion-plugins-main/Makefile
index 46cc618adb1..ea29cd4add6 100644
--- a/wm/compiz-fusion-plugins-main/Makefile
+++ b/wm/compiz-fusion-plugins-main/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2010/11/15 22:58:46 abs Exp $
+# $NetBSD: Makefile,v 1.12 2010/12/23 11:44:57 dsainty Exp $
#
PKGVER= 0.8.4
@@ -54,7 +54,7 @@ GCONF_SCHEMAS+= compiz-workarounds.schemas
.include "../../devel/GConf/schemas.mk"
.include "../../devel/compiz-bcop/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
.include "../../wm/compiz/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/ctwm/Makefile b/wm/ctwm/Makefile
index 7e9728aff29..724d638401d 100644
--- a/wm/ctwm/Makefile
+++ b/wm/ctwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2010/05/15 00:05:00 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/12/23 11:44:57 dsainty Exp $
#
DISTNAME= ctwm-3.8a
@@ -26,8 +26,8 @@ EXTRA_DEFINES.SunOS+= -D__EXTENSIONS__
MAKE_ENV+= EXTRA_DEFINES=${EXTRA_DEFINES:Q}
pre-configure:
- ( ${ECHO} 'USER_JPEGLIBDIR = -L${BUILDLINK_PREFIX.jpeg}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.jpeg}/lib'; \
- ${ECHO} 'USER_JPEGINCDIR = -I${BUILDLINK_PREFIX.jpeg}/include'; \
+ ( ${ECHO} 'USER_JPEGLIBDIR = -L${JPEGBASE}/lib ${COMPILER_RPATH_FLAG}${JPEGBASE}/lib'; \
+ ${ECHO} 'USER_JPEGINCDIR = -I${JPEGBASE}/include'; \
${CAT} ${WRKSRC}/Imakefile.local-template; \
) >${WRKSRC}/Imakefile.local
@@ -42,7 +42,7 @@ pre-install:
${INSTALL_DATA} ${FILESDIR}/ctwm.desktop \
${DESTDIR}${PREFIX}/share/xsessions/ctwm.desktop
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXmu/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
diff --git a/wm/jwm/options.mk b/wm/jwm/options.mk
index 3407d3cbcd9..7a0fb2c2c88 100644
--- a/wm/jwm/options.mk
+++ b/wm/jwm/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2008/06/17 00:00:30 abs Exp $
+# $NetBSD: options.mk,v 1.4 2010/12/23 11:44:57 dsainty Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.jwm
PKG_SUPPORTED_OPTIONS= debug fribidi jpeg png
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+= --enable-debug
.endif
.if !empty(PKG_OPTIONS:Mjpeg)
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mpng)
diff --git a/wm/pekwm/Makefile b/wm/pekwm/Makefile
index 5ecd1e0e76e..fefc75f9ec0 100644
--- a/wm/pekwm/Makefile
+++ b/wm/pekwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2010/06/13 22:45:31 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/12/23 11:44:57 dsainty Exp $
#
DISTNAME= pekwm-0.1.12
@@ -28,7 +28,7 @@ CONF_FILES=
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index 9b603f4fc27..1a5197ddde9 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2010/06/13 22:45:31 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2010/12/23 11:44:58 dsainty Exp $
DISTNAME= WindowMaker-0.92.0
PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/}
@@ -97,7 +97,7 @@ post-install:
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../graphics/libungif/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/wm/windowmaker/buildlink3.mk b/wm/windowmaker/buildlink3.mk
index 34e88bd26fd..a90b69da4b7 100644
--- a/wm/windowmaker/buildlink3.mk
+++ b/wm/windowmaker/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:45:31 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2010/12/23 11:44:58 dsainty Exp $
BUILDLINK_TREE+= windowmaker
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.windowmaker+= windowmaker>=0.92.0nb12
BUILDLINK_PKGSRCDIR.windowmaker?= ../../wm/windowmaker
.include "../../devel/gettext-lib/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"