summaryrefslogtreecommitdiff
path: root/x11/aterm
diff options
context:
space:
mode:
authordsainty <dsainty@pkgsrc.org>2010-12-23 11:44:24 +0000
committerdsainty <dsainty@pkgsrc.org>2010-12-23 11:44:24 +0000
commitada744dc0ade9830fd0c65e80d3c3acc4c19910b (patch)
tree370b3e11e9340fe354eee027148337aef6427d42 /x11/aterm
parent8a8c10ccb4ed597d03b89dfad6e2923068e73c23 (diff)
downloadpkgsrc-ada744dc0ade9830fd0c65e80d3c3acc4c19910b.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 'x11/aterm')
-rw-r--r--x11/aterm/Makefile8
1 files changed, 4 insertions, 4 deletions
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"