#4498 xft2-dev-2.2.0-4 NFC modifications to avoid X11 convenience symlinks

[Jack Howarth]

The attached xft2-dev.info and xft2-dev.patch (with the same revision because of no functional change) avoids the X11 convenience symlinks during the build. The changes to the patch are...

Index: xft2-dev.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/x11/xft2-dev.patch,v
retrieving revision 1.3
diff -r1.3 xft2-dev.patch
43c43
< +Cflags: -I${includedir} -I/usr/X11/include -I/usr/X11R6/include
---
> +Cflags: -I${includedir} -I@X11DIR@/include

and the changes to the info file are...

Index: xft2-dev.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/x11/xft2-dev.info,v
retrieving revision 1.5
diff -r1.5 xft2-dev.info
22,23c22,34
< PatchFile-MD5: 0f9829c8f8394644c672621315c78a68
< ConfigureParams: --prefix=%p/lib/xft2 --mandir=%p/share/man --disable-silent-rules --enable-dependency-tracking --disable-static
---
> PatchFile-MD5: 7047349c61bad2e4f5ca16334a1bf828
> ConfigureParams: --prefix=%p/lib/xft2 --mandir=%p/share/man --disable-silent-rules --enable-dependency-tracking --disable-static --x-includes=$X11DIR/include --x-libraries=$X11DIR/lib
> PatchScript: <<
> #!/bin/sh -ev
> # avoid convenience symlinks
> darwin_vers=`uname -r | cut -d. -f1`
> if [ "$darwin_vers" -ge 12 ]; then
>   X11DIR=/opt/X11
> else
>   X11DIR=/usr/X11
> fi
> sed "s|@X11DIR@|$X11DIR|g" < %{PatchFile} | patch -p1
> <<
26c37,45
<   %{default_script}
---
>   # avoid convenience symlinks
>   darwin_vers=`uname -r | cut -d. -f1`
>   if [ "$darwin_vers" -ge 12 ]; then
>       X11DIR=/opt/X11
>   else
>       X11DIR=/usr/X11
>   fi
>   ./configure %c
>   make

Tested with 'fink -m' on future os missing the X11 convenience symlinks due to rootless.

[Jack Howarth]

Info file for avoiding X11 convenience symlinks in xft2-dev-2.2.0-4 build.

[Jack Howarth]

Patch file for avoiding X11 convenience symlinks in xft2-dev-2.2.0-4 build.

[Jack Howarth]

Revised info file to use fink-buildenv-modules (>= 0.1.3-1)...

Index: xft2-dev.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/x11/xft2-dev.info,v
retrieving revision 1.5
diff -r1.5 xft2-dev.info
12a13
>   fink-buildenv-modules (>= 0.1.3-1),
22,23c23,29
< PatchFile-MD5: 0f9829c8f8394644c672621315c78a68
< ConfigureParams: --prefix=%p/lib/xft2 --mandir=%p/share/man --disable-silent-rules --enable-dependency-tracking --disable-static
---
> PatchFile-MD5: 7047349c61bad2e4f5ca16334a1bf828
> ConfigureParams: --prefix=%p/lib/xft2 --mandir=%p/share/man --disable-silent-rules --enable-dependency-tracking --disable-static --x-includes=$X11_BASE_DIR/include --x-libraries=$X11_BASE_DIR/lib
> PatchScript: <<
> #!/bin/sh -ev
> . %p/sbin/fink-buildenv-helper.sh
> sed "s|@X11DIR@|$X11_BASE_DIR|g" < %{PatchFile} | patch -p1
> <<
26c32,34
<   %{default_script}
---
>   . %p/sbin/fink-buildenv-helper.sh
>   ./configure %c
>   make

[Daniel Macks]

Is it sufficient to simply remove the xft.pc.in chunk from the .patch? The change it makes is definitely not needed on 10.8+ and I'm pretty sure not on 10.7 either.

[Jack Howarth]

Revised Info file for avoiding X11 convenience symlinks in xft2-dev-2.2.0-4 build.

[Jack Howarth]

Revised Patch file for avoiding X11 convenience symlinks in xft2-dev-2.2.0-4 build.

[Jack Howarth]

The following works on future os...

Index: xft2-dev.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/x11/xft2-dev.info,v
retrieving revision 1.5
diff -r1.5 xft2-dev.info
12a13
>   fink-buildenv-modules (>= 0.1.3-1),
22,23c23,24
< PatchFile-MD5: 0f9829c8f8394644c672621315c78a68
< ConfigureParams: --prefix=%p/lib/xft2 --mandir=%p/share/man --disable-silent-rules --enable-dependency-tracking --disable-static
---
> PatchFile-MD5: 95f1a8efbec3abec682e76e2df8b792a
> ConfigureParams: --prefix=%p/lib/xft2 --mandir=%p/share/man --disable-silent-rules --enable-dependency-tracking --disable-static --x-includes=$X11_BASE_DIR/include --x-libraries=$X11_BASE_DIR/lib
25a27
>   . %p/sbin/fink-buildenv-helper.sh
Index: xft2-dev.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/x11/xft2-dev.patch,v
retrieving revision 1.3
diff -r1.3 xft2-dev.patch
32,44d31
< diff -Nurd -x'*~' libXft-2.2.0.orig/xft.pc.in libXft-2.2.0/xft.pc.in
< --- libXft-2.2.0.orig/xft.pc.in   2010-10-20 17:10:30.000000000 -0400
< +++ libXft-2.2.0/xft.pc.in    2011-04-22 16:54:45.000000000 -0400
< @@ -6,7 +6,6 @@
<  Name: Xft
<  Description: X FreeType library
<  Version: @VERSION@
< -Requires: xproto
< -Requires.private: xrender, fontconfig, freetype2
< -Cflags: -I${includedir}
< +Requires: fontconfig, freetype2
< +Cflags: -I${includedir} -I/usr/X11/include -I/usr/X11R6/include
<  Libs: -L${libdir} -lXft