Pullup ticket #4032 - requested by tron
pkgtools/x11-links: avoid spurious warnings for MacOS

Revisions pulled up:
- pkgtools/x11-links/xorg-version.mk                            1.3

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Wed Jan 23 15:25:05 UTC 2013

   Modified Files:
   	pkgsrc/pkgtools/x11-links: xorg-version.mk

   Log Message:
   Remove code which tries to use "Xquartz" to find out the X.org version
   (presumably only under Mac OS X Mountain Lion). "Xquarty" simply doesn't
   print out anything if you run it with "-version".

   This avoids a lot of warning messages from "bmake" while building packages
   that use X11.


   To generate a diff of this commit:
   cvs rdiff -u -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/xorg-version.mk
Pullup ticket #4035 - requested by tron
mk/bsd.prefs.mk: build fix for MacOS

Revisions pulled up:
- mk/bsd.prefs.mk                                               1.330

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Wed Jan 23 17:02:24 UTC 2013

   Modified Files:
   	pkgsrc/mk: bsd.prefs.mk

   Log Message:
   X11 (from the Xquartz distribution) gets installed under "/opt/X11" under
   Mac OS X Mountain Lion. "/usr/X11" is only a symbolic link. Use the correct
   path because buidlink3 will otherwise filter out "-I/opt/X11/include" which
   causes build failures of e.g. the "cairo" package.


   To generate a diff of this commit:
   cvs rdiff -u -r1.329 -r1.330 pkgsrc/mk/bsd.prefs.mk
Pullup ticket #4037 - requested by obache
emulators/suse121_freetype2: security update

Revisions pulled up:
- emulators/suse121_freetype2/Makefile                          1.3
- emulators/suse121_freetype2/distinfo                          1.3

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	obache
   Date:		Thu Jan 24 10:21:59 UTC 2013

   Modified Files:
   	pkgsrc/emulators/suse121_freetype2: Makefile distinfo

   Log Message:
   Update libfreetype6 rpm to 2.4.7-9.1 for CVE-2012-5668 and CVE-2012-5669.

   Bump PKGREVISION.


   To generate a diff of this commit:
   cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/suse121_freetype2/Makefile \
        pkgsrc/emulators/suse121_freetype2/distinfo
Pullup ticket #4038 - requested by obache
emulators/suse121_qt4: security update

Revisions pulled up:
- emulators/suse121_qt4/Makefile                                1.2
- emulators/suse121_qt4/distinfo                                1.2

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	obache
   Date:		Thu Jan 24 10:28:53 UTC 2013

   Modified Files:
   	pkgsrc/emulators/suse121_qt4: Makefile distinfo

   Log Message:
   Update libqt4 RPMs to 4.7.4-19.13.1 for CVE-2012-4929 and CVE-2012-5624.

   Bump PKGREVISION.


   To generate a diff of this commit:
   cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/emulators/suse121_qt4/Makefile \
        pkgsrc/emulators/suse121_qt4/distinfo
Pullup ticket #4039 - requested by tron
mk/checksum/checksum.mk: build fix for MacOS

Revisions pulled up:
- mk/checksum/checksum.mk                                       1.17

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Thu Jan 24 11:20:56 UTC 2013

   Modified Files:
   	pkgsrc/mk/checksum: checksum.mk

   Log Message:
   Force using the C locale while checking or generating patch file checksums.
   Mac OS X Mountain Lion's "sed" will otherwise reject some patch files
   (e.g. "pkgsrc/devel/libcfg+/patches/patch-ab") because of broken
   UTF-8 encoding.

   It would probably be better not to use the bundled "sed" under
   Mac OS X Mountain Lion at all. But it seems that this is not
   supported by "pkgsrc" at the moment.


   To generate a diff of this commit:
   cvs rdiff -u -r1.16 -r1.17 pkgsrc/mk/checksum/checksum.mk
pullups 4032, 4035, 4037, 4038 and 4039