diff options
| author | dsainty <dsainty> | 2010-12-23 11:44:24 +0000 |
|---|---|---|
| committer | dsainty <dsainty> | 2010-12-23 11:44:24 +0000 |
| commit | 8c7ca6a8c0860ebd3e39de2d607b75770e220d80 (patch) | |
| tree | 370b3e11e9340fe354eee027148337aef6427d42 /wm/ctwm | |
| parent | 33632049673fa741e8d8f1cdb7f03211ccd47938 (diff) | |
| download | pkgsrc-8c7ca6a8c0860ebd3e39de2d607b75770e220d80.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/ctwm')
| -rw-r--r-- | wm/ctwm/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
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" |