Permalink
Browse files

Initial 2011Q4 patch set.

Most of the patches included have been already committed upstream
to pkgsrc (to be included in the vanilla 2012Q1 release).
  • Loading branch information...
1 parent f560004 commit 6f6c6422d291209d0a53bb2f84be46138a800416 @mamash committed Mar 19, 2012
Showing with 6,383 additions and 4,740 deletions.
  1. +1 −0 archivers/bsdtar/Makefile
  2. +16 −0 archivers/bsdtar/options.mk
  3. +2 −2 archivers/gtar-base/Makefile
  4. +3 −0 archivers/libarchive/Makefile
  5. +16 −0 archivers/libarchive/options.mk
  6. +9 −2 archivers/pax/Makefile
  7. +1 −0 archivers/pax/PLIST
  8. +4 −0 archivers/unrar/Makefile
  9. +1 −1 archivers/zip/Makefile
  10. +7 −0 benchmarks/sysbench/Makefile
  11. +0 −3 bootstrap/bootstrap
  12. +40 −0 chat/ejabberd/transports.mk
  13. +2 −0 chat/gloox/Makefile
  14. +1 −0 chat/gloox/distinfo
  15. +12 −0 chat/gloox/patches/patch-src__dns.h
  16. +1 −0 chat/libpurple/distinfo
  17. +14 −0 chat/libpurple/patches/patch-libpurple__protocols__gg__lib__libgadu.h
  18. +2 −0 chat/spectrum/Makefile
  19. +1 −1 chat/spectrum/distinfo
  20. +15 −3 chat/spectrum/patches/patch-CMakeLists.txt
  21. +20 −0 converters/php-mbstring/Makefile
  22. +113 −0 converters/php-mbstring/PLIST.libmbfl
  23. +13 −0 converters/php-mbstring/buildlink3.mk
  24. +10 −0 databases/db4/Makefile
  25. +4,568 −4,568 databases/db4/PLIST
  26. +1 −1 databases/db4/distinfo
  27. +16 −0 databases/db4/options.mk
  28. +9 −0 databases/db4/patches/patch-aa
  29. +2 −0 databases/freetds/Makefile
  30. +7 −1 databases/mysql5-client/buildlink3.mk
  31. +4 −0 databases/mysql51-client/Makefile.common
  32. +1 −0 databases/mysql51-server/distinfo
  33. +13 −0 databases/mysql51-server/patches/patch-sql__ha_ndbcluster.cc
  34. +5 −4 databases/php-oci8/Makefile
  35. +4 −1 databases/postgresql-postgis/Makefile
  36. +2 −0 databases/postgresql-postgis/distinfo
  37. +22 −0 databases/postgresql-postgis/patches/patch-postgis_Makefile.in
  38. +17 −0 databases/postgresql-postgis/patches/patch-postgis__lwgeom_accum.c
  39. +8 −1 databases/postgresql84/options.mk
  40. +4 −0 databases/postgresql90-server/Makefile
  41. +8 −1 databases/postgresql90/options.mk
  42. +10 −0 databases/postgresql91-plperl/Makefile
  43. +4 −0 databases/postgresql91-server/Makefile
  44. +4 −0 databases/postgresql91/Makefile.common
  45. +8 −1 databases/postgresql91/options.mk
  46. +1 −0 databases/py-psycopg2/distinfo
  47. +13 −0 databases/py-psycopg2/patches/patch-psycopg_config.h
  48. +1 −0 devel/cvsps/Makefile
  49. +1 −1 devel/cvsps/distinfo
  50. +1 −1 devel/cvsps/patches/patch-aa
  51. +2 −0 devel/diffutils/Makefile
  52. +2 −0 devel/gtexinfo/Makefile
  53. +4 −1 devel/libffi/Makefile
  54. +3 −0 devel/libffi/distinfo
  55. +26 −0 devel/libffi/patches/patch-configure.ac
  56. +14 −0 devel/libffi/patches/patch-fficonfig.h.in
  57. +18 −0 devel/libffi/patches/patch-src_x86_unix64.S
  58. +3 −0 devel/libmemcache/Makefile
  59. +1 −4 devel/libthrift/PLIST
  60. +1 −0 devel/libthrift/distinfo
  61. +14 −0 devel/libthrift/patches/patch-lib__rb__ext__extconf.rb
  62. +2 −0 devel/memcached/Makefile
  63. +15 −0 devel/memcached/options.mk
  64. +11 −1 devel/poco/Makefile.common
  65. +2 −0 devel/poco/distinfo
  66. +13 −0 devel/poco/patches/patch-Foundation_src_SharedMemory.cpp
  67. +34 −0 devel/poco/patches/patch-build_config_SunOS-GCC
  68. +2 −0 devel/scmgit-base/Makefile
  69. +2 −0 editors/jed/Makefile.common
  70. +6 −0 editors/nano/Makefile
  71. +1 −0 editors/nano/PLIST
  72. +1 −1 geography/geos/distinfo
  73. +11 −4 geography/geos/patches/patch-include-geos-platform.h.in
  74. +1 −0 graphics/ImageMagick/Makefile
  75. +2 −1 graphics/MesaLib/options.mk
  76. +8 −0 lang/gawk/Makefile
  77. +1 −1 lang/gawk/PLIST
  78. +1 −0 lang/ocaml/Makefile
  79. +1 −1 lang/ocaml/distinfo
  80. +20 −0 lang/ocaml/patches/patch-at
  81. +2 −0 lang/perl5/distinfo
  82. +20 −0 lang/perl5/patches/patch-dist_ExtUtils-CBuilder_lib_ExtUtils_CBuilder_Base.pm
  83. +43 −0 lang/perl5/patches/patch-dist_ExtUtils_CBuilder_t_04-base.t
  84. +8 −1 lang/php5/Makefile.php
  85. +8 −1 lang/php53/Makefile.php
  86. +1 −3 lang/php53/distinfo
  87. +14 −0 lang/php53/patches/patch-main_main.c
  88. +4 −0 lang/ruby19-base/Makefile
  89. +4 −0 lang/ruby193-base/Makefile
  90. +2 −0 mail/milter-greylist/distinfo
  91. +79 −0 mail/milter-greylist/patches/patch-p0f.c
  92. +29 −0 mail/milter-greylist/patches/patch-spamd.c
  93. +8 −0 mail/postfix/Makefile
  94. +1 −0 mail/postgrey/Makefile
  95. +1 −1 mail/procmail/Makefile
  96. +4 −0 mail/sendmail/Makefile.common
  97. +1 −1 mail/sendmail/distinfo
  98. +11 −2 mail/sendmail/patches/patch-ag
  99. +8 −0 math/R/Makefile
  100. +1 −0 meta-pkgs/boost/distinfo
  101. +22 −0 meta-pkgs/boost/patches/patch-libs__signals__src__named_slot_map.cpp
  102. +1 −0 misc/figlet/distinfo
  103. +18 −0 misc/figlet/patches/patch-utf8.h
  104. +1 −0 misc/tmux/distinfo
  105. +14 −0 misc/tmux/patches/patch-Makefile.in
  106. +4 −0 mk/bsd.pkg.mk
  107. +35 −0 mk/install/install-smf
  108. +15 −0 mk/install/install.mk
  109. +5 −4 mk/java-vm.mk
  110. +5 −0 mk/pkgformat/pkg/metadata.mk
  111. +73 −0 mk/smf.mk
  112. +4 −0 mk/tools/replace.mk
  113. +10 −2 multimedia/ffmpeg/Makefile
  114. +7 −0 multimedia/ffmpeg/PLIST
  115. +7 −1 multimedia/ffmpeg/options.mk
  116. +6 −0 multimedia/gpac/Makefile
  117. +1 −0 multimedia/gpac/distinfo
  118. +14 −0 multimedia/gpac/patches/patch-extra_lib__include__ffmpeg__avio.h
  119. +9 −3 net/bind98/Makefile
  120. +1 −0 net/bind98/PLIST
  121. +7 −0 net/bind98/files/named.conf
  122. +2 −0 net/nagios-plugins/PLIST.SunOS
  123. +2 −1 net/nagios-plugins/distinfo
  124. +67 −1 net/nagios-plugins/patches/patch-ab
  125. +15 −0 net/nagios-plugins/patches/patch-plugins__check_swap.c
  126. +1 −1 net/net-snmp/Makefile
  127. +2 −0 net/net-snmp/distinfo
  128. +169 −0 net/net-snmp/patches/patch-agent__mibgroup__kernel_sunos5.c
  129. +26 −0 net/net-snmp/patches/patch-agent__mibgroup__kernel_sunos5.h
  130. +0 −3 net/p5-Net-Ident/Makefile
  131. +2 −0 net/powerdns/Makefile
  132. +1 −0 net/powerdns/Makefile.common
  133. +1 −3 net/rdist6/distinfo
  134. +0 −72 net/rdist6/patches/patch-ai
  135. +1 −0 net/vsftpd/distinfo
  136. +14 −0 net/vsftpd/patches/patch-port__solaris_bogons.h
  137. +1 −1 parallel/ganglia-monitor-core/Makefile
  138. +1 −0 parallel/ganglia-monitor-core/distinfo
  139. +31 −0 parallel/ganglia-monitor-core/patches/patch-lib__gm_protocol_dr.c
  140. +3 −0 pkgtools/pkg_install/distinfo
  141. +14 −0 pkgtools/pkg_install/patches/patch-add__perform.c
  142. +1 −0 pkgtools/pkgin/Makefile
  143. +2 −0 pkgtools/pkgin/distinfo
  144. +15 −0 pkgtools/pkgin/patches/patch-pkgindb_queries.c
  145. +60 −0 pkgtools/pkgin/patches/patch-summary.c
  146. +2 −0 print/cups/Makefile
  147. +7 −1 security/aide/Makefile
  148. +1 −1 security/aide/distinfo
  149. +10 −0 security/aide/patches/patch-ab
  150. +3 −0 security/botan/PLIST.SunOS
  151. +6 −0 security/courier-authlib/Makefile.common
  152. +3 −0 security/cyrus-sasl/Makefile.common
  153. +8 −1 security/gnupg/options.mk
  154. +4 −1 security/heimdal/Makefile
  155. +1 −1 sysutils/coreutils/PLIST
  156. +1 −0 sysutils/dbus/Makefile
  157. +2 −2 sysutils/puppet/PLIST
  158. +9 −0 sysutils/top/Makefile
  159. +1 −1 sysutils/top/distinfo
  160. +12 −1 sysutils/top/patches/patch-ak
  161. +3 −7 textproc/groff/Makefile
  162. +1 −1 textproc/ispell-gaeilge/distinfo
  163. +15 −5 textproc/ispell-gaeilge/patches/patch-aa
  164. +1 −0 www/apache22/options.mk
  165. +6 −1 www/nginx/options.mk
  166. +2 −2 www/varnish/Makefile
  167. +1 −1 x11/libdrm/Makefile
  168. +2 −1 x11/libdrm/distinfo
  169. +11 −1 x11/libdrm/patches/patch-ac
  170. +16 −0 x11/libdrm/patches/patch-libkms_linux.c
  171. +15 −0 x11/modular-xorg-server/Makefile
  172. +2 −0 x11/modular-xorg-server/PLIST
  173. +2 −1 x11/modular-xorg-server/distinfo
  174. +12 −3 x11/modular-xorg-server/patches/patch-ac
  175. +14 −0 x11/modular-xorg-server/patches/patch-configure
  176. +1 −0 x11/wxGTK28/Makefile.common
  177. +1 −1 x11/wxGTK28/distinfo
  178. +9 −0 x11/wxGTK28/patches/patch-aa
@@ -18,6 +18,7 @@ GNU_CONFIGURE= yes
#
#USE_LIBTOOL= yes
+.include "options.mk"
.include "../../archivers/bzip2/builtin.mk"
.include "../../devel/zlib/builtin.mk"
@@ -0,0 +1,16 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.bsdtar
+PKG_SUPPORTED_OPTIONS= ssl
+PKG_SUGGESTED_OPTIONS= #
+
+.include "../../mk/bsd.options.mk"
+
+###
+### OpenSSL support
+###
+.if !empty(PKG_OPTIONS:Mssl)
+. include "../../security/openssl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-openssl
+.endif
@@ -32,7 +32,7 @@ GTAR_PROGRAM_PREFIX?= ${GNU_PROGRAM_PREFIX}
GTAR_PROGRAM_PREFIX?= g
.endif
-.if ${GTAR_PROGRAM_PREFIX} == ""
+.if ${GTAR_PROGRAM_PREFIX} == "" && ${NBPAX_PROGRAM_PREFIX} == ""
# pax installs a "tar" also
CONFLICTS+= pax-[0-9]*
.else
@@ -69,7 +69,7 @@ post-install:
${INSTALL_MAN} ${FILESDIR}/gtar.1 \
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${GTAR_PROGRAM_PREFIX}tar.1
.if ${GTAR_PROGRAM_PREFIX} != "g"
- ${LN} -sf ${DESTDIR}${GTAR_PROGRAM_PREFIX}tar ${DESTDIR}${PREFIX}/bin/"gtar"
+ ${LN} -sf ${GTAR_PROGRAM_PREFIX}tar ${DESTDIR}${PREFIX}/bin/"gtar"
.endif
.include "../../devel/gettext-lib/buildlink3.mk"
@@ -10,6 +10,7 @@ DISTFILES= # empty
MAINTAINER= joerg@NetBSD.org
HOMEPAGE= http://code.google.com/p/libarchive/
COMMENT= Library to read/create different archive formats
+LICENSE= modified-bsd
PKG_DESTDIR_SUPPORT= user-destdir
@@ -19,6 +20,8 @@ USE_LIBTOOL= yes
CONFIGURE_ARGS+= --disable-bsdtar --without-expat --without-xml2 \
--disable-bsdcpio
+.include "options.mk"
+
do-extract:
${CP} -r ${FILESDIR} ${WRKSRC}
@@ -0,0 +1,16 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.libarchive
+PKG_SUPPORTED_OPTIONS= ssl
+PKG_SUGGESTED_OPTIONS= ssl
+
+.include "../../mk/bsd.options.mk"
+
+###
+### OpenSSL support
+###
+.if !empty(PKG_OPTIONS:Mssl)
+. include "../../security/openssl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-openssl
+.endif
View
@@ -24,23 +24,30 @@ CONFIGURE_ARGS+= --program-prefix=${NBPAX_PROGRAM_PREFIX:Q}
.else
# pax installs "tar" and "cpio"
-.if defined(GNU_PROGRAM_PREFIX) && empty(GNU_PROGRAM_PREFIX)
+.if defined(GNU_PROGRAM_PREFIX) && empty(GNU_PROGRAM_PREFIX) && empty(NBPAX_PROGRAM_PREFIX)
CONFLICTS+= gcpio-[0-9]*
.endif
-.if defined(GTAR_PROGRAM_PREFIX) && empty(GTAR_PROGRAM_PREFIX)
+.if defined(GTAR_PROGRAM_PREFIX) && empty(GTAR_PROGRAM_PREFIX) && empty(NBPAX_PROGRAM_PREFIX)
CONFLICTS+= gtar-base-[0-9]*
.endif
.endif
PLIST_SUBST+= NBPAX_PROGRAM_PREFIX=${NBPAX_PROGRAM_PREFIX:Q}
BUILD_DEFS+= NBPAX_PROGRAM_PREFIX
+PLIST_VARS+= nbprefix
GNU_CONFIGURE= yes
do-extract:
${CP} -R ${FILESDIR} ${WRKSRC}
+.if !empty(NBPAX_PROGRAM_PREFIX)
+PLIST.nbprefix= yes
+post-install:
+ ${LN} -s ${NBPAX_PROGRAM_PREFIX}pax ${DESTDIR}${PREFIX}/bin/pax
+.endif
+
# Haiku (BeFS) cannot support hard link
.if ${OPSYS} == "Haiku"
SUBST_CLASSES+= symlink
View
@@ -1,5 +1,6 @@
@comment $NetBSD: PLIST,v 1.3 2008/07/20 23:31:50 dbj Exp $
bin/${NBPAX_PROGRAM_PREFIX}cpio
+${PLIST.nbprefix}bin/pax
bin/${NBPAX_PROGRAM_PREFIX}pax
bin/${NBPAX_PROGRAM_PREFIX}tar
man/cat1/${NBPAX_PROGRAM_PREFIX}cpio.0
View
@@ -50,4 +50,8 @@ do-install:
. endif
.endfor
+.if ${OPSYS} == "SunOS" && (${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64)
+CFLAGS.SunOS= -DLITTLE_ENDIAN
+.endif
+
.include "../../mk/bsd.pkg.mk"
View
@@ -35,7 +35,7 @@ BUILD_TARGET= generic
CFLAGS+= -O
.endif
-.if !empty(PKGSRC_COMPILER:Msunpro)
+.if !empty(PKGSRC_COMPILER:Msunpro) || ${OPSYS} == "SunOS"
MAKE_FLAGS+= DISABLE_ASM=YES
.endif
@@ -22,6 +22,13 @@ MAKE_FLAGS+= bin_SCRIPTS= # don't install problematic scripts
CFLAGS+= -D_NETBSD_SOURCE # hack for ulong along with patch-aa
.endif
+.if ${OPSYS} == "SunOS"
+SUBST_CLASSES+= sun
+SUBST_STAGE.sun= post-configure
+SUBST_FILES.sun= sysbench/drivers/mysql/Makefile
+SUBST_SED.sun= -e 's,-D_XOPEN_SOURCE=500 ,,g'
+.endif
+
.include "options.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
View
@@ -661,9 +661,6 @@ QNX)
machine_arch=`uname -p | sed -e 's/x86/i386/'`
;;
SunOS)
- if [ -d "/usr/xpg4/bin" ]; then
- overpath="/usr/xpg4/bin:$overpath"
- fi
root_group=root
need_bsd_install=yes
if [ -x "/usr/gnu/bin/awk" ]; then
@@ -0,0 +1,40 @@
+# $NetBSD$
+#
+# definitions needed for Jabber transports and services
+#
+.if !defined(JABBER_TRANSPORTS_MK)
+# multiple inclusion suppression
+JABBER_TRANSPORTS_MK= defined
+
+BUILD_DEFS+= JABBER_USER JABBER_GROUP JABBER_LOGDIR
+BUILD_DEFS+= JABBER_PIDDIR JABBER_SPOOLDIR JABBER_TRANSDIR
+BUILD_DEFS+= JABBER_EXDIR VARBASE
+PKG_SYSCONFSUBDIR= ejabberd
+
+JABBER_USER?= ejabberd
+JABBER_GROUP?= ejabberd
+JABBER_SPOOLDIR?= ${VARBASE}/spool/ejabberd
+JABBER_PIDDIR?= ${VARBASE}/spool/ejabberd/pids
+JABBER_LOGDIR?= ${VARBASE}/log/ejabberd
+JABBER_TRANSDIR?= libexec/jabber-transports
+JABBER_EXDIR?= share/examples/jabber
+
+OWN_DIRS+= ${JABBER_PIDDIR}
+OWN_DIRS+= ${JABBER_LOGDIR}
+OWN_DIRS+= ${JABBER_SPOOLDIR}
+
+FILES_SUBST+= JABBER_USER=${JABBER_USER:Q}
+FILES_SUBST+= JABBER_GROUP=${JABBER_GROUP:Q}
+FILES_SUBST+= JABBER_PIDDIR=${JABBER_PIDDIR:Q}
+FILES_SUBST+= JABBER_LOGDIR=${JABBER_LOGDIR:Q}
+FILES_SUBST+= JABBER_SPOOLDIR=${JABBER_SPOOLDIR:Q}
+FILES_SUBST+= JABBER_TRANSDIR=${JABBER_TRANSDIR:Q}
+
+PLIST_SUBST+= JABBER_TRANSDIR=${JABBER_TRANSDIR:Q}
+PLIST_SUBST+= JABBER_EXDIR=${JABBER_EXDIR:Q}
+
+PKG_GROUPS+= ${JABBER_GROUP}
+PKG_USERS+= ${JABBER_USER}:${JABBER_GROUP}
+
+EGDIR= ${PREFIX}/${JABBER_EXDIR}
+.endif # JABBER_TRANSPORTS_MK
View
@@ -19,6 +19,8 @@ USE_LANGUAGES+= c++ c
USE_TOOLS+= autoconf automake pkg-config
USE_LIBTOOL= yes
+LDFLAGS.SunOS= -lnsl
+
.include "options.mk"
.include "../../devel/libidn/buildlink3.mk"
View
@@ -3,6 +3,7 @@ $NetBSD: distinfo,v 1.3 2011/11/25 21:31:13 joerg Exp $
SHA1 (gloox-1.0.tar.bz2) = 8c788738f72b05fae7c05c744a67859419ffa09c
RMD160 (gloox-1.0.tar.bz2) = 92089462ed778fb41bf97d882fc1785b8e82233f
Size (gloox-1.0.tar.bz2) = 603434 bytes
+SHA1 (patch-src__dns.h) = 9df05b6dfe10c6a591a9e38b0988e49228466083
SHA1 (patch-src_connectiontcpserver.cpp) = 720129dfcdff5a7ebb70bbf378c9ca3e5dfaabae
SHA1 (patch-src_dns.cpp) = dfc538e9a059b06b6222c3dffe879105701d504c
SHA1 (patch-src_sha.cpp) = b9f51307b97c68575aff4a029653584fcc6aeec6
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/dns.h.orig 2011-05-18 13:35:03.816884000 +0000
++++ src/dns.h
+@@ -45,6 +45,7 @@
+ #endif
+
+ #include <string>
++#include <cstring>
+ #include <map>
+
+ namespace gloox
View
@@ -3,3 +3,4 @@ $NetBSD: distinfo,v 1.31 2011/08/26 13:14:58 obache Exp $
SHA1 (pidgin-2.10.0.tar.bz2) = 859c6d9c9795c1adcf762b73e072e04a3a85a78d
RMD160 (pidgin-2.10.0.tar.bz2) = 316e948bc4db03b160962b4ee2b1df64d35be335
Size (pidgin-2.10.0.tar.bz2) = 9941288 bytes
+SHA1 (patch-libpurple__protocols__gg__lib__libgadu.h) = a28af140642a9a25702efa53498100818c3e8b93
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Make the Solaris condition a little more general.
+--- libpurple/protocols/gg/lib/libgadu.h.orig 2011-03-11 02:20:27.000000000 +0000
++++ libpurple/protocols/gg/lib/libgadu.h
+@@ -117,7 +117,7 @@ typedef unsigned char uint8_t;
+ typedef unsigned short uint16_t;
+ typedef unsigned int uint32_t;
+
+-#if !defined(__CYGWIN__) && !defined(__SunOS) && !defined(_INCLUDE_HPUX_SOURCE)
++#if !defined(__CYGWIN__) && !defined(__sun) && !defined(_INCLUDE_HPUX_SOURCE)
+ #define __int8_t_defined
+ typedef signed char int8_t;
+ typedef signed short int16_t;
View
@@ -83,6 +83,8 @@ INSTALLATION_DIRS+= share/locales
INSTALLATION_DIRS+= ${EGDIR}
# INSTALLATION_DIRS+= ${DOCDIR}
+LDFLAGS.SunOS+= -lsocket -lnsl
+
pre-install:
${RM} -f ${WRKSRC}/spectrumctl/spectrumctl.py.orig
${RM} -f ${WRKSRC}/spectrumctl/spectrum/env.py.orig
View
@@ -3,7 +3,7 @@ $NetBSD: distinfo,v 1.3 2011/10/28 17:34:06 schnoebe Exp $
SHA1 (spectrum-1.4.8.tar.gz) = 9323f8f89eb1f84e36e1d64845741cbebbf0d249
RMD160 (spectrum-1.4.8.tar.gz) = 859c1d0f6f1c4d535bbada13c1c11f2b4550805a
Size (spectrum-1.4.8.tar.gz) = 239725 bytes
-SHA1 (patch-CMakeLists.txt) = 9f7ce54e69ec95cea4aa3eff8d80ae31c8a80a0e
+SHA1 (patch-CMakeLists.txt) = 41ee185d2c8e0d53dd090296f7f1a68c45e0758a
SHA1 (patch-man_spectrumctl.8) = 31196aba714f6fca26c20513e677a62ec39fefb5
SHA1 (patch-spectrumctl_spectrum_env.py) = 0c266de23d0af8d317fcd4efdfec64bb85714de3
SHA1 (patch-spectrumctl_spectrumctl.py) = 56166fa6477a3dba56b30501f2112cd6d21db40f
@@ -3,9 +3,9 @@ $NetBSD: patch-CMakeLists.txt,v 1.3 2011/10/28 17:34:07 schnoebe Exp $
#
# change man path to be configurable to PKGSRC standards.
# silence a warning from cmake
+# remove -export-dynamic which fails on SunOS
#
-
---- CMakeLists.txt.orig 2010-07-13 17:38:39.000000000 +0000
+--- CMakeLists.txt.orig 2011-06-11 13:17:44.000000000 +0000
+++ CMakeLists.txt
@@ -3,6 +3,7 @@ project(spectrum)
cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
@@ -15,7 +15,19 @@ $NetBSD: patch-CMakeLists.txt,v 1.3 2011/10/28 17:34:07 schnoebe Exp $
endif(COMMAND cmake_policy)
file(WRITE src/transport_config.h "\n")
-@@ -176,11 +176,11 @@ INSTALL(FILES
+@@ -80,9 +81,9 @@ FILE(GLOB spectrum_SRCS src/*.cpp src/pr
+ add_executable(spectrum ${spectrum_SRCS} ${lrelease_outputs})
+
+ if(DEFINED WITH_STATIC_GLOOX)
+- target_link_libraries(spectrum ${WITH_STATIC_GLOOX} -lgnutls ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBPOCO_LIBRARIES} ${EVENT_LIBRARIES} ${Magick_LIBRARY} -export-dynamic)
++ target_link_libraries(spectrum ${WITH_STATIC_GLOOX} -lgnutls ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBPOCO_LIBRARIES} ${EVENT_LIBRARIES} ${Magick_LIBRARY})
+ else(DEFINED WITH_STATIC_GLOOX)
+- target_link_libraries(spectrum ${GLOOX_LIBRARIES} ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBPOCO_LIBRARIES} ${EVENT_LIBRARIES} ${Magick_LIBRARY} -export-dynamic)
++ target_link_libraries(spectrum ${GLOOX_LIBRARIES} ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBPOCO_LIBRARIES} ${EVENT_LIBRARIES} ${Magick_LIBRARY})
+ endif(DEFINED WITH_STATIC_GLOOX)
+
+ message(STATUS "Transport will be installed into: " ${CMAKE_INSTALL_PREFIX})
+@@ -176,11 +177,11 @@ INSTALL(FILES
INSTALL(FILES
${CMAKE_CURRENT_SOURCE_DIR}/man/spectrumctl.8
@@ -3,12 +3,32 @@
MODNAME= mbstring
CATEGORIES+= converters
COMMENT= PHP extension for multibyte characters support
+LICENSE= php
PKG_DESTDIR_SUPPORT= user-destdir
CONFLICTS= php-mbstring-[0-9]*
+INSTALLATION_DIRS+= ${PREFIX}/include/php/ext/mbstring
+INSTALLATION_DIRS+= ${PREFIX}/include/php/ext/mbstring/libmbfl
+INSTALLATION_DIRS+= ${PREFIX}/include/php/ext/mbstring/libmbfl/filters
+INSTALLATION_DIRS+= ${PREFIX}/include/php/ext/mbstring/libmbfl/mbfl
+INSTALLATION_DIRS+= ${PREFIX}/include/php/ext/mbstring/libmbfl/nls
+
+.include "../../lang/php/phpversion.mk"
+
+PLIST_SRC+= ${.CURDIR}/PLIST.libmbfl
+PLIST_VARS+= php53
+.if ${PKG_PHP_VERSION} == 53
+PLIST.php53= yes
+.endif
+
CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR}
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/libmbfl/filters/*.h ${DESTDIR}${PREFIX}/include/php/ext/mbstring/libmbfl/filters
+ ${INSTALL_DATA} ${WRKSRC}/libmbfl/mbfl/*.h ${DESTDIR}${PREFIX}/include/php/ext/mbstring/libmbfl/mbfl
+ ${INSTALL_DATA} ${WRKSRC}/libmbfl/nls/*.h ${DESTDIR}${PREFIX}/include/php/ext/mbstring/libmbfl/nls
+
.include "../../lang/php/ext.mk"
.include "../../mk/bsd.pkg.mk"
Oops, something went wrong.

0 comments on commit 6f6c642

Please sign in to comment.