diff --git a/koha/Makefile b/koha/Makefile index 4499f904ca7..6283dbcff57 100644 --- a/koha/Makefile +++ b/koha/Makefile @@ -15,7 +15,7 @@ DEPENDS+= apache>=2.2:../../www/apache22 DEPENDS+= p5-Date-Calc>=5.4:../../devel/p5-Date-Calc DEPENDS+= p5-Date-Manip>=5.44:../../devel/p5-Date-Manip DEPENDS+= p5-Digest-MD5>=2.35:../../security/p5-Digest-MD5 -DEPENDS+= p5-DBD-mysql>=3.0002:../../databases/p5-DBD-mysql +DEPENDS+= p5-DBD-{mysql,percona}*-[0-9]*:../../databases/p5-DBD-mysql DEPENDS+= p5-DBI>=1.56:../../databases/p5-DBI DEPENDS+= p5-Event>=1.06:../../devel/p5-Event DEPENDS+= p5-HTML-Template>=2.9:../../www/p5-HTML-Template diff --git a/libee/Makefile b/libee/Makefile index 21d4101de37..cc93bd8735a 100644 --- a/libee/Makefile +++ b/libee/Makefile @@ -17,6 +17,7 @@ MAKE_JOBS_SAFE= no USE_LIBTOOL= yes USE_TOOLS+= bash pkg-config +USE_MULTIARCH= lib PKGCONFIG_OVERRIDE+= libee.pc.in diff --git a/libeio/Makefile b/libeio/Makefile index 206f20c5f04..4600e8e89b9 100644 --- a/libeio/Makefile +++ b/libeio/Makefile @@ -14,6 +14,7 @@ LICENSE= 2-clause-bsd OR gnu-gpl-v2 GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= autoconf automake +USE_MULTIARCH= lib WRKSRC= ${WRKDIR}/${PKGBASE}-${DISTNAME} diff --git a/man/Makefile b/man/Makefile index da50a27923d..93c5a92ec59 100644 --- a/man/Makefile +++ b/man/Makefile @@ -21,7 +21,7 @@ USE_TOOLS+= groff:run PKGMANDIR?= man USE_PKGLOCALEDIR= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS+= -confdir ${PKG_SYSCONFDIR} +sgid +fhs +lang all +CONFIGURE_ARGS+= -confdir ${PKG_SYSCONFDIR} +sgid +traditional CONFIGURE_ARGS+= -prefix=${PREFIX:Q} CONFIGURE_ARGS+= -mandir=${PREFIX}/${PKGMANDIR} CONFIGURE_ENV+= deflocale=${PREFIX}/${PKGLOCALEDIR}/locale/ @@ -33,6 +33,19 @@ PKG_GROUPS= ${MAN_GROUP} EXAMPLESDIR= ${PREFIX}/share/examples/man/ CONF_FILES= ${EXAMPLESDIR}/man.conf ${PKG_SYSCONFDIR}/man.conf +SUBST_CLASSES+= path +SUBST_MESSAGE.path= Fixing default tool search path. +SUBST_STAGE.path= post-patch +SUBST_FILES.path= configure src/man.conf.in +SUBST_SED.path= -e 's,@PREFIX@,${PREFIX},g' +SUBST_SED.path+= -e 's,@PKGMANDIR@,${PKGMANDIR},g' + +SUBST_CLASSES+= awk +SUBST_MESSAGE.awk= Fixing default awk +SUBST_STAGE.awk= pre-patch +SUBST_FILES.awk= src/makewhatis.sh +SUBST_SED.awk= -e 's,@awk@,${AWK},g' + post-install: ${INSTALL_DATA_DIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/src/man.conf ${EXAMPLESDIR} diff --git a/man/PLIST b/man/PLIST index 7be3624f16e..452f488f174 100644 --- a/man/PLIST +++ b/man/PLIST @@ -4,114 +4,11 @@ bin/man bin/man2dvi bin/man2html bin/whatis -man/bg/man1/apropos.1 -man/bg/man1/man.1 -man/bg/man1/whatis.1 -man/bg/man5/man.conf.5 -man/bg/man8/makewhatis.8 -man/cs/man1/apropos.1 -man/cs/man1/man.1 -man/cs/man1/whatis.1 -man/cs/man5/man.conf.5 -man/da/man1/apropos.1 -man/da/man1/man.1 -man/da/man1/whatis.1 -man/da/man5/man.conf.5 -man/de/man1/apropos.1 -man/de/man1/man.1 -man/de/man1/whatis.1 -man/de/man5/man.conf.5 -man/el/man1/apropos.1 -man/el/man1/man.1 -man/el/man1/whatis.1 -man/el/man5/man.conf.5 -man/el/man8/makewhatis.8 -man/es/man1/apropos.1 -man/es/man1/man.1 -man/es/man1/whatis.1 -man/es/man5/man.conf.5 -man/es/man8/makewhatis.8 -man/fi/man1/apropos.1 -man/fi/man1/man.1 -man/fi/man1/whatis.1 -man/fi/man5/man.conf.5 -man/fr/man1/apropos.1 -man/fr/man1/man.1 -man/fr/man1/whatis.1 -man/fr/man5/man.conf.5 -man/fr/man8/makewhatis.8 -man/hr/man1/apropos.1 -man/hr/man1/man.1 -man/hr/man1/whatis.1 -man/hr/man5/man.conf.5 -man/it/man1/apropos.1 -man/it/man1/man.1 -man/it/man1/whatis.1 -man/it/man5/man.conf.5 -man/it/man8/makewhatis.8 -man/ja/man1/apropos.1 -man/ja/man1/man.1 -man/ja/man1/whatis.1 -man/ja/man5/man.conf.5 -man/ko/man1/apropos.1 -man/ko/man1/man.1 -man/ko/man1/whatis.1 -man/ko/man5/man.conf.5 man/man1/apropos.1 man/man1/man.1 man/man1/man2html.1 man/man1/whatis.1 man/man5/man.conf.5 man/man8/makewhatis.8 -man/nl/man1/apropos.1 -man/nl/man1/man.1 -man/nl/man1/whatis.1 -man/nl/man5/man.conf.5 -man/pl/man1/apropos.1 -man/pl/man1/man.1 -man/pl/man1/whatis.1 -man/pl/man5/man.conf.5 -man/pt/man1/apropos.1 -man/pt/man1/man.1 -man/pt/man1/whatis.1 -man/pt/man5/man.conf.5 -man/ro/man1/apropos.1 -man/ro/man1/man.1 -man/ro/man1/whatis.1 -man/ro/man5/man.conf.5 -man/ro/man8/makewhatis.8 -man/sl/man1/apropos.1 -man/sl/man1/man.1 -man/sl/man1/whatis.1 -man/sl/man5/man.conf.5 sbin/makewhatis share/examples/man/man.conf -share/locale/mess.bg.cat -share/locale/mess.cs.cat -share/locale/mess.da.cat -share/locale/mess.de.cat -share/locale/mess.el.cat -share/locale/mess.en.cat -share/locale/mess.es.cat -share/locale/mess.fi.cat -share/locale/mess.fr.cat -share/locale/mess.hr.cat -share/locale/mess.it.cat -share/locale/mess.ja.cat -share/locale/mess.ko.cat -share/locale/mess.nl.cat -share/locale/mess.pl.cat -share/locale/mess.pt.cat -share/locale/mess.ro.cat -share/locale/mess.ru.cat -share/locale/mess.sl.cat -@exec ${MKDIR} %D/man/sl/man8 -@exec ${MKDIR} %D/man/pt/man8 -@exec ${MKDIR} %D/man/nl/man8 -@exec ${MKDIR} %D/man/ko/man8 -@exec ${MKDIR} %D/man/hr/man8 -@exec ${MKDIR} %D/man/fi/man8 -@exec ${MKDIR} %D/man/de/man8 -@exec ${MKDIR} %D/man/da/man8 -@exec ${MKDIR} %D/man/cs/man8 -@exec ${MKDIR} %D/man/bg/man8 diff --git a/man/distinfo b/man/distinfo index 9d91a3cd36d..fd0c4f104de 100644 --- a/man/distinfo +++ b/man/distinfo @@ -9,3 +9,7 @@ SHA1 (patch-ac) = f4281f4f2dd35ded4f8ab38c52181da385263df4 SHA1 (patch-ad) = 81748bf4839f69e98b05525e529e4e86769fecec SHA1 (patch-ae) = 1f2a8c8894ad51c2b5d84d08a4f33eaf6496f62f SHA1 (patch-af) = 0d611a641927dd07719fb4d874ce9daaf9126b7c +SHA1 (patch-configure) = 5c8dd6d5e867a90869a62c04a30de88a20bf6ac7 +SHA1 (patch-gencat_gencat.c) = 50563fd665b5f8916ffdb51339d3fcd02e106772 +SHA1 (patch-src_man.c) = 7512d0e273448656bf917a6234c74a547456fb6f +SHA1 (patch-src_man.conf.in) = beea07007f36fe2fe84bab78085dd514bd180e56 diff --git a/man/patches/patch-configure b/man/patches/patch-configure new file mode 100644 index 00000000000..dbe42b7ab87 --- /dev/null +++ b/man/patches/patch-configure @@ -0,0 +1,36 @@ +$NetBSD$ + +--- configure.orig 2006-05-01 17:56:14.000000000 +0000 ++++ configure +@@ -362,7 +362,7 @@ rm -f conftest + # for i in /bin:/usr/bin:$PATH + # does not work everywhere.) + # Some people might prefer having $PATH first in PREPATH +-PREPATH=/bin:/usr/bin:/usr/ucb:/usr/local/bin:$PATH ++PREPATH=@PREFIX@/bin:/bin:/usr/bin:/usr/ucb:/usr/local/bin:$PATH + IFS0="$IFS" + IFS=":$IFS" + for i in $PREPATH +@@ -476,18 +476,18 @@ else + then + if test $Fnroff = "missing" + then +- nroff="nroff -Tlatin1 -mandoc" ++ nroff="nroff -mandoc" + else +- nroff="$Fnroff -Tlatin1 -mandoc" ++ nroff="$Fnroff -mandoc" + fi + troff="troff -mandoc" + echo "Warning: could not find groff" + else + if test $Fnroff = "missing" + then +- nroff="$Fgroff -Tlatin1 -mandoc" ++ nroff="$Fgroff -mandoc" + else +- nroff="$Fnroff -Tlatin1 -mandoc" ++ nroff="$Fnroff -mandoc" + fi + troff="$Fgroff -Tps -mandoc" + jnroff="$Fgroff -Tnippon -mandocj" diff --git a/man/patches/patch-gencat_gencat.c b/man/patches/patch-gencat_gencat.c new file mode 100644 index 00000000000..6891972c5f8 --- /dev/null +++ b/man/patches/patch-gencat_gencat.c @@ -0,0 +1,13 @@ +$NetBSD$ + +--- gencat/gencat.c.orig 2006-08-02 18:11:44.000000000 +0000 ++++ gencat/gencat.c +@@ -43,7 +43,7 @@ up-to-date. Many thanks. + #include + #include + #include +-#ifdef SYSV ++#if defined(SYSV) || defined(__sun) + #include + #include + #else diff --git a/man/patches/patch-src_man.c b/man/patches/patch-src_man.c new file mode 100644 index 00000000000..d05c54643a5 --- /dev/null +++ b/man/patches/patch-src_man.c @@ -0,0 +1,13 @@ +$NetBSD$ + +--- src/man.c.orig 2006-05-01 20:34:22.000000000 +0000 ++++ src/man.c +@@ -594,7 +594,7 @@ make_roff_command (const char *path, con + the current position plus 10 lines. This plus setpl() + gives us a single page that just contains the whole + man page. (William Webber, wew@cs.rmit.edu.au) */ +- strcat(buft, "; echo \".\\\\\\\"\"; echo \".pl \\n(nlu+10\""); ++ strcat(buft, "; echo \".\\\\\\\"\"; echo \".pl \\\\\\n(n;lu+10\""); + #if 0 + /* In case this doesnt work for some reason, + michaelkjohnson suggests: I've got a simple diff --git a/man/patches/patch-src_man.conf.in b/man/patches/patch-src_man.conf.in new file mode 100644 index 00000000000..4bb0621517f --- /dev/null +++ b/man/patches/patch-src_man.conf.in @@ -0,0 +1,67 @@ +$NetBSD$ + +--- src/man.conf.in.orig 2005-08-20 23:26:06.000000000 +0000 ++++ src/man.conf.in +@@ -32,14 +32,14 @@ + # This file is also read by man in order to find how to call nroff, less, etc., + # and to determine the correspondence between extensions and decompressors. + # +-# MANBIN /usr/local/bin/man ++# MANBIN @PREFIX@/bin/@PKGMANDIR@ + # + # Every automatically generated MANPATH includes these fields + # ++MANPATH @PREFIX@/gcc*/@PKGMANDIR@ ++MANPATH @PREFIX@/@PKGMANDIR@ + MANPATH /usr/man + MANPATH /usr/share/man +-MANPATH /usr/local/man +-MANPATH /usr/local/share/man + MANPATH /usr/X11R6/man + # + # Uncomment if you want to include one of these by default +@@ -58,26 +58,24 @@ MANPATH /usr/X11R6/man + # in the mandatory manpath already, but will keep man from statting + # lots of other nearby files and directories. + # +-MANPATH_MAP /bin /usr/share/man +-MANPATH_MAP /sbin /usr/share/man +-MANPATH_MAP /usr/bin /usr/share/man +-MANPATH_MAP /usr/sbin /usr/share/man +-MANPATH_MAP /usr/local/bin /usr/local/share/man +-MANPATH_MAP /usr/local/sbin /usr/local/share/man +-MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man +-MANPATH_MAP /usr/bin/X11 /usr/X11R6/man +-MANPATH_MAP /usr/bin/mh /usr/share/man ++# MANPATH_MAP /bin /usr/share/man ++# MANPATH_MAP /sbin /usr/share/man ++# MANPATH_MAP /usr/bin /usr/share/man ++# MANPATH_MAP /usr/sbin /usr/share/man ++# MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man ++# MANPATH_MAP /usr/bin/X11 /usr/X11R6/man ++# MANPATH_MAP /usr/bin/mh /usr/share/man + # + # NOAUTOPATH keeps man from automatically adding directories that look like + # manual page directories to the path. + # +-#NOAUTOPATH ++NOAUTOPATH + # + # NOCACHE keeps man from creating cache pages ("cat pages") + # (generally one enables/disable cat page creation by creating/deleting + # the directory they would live in - man never does mkdir) + # +-#NOCACHE ++NOCACHE + # + # Useful paths - note that COL should not be defined when + # NROFF is defined as "groff -Tascii" or "groff -Tlatin1"; +@@ -119,7 +117,7 @@ COMPRESS_EXT @compress_ext@ + # Default manual sections (and order) to search if -S is not specified + # and the MANSECT environment variable is not set. + # +-MANSECT @sections@ ++MANSECT 1:2:3:4:5:7:8:9:1m:3bsm:3c:3c_db:3cfgadm:3commputil:3contract:3cpc:3curses:3dat:3devid:3devinfo:3dlpi:3dns_sd:3elf:3exacct:3ext:3fcoe:3fstyp:3gen:3gss:3head:3kstat:3kvm:3layout:3ldap:3lgrp:3lib:3libucb:3m:3malloc:3mms:3mp:3mpapi:3mvec:3nsl:3nvpair:3pam:3papi:3perl:3picl:3picltree:3plot:3pool:3proc:3project:3resolv:3rpc:3rsm:3sasl:3scf:3sec:3secdb:3sip:3slp:3snmp:3socket:3stmf:3sysevent:3tecla:3tnf:3ucb:3uuid:3volmgt:3x11:3xau:3xaw:3xcurses:3xext:3xmu:3xnet:4b:7d:7fs:9e:9f:9p:9s + # + # Default options to use when man is invoked without options + # This is mainly for the benefit of those that think -a should be the default diff --git a/manatee/Makefile b/manatee/Makefile index a0f482da96a..5fb0bbf8df6 100644 --- a/manatee/Makefile +++ b/manatee/Makefile @@ -12,7 +12,7 @@ COMMENT= Web-based gene evaluation and genome annotation tool WRKSRC= ${WRKDIR}/manatee DEPENDS+= p5-CGI>=2.91:../../www/p5-CGI -DEPENDS+= p5-DBD-mysql>=2.1017:../../databases/p5-DBD-mysql +DEPENDS+= p5-DBD-{mysql,percona}*-[0-9]*:../../databases/p5-DBD-mysql DEPENDS+= p5-XML-Parser>=2.31:../../textproc/p5-XML-Parser DEPENDS+= p5-XML-Simple>=2.07:../../textproc/p5-XML-Simple DEPENDS+= p5-HTML-Template>=2.6:../../www/p5-HTML-Template diff --git a/mk/git-package.mk b/mk/git-package.mk index df594be9b02..f5c51a63767 100644 --- a/mk/git-package.mk +++ b/mk/git-package.mk @@ -27,7 +27,11 @@ .if !defined(_PKG_MK_GIT_PACKAGE_MK) _PKG_MK_GIT_PACKAGE_MK= # defined +.if exists(../../devel/git/Makefile) BUILD_DEPENDS+= git-base>=1.6.4:../../devel/git-base +.else +BUILD_DEPENDS+= scmgit-base>=1.6.4:../../devel/scmgit-base +.endif # # defaults for user-visible input variables diff --git a/mosquitto/distinfo b/mosquitto/distinfo index 676b74439ab..adcc94e6fab 100644 --- a/mosquitto/distinfo +++ b/mosquitto/distinfo @@ -11,10 +11,10 @@ SHA1 (patch-ad) = 722c3b11f8ff75d2ce6dc987dc31982f9d53ba81 SHA1 (patch-ae) = a370b6e7de6bdcb62cbac86211963be45b4601a3 SHA1 (patch-af) = 90561fcebe1bc2212e834d7cb12608d226246977 SHA1 (patch-ag) = dd645cca8be0ca63b34737e35a1dcc3c29bd55f7 -SHA1 (patch-ah) = 87a54f8a1b75986352dc27ad720202281c017a57 +SHA1 (patch-ah) = 6d22293d6ddb7733cc414ed0940ade81cb7e42c7 SHA1 (patch-ai) = c15ccca3b0bcdee389324f6e2090a371fb7be74d SHA1 (patch-aj) = d592d5442e2b3364bd6cf7cec25d8bf41bf6027d -SHA1 (patch-ak) = 85e65fa30dac09bcb9b8150fe98d967ba0cf25e4 -SHA1 (patch-al) = 4baa9d647953eec6149c95ba871aaec562206c69 -SHA1 (patch-am) = 67b1cbf3514d37e3f9b0253c65f5ad21cfc201de -SHA1 (patch-an) = 28f82706cc0e8cc211f62ac316d0c354b4f0bc0d +SHA1 (patch-ak) = c8314903c380e6b15769854cf025fa820798e13d +SHA1 (patch-al) = ffb0ef3f3b4b9a00bdc90933ca0c906807f0b5be +SHA1 (patch-am) = 11f7d046afbdcb136cec8425615ba379f58ee1d2 +SHA1 (patch-an) = 63618f2dc40f1aa2e7036ed473ff357e868c3155 diff --git a/mosquitto/patches/patch-ah b/mosquitto/patches/patch-ah index 76870f6efc2..cf0b81d4eae 100644 --- a/mosquitto/patches/patch-ah +++ b/mosquitto/patches/patch-ah @@ -1,5 +1,5 @@ $NetBSD$ -Support exception for NetBSD, taken from FreeBSD +Support exception for NetBSD, taken from FreeBSD. Correctly locate the library --- config.mk.orig 2016-06-02 21:20:22.000000000 +0000 +++ config.mk 2016-08-28 15:27:03.968104814 +0000 @@ -115,7 +115,7 @@ @@ -11,14 +11,22 @@ Support exception for NetBSD, taken from FreeBSD BROKER_LIBS:=-lm else BROKER_LIBS:=-ldl -lm +@@ -128,7 +128,7 @@ + LIB_LIBS:=$(LIB_LIBS) -lrt + endif + +-CLIENT_LDFLAGS:=$(LDFLAGS) -L../lib ../lib/libmosquitto.so.${SOVERSION} ++CLIENT_LDFLAGS:=$(LDFLAGS) libmosquitto.so.${SOVERSION} + + ifeq ($(UNAME),SunOS) + ifeq ($(CC),cc) @@ -241,7 +241,7 @@ endif INSTALL?=install -prefix=/usr/local --mandir=${prefix}/share/man --localedir=${prefix}/share/locale +prefix=${PREFIX} -+mandir=${PREFIX}/man -+localedir=${PREFIX}/share/locale +-mandir=${prefix}/share/man ++mandir=${prefix}/man + localedir=${prefix}/share/locale STRIP?=strip diff --git a/mosquitto/patches/patch-ak b/mosquitto/patches/patch-ak index 9de98fe8a8d..8c2787343f0 100644 --- a/mosquitto/patches/patch-ak +++ b/mosquitto/patches/patch-ak @@ -1,8 +1,8 @@ $NetBSD$ -BSDs don't support long options +BSDs don't support long options and corrent file modes --- lib/Makefile.orig 2016-08-29 21:51:21.897719218 +0000 +++ lib/Makefile 2016-08-29 21:51:43.349422011 +0000 -@@ -25,7 +25,7 @@ +@@ -25,10 +25,10 @@ install : all $(INSTALL) -d ${DESTDIR}$(prefix)/lib${LIB_SUFFIX}/ @@ -10,4 +10,8 @@ BSDs don't support long options + $(INSTALL) -s libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so.${SOVERSION} ln -sf libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so $(INSTALL) -d ${DESTDIR}${prefix}/include/ - $(INSTALL) mosquitto.h ${DESTDIR}${prefix}/include/mosquitto.h +- $(INSTALL) mosquitto.h ${DESTDIR}${prefix}/include/mosquitto.h ++ $(INSTALL) -m 644 mosquitto.h ${DESTDIR}${prefix}/include/mosquitto.h + $(MAKE) -C cpp install + + uninstall : diff --git a/mosquitto/patches/patch-al b/mosquitto/patches/patch-al index 84c56b7e8dc..70f4043bf13 100644 --- a/mosquitto/patches/patch-al +++ b/mosquitto/patches/patch-al @@ -1,5 +1,5 @@ $NetBSD$ -BSDs don't support long options +BSDs don't support long options and correct file modes --- src/Makefile.orig 2016-08-29 21:52:55.923491416 +0000 +++ src/Makefile 2016-08-29 21:53:27.614743795 +0000 @@ -103,12 +103,12 @@ @@ -9,7 +9,8 @@ BSDs don't support long options - $(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto ${DESTDIR}${prefix}/sbin/mosquitto + $(INSTALL) -s mosquitto ${DESTDIR}${prefix}/sbin/mosquitto $(INSTALL) -d ${DESTDIR}$(prefix)/include - $(INSTALL) mosquitto_plugin.h ${DESTDIR}${prefix}/include/mosquitto_plugin.h +- $(INSTALL) mosquitto_plugin.h ${DESTDIR}${prefix}/include/mosquitto_plugin.h ++ $(INSTALL) -m 644 mosquitto_plugin.h ${DESTDIR}${prefix}/include/mosquitto_plugin.h ifeq ($(WITH_TLS),yes) $(INSTALL) -d ${DESTDIR}$(prefix)/bin - $(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd diff --git a/mosquitto/patches/patch-am b/mosquitto/patches/patch-am index 6afb29f0b80..87345b5f217 100644 --- a/mosquitto/patches/patch-am +++ b/mosquitto/patches/patch-am @@ -1,8 +1,8 @@ $NetBSD$ -BSDs don't support long options +BSDs don't support long options, correct file permission and locate the library --- lib/cpp/Makefile.orig 2016-08-29 21:50:11.282837830 +0000 +++ lib/cpp/Makefile 2016-08-29 21:50:41.337564781 +0000 -@@ -10,7 +10,7 @@ +@@ -10,10 +10,10 @@ install : all $(INSTALL) -d ${DESTDIR}$(prefix)/lib${LIB_SUFFIX}/ @@ -10,4 +10,18 @@ BSDs don't support long options + $(INSTALL) -s libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so.${SOVERSION} ln -sf libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so $(INSTALL) -d ${DESTDIR}${prefix}/include/ - $(INSTALL) mosquittopp.h ${DESTDIR}${prefix}/include/mosquittopp.h +- $(INSTALL) mosquittopp.h ${DESTDIR}${prefix}/include/mosquittopp.h ++ $(INSTALL) -m 644 mosquittopp.h ${DESTDIR}${prefix}/include/mosquittopp.h + + uninstall : + -rm -f ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so.${SOVERSION} +@@ -24,7 +24,8 @@ + -rm -f *.o libmosquittopp.so.${SOVERSION} + + libmosquittopp.so.${SOVERSION} : mosquittopp.o +- ${CROSS_COMPILE}$(CXX) -shared $(LIB_LDFLAGS) $< -o $@ ../libmosquitto.so.${SOVERSION} ++ ln -s ../libmosquitto.so.${SOVERSION} libmosquitto.so.${SOVERSION} ++ ${CROSS_COMPILE}$(CXX) -shared $(LIB_LDFLAGS) $< -o $@ libmosquitto.so.${SOVERSION} + + mosquittopp.o : mosquittopp.cpp mosquittopp.h + ${CROSS_COMPILE}$(CXX) $(LIB_CXXFLAGS) -c $< -o $@ diff --git a/mosquitto/patches/patch-an b/mosquitto/patches/patch-an index 71d5ddfb6a6..6314ef5caac 100644 --- a/mosquitto/patches/patch-an +++ b/mosquitto/patches/patch-an @@ -1,9 +1,27 @@ $NetBSD$ -BSDs don't support long options +BSDs don't support long options and correctly locate the library --- client/Makefile.orig 2016-08-29 21:52:12.870263205 +0000 +++ client/Makefile 2016-08-29 21:52:39.329840759 +0000 -@@ -24,8 +24,8 @@ +@@ -10,10 +10,10 @@ + mosquitto_sub : sub_client.o client_shared.o + ${CROSS_COMPILE}${CC} $^ -o $@ ${CLIENT_LDFLAGS} +-pub_client.o : pub_client.c ../lib/libmosquitto.so.${SOVERSION} ++pub_client.o : pub_client.c libmosquitto.so.${SOVERSION} + ${CROSS_COMPILE}${CC} -c $< -o $@ ${CLIENT_CFLAGS} + +-sub_client.o : sub_client.c ../lib/libmosquitto.so.${SOVERSION} ++sub_client.o : sub_client.c libmosquitto.so.${SOVERSION} + ${CROSS_COMPILE}${CC} -c $< -o $@ ${CLIENT_CFLAGS} + + client_shared.o : client_shared.c client_shared.h +@@ -22,10 +22,13 @@ + ../lib/libmosquitto.so.${SOVERSION} : + $(MAKE) -C ../lib + ++libmosquitto.so.${SOVERSION} : ../lib/libmosquitto.so.${SOVERSION} ++ ln -s ../lib/libmosquitto.so.${SOVERSION} libmosquitto.so.${SOVERSION} ++ install : all $(INSTALL) -d ${DESTDIR}$(prefix)/bin - $(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto_pub ${DESTDIR}${prefix}/bin/mosquitto_pub diff --git a/mtop/Makefile b/mtop/Makefile index ee2f6b547bc..a827f7d30ff 100644 --- a/mtop/Makefile +++ b/mtop/Makefile @@ -11,7 +11,7 @@ COMMENT= Curses-based MySQL server monitor LICENSE= gnu-gpl-v2 DEPENDS+= p5-Curses>=0:../../devel/p5-Curses -DEPENDS+= p5-DBD-mysql>=0:../../databases/p5-DBD-mysql +DEPENDS+= p5-DBD-{mysql,percona}*-[0-9]*:../../databases/p5-DBD-mysql PERL5_PACKLIST= auto/mtop/.packlist USE_LANGUAGES= # none diff --git a/p5-Imager/Makefile b/p5-Imager/Makefile index 96a4ff92a24..e71f6fe04a2 100644 --- a/p5-Imager/Makefile +++ b/p5-Imager/Makefile @@ -10,6 +10,8 @@ HOMEPAGE= http://search.cpan.org/~tonyc/Imager/ COMMENT= Perl module for manipulating gray, color, and RGBA format images LICENSE= ${PERL5_LICENSE} +USE_MULTIARCH= lib + PERL5_PACKLIST= auto/Imager/.packlist .include "../../fonts/t1lib/buildlink3.mk" diff --git a/p5-JavaScript-SpiderMonkey/Makefile b/p5-JavaScript-SpiderMonkey/Makefile index f3ff6cd551e..9db14fd326d 100644 --- a/p5-JavaScript-SpiderMonkey/Makefile +++ b/p5-JavaScript-SpiderMonkey/Makefile @@ -14,6 +14,8 @@ COMMENT= Perl interface to the JavaScript Engine MAKE_PARAMS+= INC=${PREFIX}/include +USE_MULTIARCH= lib + SUBST_CLASSES+= fix-lib SUBST_STAGE.fix-lib= pre-configure SUBST_MESSAGE.fix-lib= Fixing library detection diff --git a/riak/Makefile b/riak/Makefile index d244e93d81a..f019ed16ef4 100644 --- a/riak/Makefile +++ b/riak/Makefile @@ -60,6 +60,10 @@ PKG_SYSCONFSUBDIR= riak CONF_FILES+= share/examples/riak/riak.conf ${PKG_SYSCONFDIR}/riak.conf CONF_FILES+= share/examples/riak/solr-log4j.properties ${PKG_SYSCONFDIR}/solr-log4j.properties +SMF_USER= ${RIAK_USER} +SMF_GROUP= ${RIAK_GROUP} +SMF_HOME= ${RIAK_DATA} + BUILD_TARGET= rel SUBST_CLASSES+= pkgsrc diff --git a/riak/distinfo b/riak/distinfo index 97ab2b8e27c..d417581691d 100644 --- a/riak/distinfo +++ b/riak/distinfo @@ -21,5 +21,6 @@ SHA1 (patch-deps_cuttlefish_rebar.config) = 23a0b960b88277a9370eefe5a284b7aa8bd7 SHA1 (patch-deps_eleveldb_c__src_build__deps.sh) = 8878a0e99d89f084b0cf8860743f4a39a996c47f SHA1 (patch-deps_eleveldb_c__src_eleveldb.cc) = 2e21a560c3f990ff9ac7dd604de00404644e7a5a SHA1 (patch-deps_node__package_priv_base_env.sh) = ee305e631180a50a1192a10e5dd4bf185c2e96c8 +SHA1 (patch-deps_node__package_priv_base_runner) = 0fa3cdbab932ba7033f56bb4260f56208ecb4741 SHA1 (patch-deps_yokozuna_tools_grab-solr.sh) = d90115d3522238cd6a6774ff221fad009d17ebbb -SHA1 (patch-rel__vars.config) = 1cde95447a50300bd10994d6eb6628914a8ac97b +SHA1 (patch-rel__vars.config) = fe328bb4c6202ba7d36c092663622c56cbda1a7f diff --git a/riak/files/smf/manifest.xml b/riak/files/smf/manifest.xml index 5c00ed3054f..64d2c4fdf26 100644 --- a/riak/files/smf/manifest.xml +++ b/riak/files/smf/manifest.xml @@ -13,12 +13,15 @@ - + + + + diff --git a/riak/patches/patch-deps_node__package_priv_base_runner b/riak/patches/patch-deps_node__package_priv_base_runner new file mode 100644 index 00000000000..9aa4aea94e8 --- /dev/null +++ b/riak/patches/patch-deps_node__package_priv_base_runner @@ -0,0 +1,60 @@ +$NetBSD$ + +Warn against non-SMF usage, increase file descriptors. + +--- deps/node_package/priv/base/runner.orig 2014-10-14 17:01:01.000000000 +0000 ++++ deps/node_package/priv/base/runner +@@ -170,11 +170,22 @@ bootstrapd() { + } + + do_start() { ++ if [ "${SMF_METHOD}" != "start" ]; then ++ echo "***" ++ echo "Warning: please use 'svcadm enable $SCRIPT' instead" ++ echo "***" ++ fi ++ + # Make sure there is not already a node running + node_down_check + +- # Warn the user if ulimit is too low +- check_ulimit ++ # Make sure we have access to enough file descriptors ++ ULIMIT_S=$(prctl -n process.max-file-descriptor -t basic -P $$ | awk '/max-file-descriptor/ { print $3 }') ++ ULIMIT_H=$(prctl -n process.max-file-descriptor -t priv -P $$ | awk '/max-file-descriptor/ { print $3 }') ++ if [ ${ULIMIT_S} -lt ${ULIMIT_H} ]; then ++ echo "Trying to raise the file descriptor limit to maximum allowed." ++ prctl -n process.max-file-descriptor -t basic -v ${ULIMIT_H} $$ || true ++ fi + + # Make sure log directory exists + mkdir -p $RUNNER_LOG_DIR +@@ -222,6 +233,12 @@ do_start() { + } + + do_stop() { ++ if [ "${SMF_METHOD}" != "stop" ]; then ++ echo "***" ++ echo "Warning: please use 'svcadm disable $SCRIPT' instead" ++ echo "***" ++ fi ++ + get_pid + ES=$? + if [ "$ES" -ne 0 ] || [ -z $PID ]; then +@@ -324,8 +341,13 @@ case "$1" in + exit $ES + fi + +- # Warn the user if ulimit -n is less than the defined threshold +- check_ulimit ++ # Make sure we have access to enough file descriptors ++ ULIMIT_S=$(prctl -n process.max-file-descriptor -t basic -P $$ | awk '/max-file-descriptor/ { print $3 }') ++ ULIMIT_H=$(prctl -n process.max-file-descriptor -t priv -P $$ | awk '/max-file-descriptor/ { print $3 }') ++ if [ ${ULIMIT_S} -lt ${ULIMIT_H} ]; then ++ echo "Trying to raise the file descriptor limit to maximum allowed." ++ prctl -n process.max-file-descriptor -t basic -v ${ULIMIT_H} $$ || true ++ fi + + # Make sure log directory exists + mkdir -p $RUNNER_LOG_DIR diff --git a/riak/patches/patch-rel__vars.config b/riak/patches/patch-rel__vars.config index 35e18cdacdf..a17ab3c4836 100644 --- a/riak/patches/patch-rel__vars.config +++ b/riak/patches/patch-rel__vars.config @@ -22,7 +22,7 @@ Provide pkgsrc-compatible default locations. %% %% etc/app.config -@@ -14,9 +15,10 @@ +@@ -14,10 +14,11 @@ {web_ip, "127.0.0.1"}. {web_port, 8098}. {handoff_port, 8099}. @@ -30,11 +30,13 @@ Provide pkgsrc-compatible default locations. +{handoff_ip, "127.0.0.1"}. {pb_ip, "127.0.0.1"}. {pb_port, 8087}. +-{storage_backend, "bitcask"}. +{ring_creation_size, 256}. - {storage_backend, "bitcask"}. ++{storage_backend, "leveldb"}. {sasl_error_log, "{{platform_log_dir}}/sasl-error.log"}. {sasl_log_dir, "{{platform_log_dir}}/sasl"}. -@@ -41,16 +43,17 @@ + +@@ -41,16 +42,17 @@ %% %% bin/riak %% diff --git a/riak14/Makefile b/riak14/Makefile index 3e4fcb8a74b..afbe5afd0c6 100644 --- a/riak14/Makefile +++ b/riak14/Makefile @@ -107,6 +107,10 @@ post-extract: ${CHMOD} -R u=rwX,g=rX,o=rX ${WRKSRC} ${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${WRKSRC} +post-build: + ${PATCH} -p0 ${WRKSRC}/rel/riak/bin/riak \ + ${WRKSRC}/deps/node_package/priv/templates/smartos/runner.patch + do-install: ${RM} -f ${WRKSRC}/rel/riak/lib/runtime_tools-${VERSION.runtime_tools}/priv/obj/dtrace_user.o ${MKDIR} ${WRKSRC}/deps/node_package/priv/templates/pkgsrc diff --git a/riak14/files/smf/manifest.xml b/riak14/files/smf/manifest.xml index 6a1521c12fe..5c3a8b63002 100644 --- a/riak14/files/smf/manifest.xml +++ b/riak14/files/smf/manifest.xml @@ -20,6 +20,9 @@ + + + diff --git a/rsyslog6/MESSAGE.NetBSD b/rsyslog6/MESSAGE.NetBSD new file mode 100644 index 00000000000..fde1b4e99fe --- /dev/null +++ b/rsyslog6/MESSAGE.NetBSD @@ -0,0 +1,11 @@ +=========================================================================== +$NetBSD$ + +For simple replacement for syslogd(8), you may put the following lines +into your /etc/rc.conf: + + syslogd=NO + rsyslogd=YES + rsyslogd_flags="-c 3 -f /etc/syslog.conf" + +=========================================================================== diff --git a/rsyslog6/MESSAGE.SunOS b/rsyslog6/MESSAGE.SunOS new file mode 100644 index 00000000000..b931c74d201 --- /dev/null +++ b/rsyslog6/MESSAGE.SunOS @@ -0,0 +1,9 @@ +=========================================================================== +$NetBSD$ + +To use rsyslogd on Solaris, you'll need to stop the default syslogd first +via SMF: + + svcadm disable system/system-log + +=========================================================================== diff --git a/rsyslog6/files/smf/manifest.xml b/rsyslog6/files/smf/manifest.xml new file mode 100644 index 00000000000..991f548cbfb --- /dev/null +++ b/rsyslog6/files/smf/manifest.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/runit/files/smf/manifest.xml b/runit/files/smf/manifest.xml new file mode 100644 index 00000000000..b7de6508210 --- /dev/null +++ b/runit/files/smf/manifest.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samba/Makefile b/samba/Makefile index 16a31edc535..57a5e00414e 100644 --- a/samba/Makefile +++ b/samba/Makefile @@ -1,6 +1,7 @@ # $NetBSD: Makefile,v 1.22 2015/05/12 11:15:13 ryo-on Exp $ DISTNAME= samba-${VERSION} +PKGNAME= samba4-${VERSION} CATEGORIES= net MASTER_SITES= http://download.samba.org/pub/samba/ @@ -14,9 +15,11 @@ CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]* BUILD_DEFS+= VARBASE +USE_MULTIARCH= lib + .include "../../mk/bsd.prefs.mk" -SMB_LIB?= ${PREFIX}/lib +SMB_LIB?= ${PREFIX}/lib${LIBARCHSUFFIX} PKG_SYSCONFSUBDIR= samba SMB_SHAREDSTATE?= ${PREFIX}/com @@ -93,7 +96,9 @@ CONFIGURE_ARGS+= --jobs=${MAKE_JOBS} # for binbind option build. LDFLAGS+= -Wl,--allow-shlib-undefined +LDFLAGS+= ${COMPILER_RPATH_FLAG}${SMB_MODULES} LDFLAGS+= ${COMPILER_RPATH_FLAG}${SMB_PRIVATELIB} +LDFLAGS.SunOS+= -lintl .include "options.mk" diff --git a/samba/PLIST b/samba/PLIST index 07c56e538c0..75b2fc0d2cf 100644 --- a/samba/PLIST +++ b/samba/PLIST @@ -166,76 +166,76 @@ include/util/time.h include/util/xfile.h include/util_ldb.h include/wbclient.h -lib/libdcerpc-atsvc.so -lib/libdcerpc-atsvc.so.0 -lib/libdcerpc-atsvc.so.0.0.1 -lib/libdcerpc-binding.so -lib/libdcerpc-binding.so.0 -lib/libdcerpc-binding.so.0.0.1 -lib/libdcerpc-samr.so -lib/libdcerpc-samr.so.0 -lib/libdcerpc-samr.so.0.0.1 -lib/libdcerpc.so -lib/libdcerpc.so.0 -lib/libdcerpc.so.0.0.1 -lib/libgensec.so -lib/libgensec.so.0 -lib/libgensec.so.0.0.1 -lib/libndr-krb5pac.so -lib/libndr-krb5pac.so.0 -lib/libndr-krb5pac.so.0.0.1 -lib/libndr-nbt.so -lib/libndr-nbt.so.0 -lib/libndr-nbt.so.0.0.1 -lib/libndr-standard.so -lib/libndr-standard.so.0 -lib/libndr-standard.so.0.0.1 -lib/libndr.so -lib/libndr.so.0 -lib/libndr.so.0.0.3 -lib/libnetapi.so -lib/libnetapi.so.0 -lib/libnss_winbind.so -lib/libregistry.so -lib/libregistry.so.0 -lib/libregistry.so.0.0.1 -lib/libsamba-credentials.so -lib/libsamba-credentials.so.0 -lib/libsamba-credentials.so.0.0.1 -lib/libsamba-hostconfig.so -lib/libsamba-hostconfig.so.0 -lib/libsamba-hostconfig.so.0.0.1 -lib/libsamba-passdb.so -lib/libsamba-passdb.so.0 -lib/libsamba-passdb.so.0.24.1 -lib/libsamba-policy.so -lib/libsamba-policy.so.0 -lib/libsamba-policy.so.0.0.1 -lib/libsamba-util.so -lib/libsamba-util.so.0 -lib/libsamba-util.so.0.0.1 -lib/libsamdb.so -lib/libsamdb.so.0 -lib/libsamdb.so.0.0.1 -lib/libsmbclient-raw.so -lib/libsmbclient-raw.so.0 -lib/libsmbclient-raw.so.0.0.1 -lib/libsmbclient.so -lib/libsmbclient.so.0 -lib/libsmbclient.so.0.2.1 -lib/libsmbconf.so -lib/libsmbconf.so.0 -lib/libsmbldap.so -lib/libsmbldap.so.0 -lib/libtevent-util.so -lib/libtevent-util.so.0 -lib/libtevent-util.so.0.0.1 -lib/libtorture.so -lib/libtorture.so.0 -lib/libtorture.so.0.0.1 -lib/libwbclient.so -lib/libwbclient.so.0 -lib/libwbclient.so.0.12 +lib${LIBARCHSUFFIX}/libdcerpc-atsvc.so +lib${LIBARCHSUFFIX}/libdcerpc-atsvc.so.0 +lib${LIBARCHSUFFIX}/libdcerpc-atsvc.so.0.0.1 +lib${LIBARCHSUFFIX}/libdcerpc-binding.so +lib${LIBARCHSUFFIX}/libdcerpc-binding.so.0 +lib${LIBARCHSUFFIX}/libdcerpc-binding.so.0.0.1 +lib${LIBARCHSUFFIX}/libdcerpc-samr.so +lib${LIBARCHSUFFIX}/libdcerpc-samr.so.0 +lib${LIBARCHSUFFIX}/libdcerpc-samr.so.0.0.1 +lib${LIBARCHSUFFIX}/libdcerpc.so +lib${LIBARCHSUFFIX}/libdcerpc.so.0 +lib${LIBARCHSUFFIX}/libdcerpc.so.0.0.1 +lib${LIBARCHSUFFIX}/libgensec.so +lib${LIBARCHSUFFIX}/libgensec.so.0 +lib${LIBARCHSUFFIX}/libgensec.so.0.0.1 +lib${LIBARCHSUFFIX}/libndr-krb5pac.so +lib${LIBARCHSUFFIX}/libndr-krb5pac.so.0 +lib${LIBARCHSUFFIX}/libndr-krb5pac.so.0.0.1 +lib${LIBARCHSUFFIX}/libndr-nbt.so +lib${LIBARCHSUFFIX}/libndr-nbt.so.0 +lib${LIBARCHSUFFIX}/libndr-nbt.so.0.0.1 +lib${LIBARCHSUFFIX}/libndr-standard.so +lib${LIBARCHSUFFIX}/libndr-standard.so.0 +lib${LIBARCHSUFFIX}/libndr-standard.so.0.0.1 +lib${LIBARCHSUFFIX}/libndr.so +lib${LIBARCHSUFFIX}/libndr.so.0 +lib${LIBARCHSUFFIX}/libndr.so.0.0.3 +lib${LIBARCHSUFFIX}/libnetapi.so +lib${LIBARCHSUFFIX}/libnetapi.so.0 +lib${LIBARCHSUFFIX}/libnss_winbind.so +lib${LIBARCHSUFFIX}/libregistry.so +lib${LIBARCHSUFFIX}/libregistry.so.0 +lib${LIBARCHSUFFIX}/libregistry.so.0.0.1 +lib${LIBARCHSUFFIX}/libsamba-credentials.so +lib${LIBARCHSUFFIX}/libsamba-credentials.so.0 +lib${LIBARCHSUFFIX}/libsamba-credentials.so.0.0.1 +lib${LIBARCHSUFFIX}/libsamba-hostconfig.so +lib${LIBARCHSUFFIX}/libsamba-hostconfig.so.0 +lib${LIBARCHSUFFIX}/libsamba-hostconfig.so.0.0.1 +lib${LIBARCHSUFFIX}/libsamba-passdb.so +lib${LIBARCHSUFFIX}/libsamba-passdb.so.0 +lib${LIBARCHSUFFIX}/libsamba-passdb.so.0.24.1 +lib${LIBARCHSUFFIX}/libsamba-policy.so +lib${LIBARCHSUFFIX}/libsamba-policy.so.0 +lib${LIBARCHSUFFIX}/libsamba-policy.so.0.0.1 +lib${LIBARCHSUFFIX}/libsamba-util.so +lib${LIBARCHSUFFIX}/libsamba-util.so.0 +lib${LIBARCHSUFFIX}/libsamba-util.so.0.0.1 +lib${LIBARCHSUFFIX}/libsamdb.so +lib${LIBARCHSUFFIX}/libsamdb.so.0 +lib${LIBARCHSUFFIX}/libsamdb.so.0.0.1 +lib${LIBARCHSUFFIX}/libsmbclient-raw.so +lib${LIBARCHSUFFIX}/libsmbclient-raw.so.0 +lib${LIBARCHSUFFIX}/libsmbclient-raw.so.0.0.1 +lib${LIBARCHSUFFIX}/libsmbclient.so +lib${LIBARCHSUFFIX}/libsmbclient.so.0 +lib${LIBARCHSUFFIX}/libsmbclient.so.0.2.1 +lib${LIBARCHSUFFIX}/libsmbconf.so +lib${LIBARCHSUFFIX}/libsmbconf.so.0 +lib${LIBARCHSUFFIX}/libsmbldap.so +lib${LIBARCHSUFFIX}/libsmbldap.so.0 +lib${LIBARCHSUFFIX}/libtevent-util.so +lib${LIBARCHSUFFIX}/libtevent-util.so.0 +lib${LIBARCHSUFFIX}/libtevent-util.so.0.0.1 +lib${LIBARCHSUFFIX}/libtorture.so +lib${LIBARCHSUFFIX}/libtorture.so.0 +lib${LIBARCHSUFFIX}/libtorture.so.0.0.1 +lib${LIBARCHSUFFIX}/libwbclient.so +lib${LIBARCHSUFFIX}/libwbclient.so.0 +lib${LIBARCHSUFFIX}/libwbclient.so.0.12 ${PERL5_SUB_INSTALLVENDORLIB}/Parse/Pidl.pm ${PERL5_SUB_INSTALLVENDORLIB}/Parse/Pidl/CUtil.pm ${PERL5_SUB_INSTALLVENDORLIB}/Parse/Pidl/Compat.pm @@ -262,25 +262,25 @@ ${PERL5_SUB_INSTALLVENDORLIB}/Parse/Pidl/Util.pm ${PERL5_SUB_INSTALLVENDORLIB}/Parse/Pidl/Wireshark/Conformance.pm ${PERL5_SUB_INSTALLVENDORLIB}/Parse/Pidl/Wireshark/NDR.pm ${PERL5_SUB_INSTALLVENDORLIB}/Parse/Yapp/Driver.pm -lib/pkgconfig/dcerpc.pc -lib/pkgconfig/dcerpc_atsvc.pc -lib/pkgconfig/dcerpc_samr.pc -lib/pkgconfig/gensec.pc -lib/pkgconfig/ndr.pc -lib/pkgconfig/ndr_krb5pac.pc -lib/pkgconfig/ndr_nbt.pc -lib/pkgconfig/ndr_standard.pc -lib/pkgconfig/netapi.pc -lib/pkgconfig/registry.pc -lib/pkgconfig/samba-credentials.pc -lib/pkgconfig/samba-hostconfig.pc -lib/pkgconfig/samba-policy.pc -lib/pkgconfig/samba-util.pc -lib/pkgconfig/samdb.pc -lib/pkgconfig/smbclient-raw.pc -lib/pkgconfig/smbclient.pc -lib/pkgconfig/torture.pc -lib/pkgconfig/wbclient.pc +lib${LIBARCHSUFFIX}/pkgconfig/dcerpc.pc +lib${LIBARCHSUFFIX}/pkgconfig/dcerpc_atsvc.pc +lib${LIBARCHSUFFIX}/pkgconfig/dcerpc_samr.pc +lib${LIBARCHSUFFIX}/pkgconfig/gensec.pc +lib${LIBARCHSUFFIX}/pkgconfig/ndr.pc +lib${LIBARCHSUFFIX}/pkgconfig/ndr_krb5pac.pc +lib${LIBARCHSUFFIX}/pkgconfig/ndr_nbt.pc +lib${LIBARCHSUFFIX}/pkgconfig/ndr_standard.pc +lib${LIBARCHSUFFIX}/pkgconfig/netapi.pc +lib${LIBARCHSUFFIX}/pkgconfig/registry.pc +lib${LIBARCHSUFFIX}/pkgconfig/samba-credentials.pc +lib${LIBARCHSUFFIX}/pkgconfig/samba-hostconfig.pc +lib${LIBARCHSUFFIX}/pkgconfig/samba-policy.pc +lib${LIBARCHSUFFIX}/pkgconfig/samba-util.pc +lib${LIBARCHSUFFIX}/pkgconfig/samdb.pc +lib${LIBARCHSUFFIX}/pkgconfig/smbclient-raw.pc +lib${LIBARCHSUFFIX}/pkgconfig/smbclient.pc +lib${LIBARCHSUFFIX}/pkgconfig/torture.pc +lib${LIBARCHSUFFIX}/pkgconfig/wbclient.pc ${PYSITELIB}/_tevent.so ${PYSITELIB}/ldb.so ${PYSITELIB}/ntdb.so @@ -606,160 +606,160 @@ ${PYSITELIB}/samba/xattr.py ${PYSITELIB}/talloc.so ${PYSITELIB}/tdb.so ${PYSITELIB}/tevent.py -lib/samba/auth/script.so -lib/samba/idmap/ad.so -lib/samba/idmap/autorid.so -lib/samba/idmap/hash.so -lib/samba/idmap/rfc2307.so -lib/samba/idmap/rid.so -lib/samba/idmap/tdb2.so -lib/samba/ldb/asq.so -lib/samba/ldb/ildap.so -lib/samba/ldb/ldbsamba_extensions.so -lib/samba/ldb/paged_results.so -lib/samba/ldb/paged_searches.so -lib/samba/ldb/rdn_name.so -lib/samba/ldb/sample.so -lib/samba/ldb/server_sort.so -lib/samba/ldb/skel.so -lib/samba/ldb/tdb.so -lib/samba/nss_info/hash.so -lib/samba/nss_info/rfc2307.so -lib/samba/nss_info/sfu.so -lib/samba/nss_info/sfu20.so -lib/samba/private/libCHARSET3-samba4.so -lib/samba/private/libLIBWBCLIENT-OLD-samba4.so -lib/samba/private/libMESSAGING-samba4.so -lib/samba/private/libaddns-samba4.so -lib/samba/private/libads-samba4.so -lib/samba/private/libasn1util-samba4.so -lib/samba/private/libauth-sam-reply-samba4.so -lib/samba/private/libauth-samba4.so -lib/samba/private/libauth-unix-token-samba4.so -lib/samba/private/libauth4-samba4.so -lib/samba/private/libauthkrb5-samba4.so -lib/samba/private/libccan-samba4.so -lib/samba/private/libcli-cldap-samba4.so -lib/samba/private/libcli-ldap-common-samba4.so -lib/samba/private/libcli-ldap-samba4.so -lib/samba/private/libcli-nbt-samba4.so -lib/samba/private/libcli-smb-common-samba4.so -lib/samba/private/libcli-spoolss-samba4.so -lib/samba/private/libcliauth-samba4.so -lib/samba/private/libcluster-samba4.so -lib/samba/private/libcmdline-credentials-samba4.so -lib/samba/private/libdbwrap-samba4.so -lib/samba/private/libdcerpc-samba-samba4.so -lib/samba/private/libdcerpc-samba4.so -lib/samba/private/libdfs-server-ad-samba4.so -lib/samba/private/libdnsserver-common-samba4.so -lib/samba/private/libdsdb-module-samba4.so -lib/samba/private/liberrors-samba4.so -lib/samba/private/libevents-samba4.so -lib/samba/private/libflag-mapping-samba4.so -lib/samba/private/libgpo-samba4.so -lib/samba/private/libgse-samba4.so -lib/samba/private/libhttp-samba4.so -lib/samba/private/libidmap-samba4.so -lib/samba/private/libinterfaces-samba4.so -lib/samba/private/libkrb5samba-samba4.so -lib/samba/private/libldb-cmdline-samba4.so -lib/samba/private/libldb.so.1 -lib/samba/private/libldb.so.1.1.20 -lib/samba/private/libldbsamba-samba4.so -lib/samba/private/liblibcli-lsa3-samba4.so -lib/samba/private/liblibcli-netlogon3-samba4.so -lib/samba/private/liblibsmb-samba4.so -lib/samba/private/libmsrpc3-samba4.so -lib/samba/private/libndr-samba-samba4.so -lib/samba/private/libndr-samba4.so -lib/samba/private/libnet-keytab-samba4.so -lib/samba/private/libnetif-samba4.so -lib/samba/private/libnon-posix-acls-samba4.so -lib/samba/private/libnpa-tstream-samba4.so -lib/samba/private/libnss-info-samba4.so -lib/samba/private/libntdb.so.1 -lib/samba/private/libntdb.so.1.0 -lib/samba/private/libpopt-samba3-samba4.so -lib/samba/private/libprinting-migrate-samba4.so -lib/samba/private/libpyldb-util.so.1 -lib/samba/private/libpyldb-util.so.1.1.20 -lib/samba/private/libpytalloc-util.so.2 -lib/samba/private/libpytalloc-util.so.2.1.2 -lib/samba/private/libreplace-samba4.so -lib/samba/private/libsamba-cluster-support-samba4.so -lib/samba/private/libsamba-debug-samba4.so -lib/samba/private/libsamba-modules-samba4.so -lib/samba/private/libsamba-net-samba4.so -lib/samba/private/libsamba-python-samba4.so -lib/samba/private/libsamba-security-samba4.so -lib/samba/private/libsamba-sockets-samba4.so -lib/samba/private/libsamba3-util-samba4.so -lib/samba/private/libsamdb-common-samba4.so -lib/samba/private/libsecrets3-samba4.so -lib/samba/private/libserver-role-samba4.so -lib/samba/private/libshares-samba4.so -lib/samba/private/libsmb-transport-samba4.so -lib/samba/private/libsmbd-base-samba4.so -lib/samba/private/libsmbd-conn-samba4.so -lib/samba/private/libsmbd-shim-samba4.so -lib/samba/private/libsmbldaphelper-samba4.so -lib/samba/private/libsmbpasswdparser-samba4.so -lib/samba/private/libsmbregistry-samba4.so -lib/samba/private/libsocket-blocking-samba4.so -lib/samba/private/libsubunit-samba4.so -lib/samba/private/libtalloc.so.2 -lib/samba/private/libtalloc.so.2.1.2 -lib/samba/private/libtdb-compat-samba4.so -lib/samba/private/libtdb-wrap-samba4.so -lib/samba/private/libtdb.so.1 -lib/samba/private/libtdb.so.1.3.4 -lib/samba/private/libtevent.so.0 -lib/samba/private/libtevent.so.0.9.24 -lib/samba/private/libtrusts-util-samba4.so -lib/samba/private/libutil-cmdline-samba4.so -lib/samba/private/libutil-ntdb-samba4.so -lib/samba/private/libutil-reg-samba4.so -lib/samba/private/libutil-setid-samba4.so -lib/samba/private/libutil-tdb-samba4.so -lib/samba/private/libwinbind-client-samba4.so -lib/samba/private/libxattr-tdb-samba4.so -${PLIST.pam}lib/samba/security/pam_smbpass.so -${PLIST.pam}lib/samba/security/pam_winbind.so -lib/samba/vfs/acl_tdb.so -lib/samba/vfs/acl_xattr.so -lib/samba/vfs/aio_fork.so -lib/samba/vfs/aio_posix.so -lib/samba/vfs/aio_pthread.so -lib/samba/vfs/audit.so -lib/samba/vfs/cap.so -lib/samba/vfs/catia.so -lib/samba/vfs/commit.so -lib/samba/vfs/crossrename.so -lib/samba/vfs/default_quota.so -lib/samba/vfs/expand_msdfs.so -lib/samba/vfs/extd_audit.so -lib/samba/vfs/fake_perms.so -lib/samba/vfs/fruit.so -lib/samba/vfs/full_audit.so -lib/samba/vfs/linux_xfs_sgid.so -lib/samba/vfs/media_harmony.so -lib/samba/vfs/netatalk.so -${PLIST.fam}lib/samba/vfs/notify_fam.so -lib/samba/vfs/preopen.so -lib/samba/vfs/readahead.so -lib/samba/vfs/readonly.so -lib/samba/vfs/recycle.so -lib/samba/vfs/scannedonly.so -lib/samba/vfs/shadow_copy.so -lib/samba/vfs/shadow_copy2.so -lib/samba/vfs/smb_traffic_analyzer.so -lib/samba/vfs/streams_depot.so -lib/samba/vfs/streams_xattr.so -lib/samba/vfs/time_audit.so -lib/samba/vfs/worm.so -lib/samba/vfs/xattr_tdb.so -lib/winbind_krb5_locator.so +lib${LIBARCHSUFFIX}/samba/auth/script.so +lib${LIBARCHSUFFIX}/samba/idmap/ad.so +lib${LIBARCHSUFFIX}/samba/idmap/autorid.so +lib${LIBARCHSUFFIX}/samba/idmap/hash.so +lib${LIBARCHSUFFIX}/samba/idmap/rfc2307.so +lib${LIBARCHSUFFIX}/samba/idmap/rid.so +lib${LIBARCHSUFFIX}/samba/idmap/tdb2.so +lib${LIBARCHSUFFIX}/samba/ldb/asq.so +lib${LIBARCHSUFFIX}/samba/ldb/ildap.so +lib${LIBARCHSUFFIX}/samba/ldb/ldbsamba_extensions.so +lib${LIBARCHSUFFIX}/samba/ldb/paged_results.so +lib${LIBARCHSUFFIX}/samba/ldb/paged_searches.so +lib${LIBARCHSUFFIX}/samba/ldb/rdn_name.so +lib${LIBARCHSUFFIX}/samba/ldb/sample.so +lib${LIBARCHSUFFIX}/samba/ldb/server_sort.so +lib${LIBARCHSUFFIX}/samba/ldb/skel.so +lib${LIBARCHSUFFIX}/samba/ldb/tdb.so +lib${LIBARCHSUFFIX}/samba/nss_info/hash.so +lib${LIBARCHSUFFIX}/samba/nss_info/rfc2307.so +lib${LIBARCHSUFFIX}/samba/nss_info/sfu.so +lib${LIBARCHSUFFIX}/samba/nss_info/sfu20.so +lib${LIBARCHSUFFIX}/samba/private/libCHARSET3-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libLIBWBCLIENT-OLD-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libMESSAGING-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libaddns-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libads-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libasn1util-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libauth-sam-reply-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libauth-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libauth-unix-token-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libauth4-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libauthkrb5-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libccan-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libcli-cldap-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libcli-ldap-common-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libcli-ldap-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libcli-nbt-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libcli-smb-common-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libcli-spoolss-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libcliauth-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libcluster-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libcmdline-credentials-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libdbwrap-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libdcerpc-samba-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libdcerpc-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libdfs-server-ad-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libdnsserver-common-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libdsdb-module-samba4.so +lib${LIBARCHSUFFIX}/samba/private/liberrors-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libevents-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libflag-mapping-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libgpo-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libgse-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libhttp-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libidmap-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libinterfaces-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libkrb5samba-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libldb-cmdline-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libldb.so.1 +lib${LIBARCHSUFFIX}/samba/private/libldb.so.1.1.20 +lib${LIBARCHSUFFIX}/samba/private/libldbsamba-samba4.so +lib${LIBARCHSUFFIX}/samba/private/liblibcli-lsa3-samba4.so +lib${LIBARCHSUFFIX}/samba/private/liblibcli-netlogon3-samba4.so +lib${LIBARCHSUFFIX}/samba/private/liblibsmb-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libmsrpc3-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libndr-samba-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libndr-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libnet-keytab-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libnetif-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libnon-posix-acls-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libnpa-tstream-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libnss-info-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libntdb.so.1 +lib${LIBARCHSUFFIX}/samba/private/libntdb.so.1.0 +lib${LIBARCHSUFFIX}/samba/private/libpopt-samba3-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libprinting-migrate-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libpyldb-util.so.1 +lib${LIBARCHSUFFIX}/samba/private/libpyldb-util.so.1.1.20 +lib${LIBARCHSUFFIX}/samba/private/libpytalloc-util.so.2 +lib${LIBARCHSUFFIX}/samba/private/libpytalloc-util.so.2.1.2 +lib${LIBARCHSUFFIX}/samba/private/libreplace-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libsamba-cluster-support-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libsamba-debug-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libsamba-modules-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libsamba-net-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libsamba-python-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libsamba-security-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libsamba-sockets-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libsamba3-util-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libsamdb-common-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libsecrets3-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libserver-role-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libshares-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libsmb-transport-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libsmbd-base-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libsmbd-conn-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libsmbd-shim-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libsmbldaphelper-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libsmbpasswdparser-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libsmbregistry-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libsocket-blocking-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libsubunit-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libtalloc.so.2 +lib${LIBARCHSUFFIX}/samba/private/libtalloc.so.2.1.2 +lib${LIBARCHSUFFIX}/samba/private/libtdb-compat-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libtdb-wrap-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libtdb.so.1 +lib${LIBARCHSUFFIX}/samba/private/libtdb.so.1.3.4 +lib${LIBARCHSUFFIX}/samba/private/libtevent.so.0 +lib${LIBARCHSUFFIX}/samba/private/libtevent.so.0.9.24 +lib${LIBARCHSUFFIX}/samba/private/libtrusts-util-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libutil-cmdline-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libutil-ntdb-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libutil-reg-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libutil-setid-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libutil-tdb-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libwinbind-client-samba4.so +lib${LIBARCHSUFFIX}/samba/private/libxattr-tdb-samba4.so +${PLIST.pam}lib${LIBARCHSUFFIX}/samba/security/pam_smbpass.so +${PLIST.pam}lib${LIBARCHSUFFIX}/samba/security/pam_winbind.so +lib${LIBARCHSUFFIX}/samba/vfs/acl_tdb.so +lib${LIBARCHSUFFIX}/samba/vfs/acl_xattr.so +lib${LIBARCHSUFFIX}/samba/vfs/aio_fork.so +lib${LIBARCHSUFFIX}/samba/vfs/aio_posix.so +lib${LIBARCHSUFFIX}/samba/vfs/aio_pthread.so +lib${LIBARCHSUFFIX}/samba/vfs/audit.so +lib${LIBARCHSUFFIX}/samba/vfs/cap.so +lib${LIBARCHSUFFIX}/samba/vfs/catia.so +lib${LIBARCHSUFFIX}/samba/vfs/commit.so +lib${LIBARCHSUFFIX}/samba/vfs/crossrename.so +lib${LIBARCHSUFFIX}/samba/vfs/default_quota.so +lib${LIBARCHSUFFIX}/samba/vfs/expand_msdfs.so +lib${LIBARCHSUFFIX}/samba/vfs/extd_audit.so +lib${LIBARCHSUFFIX}/samba/vfs/fake_perms.so +lib${LIBARCHSUFFIX}/samba/vfs/fruit.so +lib${LIBARCHSUFFIX}/samba/vfs/full_audit.so +lib${LIBARCHSUFFIX}/samba/vfs/linux_xfs_sgid.so +lib${LIBARCHSUFFIX}/samba/vfs/media_harmony.so +lib${LIBARCHSUFFIX}/samba/vfs/netatalk.so +${PLIST.fam}lib${LIBARCHSUFFIX}/samba/vfs/notify_fam.so +lib${LIBARCHSUFFIX}/samba/vfs/preopen.so +lib${LIBARCHSUFFIX}/samba/vfs/readahead.so +lib${LIBARCHSUFFIX}/samba/vfs/readonly.so +lib${LIBARCHSUFFIX}/samba/vfs/recycle.so +lib${LIBARCHSUFFIX}/samba/vfs/scannedonly.so +lib${LIBARCHSUFFIX}/samba/vfs/shadow_copy.so +lib${LIBARCHSUFFIX}/samba/vfs/shadow_copy2.so +lib${LIBARCHSUFFIX}/samba/vfs/smb_traffic_analyzer.so +lib${LIBARCHSUFFIX}/samba/vfs/streams_depot.so +lib${LIBARCHSUFFIX}/samba/vfs/streams_xattr.so +lib${LIBARCHSUFFIX}/samba/vfs/time_audit.so +lib${LIBARCHSUFFIX}/samba/vfs/worm.so +lib${LIBARCHSUFFIX}/samba/vfs/xattr_tdb.so +lib${LIBARCHSUFFIX}/winbind_krb5_locator.so man/man1/pidl.1 man/man3/Parse::Pidl::Dump.3 man/man3/Parse::Pidl::NDR.3 diff --git a/samba/distinfo b/samba/distinfo index cd0da898f6d..8e61b886f95 100644 --- a/samba/distinfo +++ b/samba/distinfo @@ -3,5 +3,6 @@ $NetBSD: distinfo,v 1.11 2015/05/12 11:15:13 ryo-on Exp $ SHA1 (samba-4.2.1.tar.gz) = f5d0471efc459898344866b5bc518c80ce67e8d5 RMD160 (samba-4.2.1.tar.gz) = 539f915c0c80cf67b8a73b6d7924804609801fb8 Size (samba-4.2.1.tar.gz) = 20701467 bytes +SHA1 (patch-source3_smbd_notify__inotify.c) = 08c555a68772cdab3f0128a1f81129788fa49449 SHA1 (patch-source4_scripting_wsript_build) = 91c99acc8cbadbd8d19400d466491c1da3e42527 SHA1 (patch-testprogs_blackbox_dbcheck-oldrelease.sh) = c651014e5e703041a5bcf83f71a1d36c3f5f3309 diff --git a/samba/patches/patch-source3_smbd_notify__inotify.c b/samba/patches/patch-source3_smbd_notify__inotify.c new file mode 100644 index 00000000000..5d2a3f75524 --- /dev/null +++ b/samba/patches/patch-source3_smbd_notify__inotify.c @@ -0,0 +1,16 @@ +$NetBSD$ + +SunOS needs sys/filio.h for FIONREAD. + +--- source3/smbd/notify_inotify.c.orig 2013-12-05 09:16:48.000000000 +0000 ++++ source3/smbd/notify_inotify.c +@@ -27,6 +27,9 @@ + + #ifdef HAVE_INOTIFY + ++#ifdef __sun ++#include ++#endif + #include + + /* glibc < 2.5 headers don't have these defines */ diff --git a/spamassassin-cvs/Makefile b/spamassassin-cvs/Makefile index b0a3471aba7..fe604a874a9 100644 --- a/spamassassin-cvs/Makefile +++ b/spamassassin-cvs/Makefile @@ -75,7 +75,7 @@ SA_SSLCERTS= '$$LOCAL_RULES_DIR/certs' .if !empty(SPAMASSASSIN_USE_MYSQL:M[yY][eE][sS]) .include "../../databases/p5-DBI/buildlink3.mk" DEPENDS+= p5-DBI>=1.37:../../databases/p5-DBI -DEPENDS+= p5-DBD-mysql>=2.1017:../../databases/p5-DBD-mysql +DEPENDS+= p5-DBD-{mysql,percona}*-[0-9]*:../../databases/p5-DBD-mysql .endif .if !empty(SPAMASSASSIN_USE_RAZOR:M[yY][eE][sS]) diff --git a/v8-316/Makefile b/v8-316/Makefile index ac6a7b8f5d9..979eacd1047 100644 --- a/v8-316/Makefile +++ b/v8-316/Makefile @@ -15,6 +15,8 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-gyp-[0-9]*:../../devel/gyp USE_LANGUAGES= c c++ USE_TOOLS+= gmake:run +USE_MULTIARCH= yes + NO_CONFIGURE= yes BUILD_TARGET= native TEST_TARGET= native.check @@ -42,7 +44,7 @@ REPLACE_PYTHON= tools/*.py tools/*/*.py tools/*/*/*.py REPLACE_PYTHON+= third_party/icu/source/*/*.py REPLACE_PYTHON+= third_party/icu/source/*/*/*.py -INSTALLATION_DIRS+= bin include lib +INSTALLATION_DIRS+= bin include lib${LIBARCHSUFFIX} INSTALL_INCLUDES= v8-debug.h v8-preparser.h v8-profiler.h INSTALL_INCLUDES+= v8-testing.h v8.h @@ -54,8 +56,8 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/out/native/libv8.dylib ${DESTDIR}${PREFIX}/lib/libv8.1.dylib ${LN} -sf libv8.1.dylib ${DESTDIR}${PREFIX}/lib/libv8.dylib .else - ${INSTALL_LIB} ${WRKSRC}/out/native/lib.target/libv8.so ${DESTDIR}${PREFIX}/lib/libv8.so.1 - ${LN} -sf libv8.so.1 ${DESTDIR}${PREFIX}/lib/libv8.so + ${INSTALL_LIB} ${WRKSRC}/out/native/lib.target/libv8.so ${DESTDIR}${PREFIX}/lib${LIBARCHSUFFIX}/libv8.so.1 + ${LN} -sf libv8.so.1 ${DESTDIR}${PREFIX}/lib${LIBARCHSUFFIX}/libv8.so .endif .for inc in ${INSTALL_INCLUDES} ${INSTALL_DATA} ${WRKSRC}/include/${inc} ${DESTDIR}${PREFIX}/include diff --git a/v8/Makefile b/v8/Makefile index 81f4da5d9e9..7b85e566c5d 100644 --- a/v8/Makefile +++ b/v8/Makefile @@ -15,6 +15,8 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-gyp-[0-9]*:../../devel/gyp USE_LANGUAGES= c c++ USE_TOOLS+= gmake:run +USE_MULTIARCH= yes + NO_CONFIGURE= yes #BUILD_TARGET= native #TEST_TARGET= native.check @@ -58,7 +60,7 @@ REPLACE_PYTHON= tools/*.py tools/*/*.py tools/*/*/*.py REPLACE_PYTHON+= third_party/icu/source/*/*.py REPLACE_PYTHON+= third_party/icu/source/*/*/*.py -INSTALLATION_DIRS+= bin include lib +INSTALLATION_DIRS+= bin include lib${LIBARCHSUFFIX} INSTALL_INCLUDES= v8-debug.h v8-platform.h v8-profiler.h INSTALL_INCLUDES+= v8-testing.h v8-util.h v8.h @@ -80,8 +82,8 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/out/native/libv8.dylib ${DESTDIR}${PREFIX}/lib/libv8.1.dylib ${LN} -sf libv8.1.dylib ${DESTDIR}${PREFIX}/lib/libv8.dylib .else - ${INSTALL_LIB} ${WRKSRC}/out/native/lib.target/libv8.so ${DESTDIR}${PREFIX}/lib/libv8.so.1 - ${LN} -sf libv8.so.1 ${DESTDIR}${PREFIX}/lib/libv8.so + ${INSTALL_LIB} ${WRKSRC}/out/native/lib.target/libv8.so ${DESTDIR}${PREFIX}/lib${LIBARCHSUFFIX}/libv8.so.1 + ${LN} -sf libv8.so.1 ${DESTDIR}${PREFIX}/lib${LIBARCHSUFFIX}/libv8.so .endif .for inc in ${INSTALL_INCLUDES} ${INSTALL_DATA} ${WRKSRC}/include/${inc} ${DESTDIR}${PREFIX}/include diff --git a/wackamole/Makefile b/wackamole/Makefile index dc8880c7f67..18a8bf3f98c 100644 --- a/wackamole/Makefile +++ b/wackamole/Makefile @@ -12,6 +12,8 @@ COMMENT= Peer-to-peer high availability cluster GNU_CONFIGURE= yes USE_TOOLS+= flex yacc +USE_GCC_RUNTIME= yes + .include "../../mk/bsd.fast.prefs.mk" BUILD_DEFS+= VARBASE WACKAMOLE_PID_DIR diff --git a/wackamole/files/smf/manifest.xml b/wackamole/files/smf/manifest.xml new file mode 100644 index 00000000000..f064d18e949 --- /dev/null +++ b/wackamole/files/smf/manifest.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +