Index: head/emulators/xen-kernel/Makefile =================================================================== --- head/emulators/xen-kernel/Makefile (revision 431678) +++ head/emulators/xen-kernel/Makefile (revision 431679) @@ -1,78 +1,78 @@ # $FreeBSD$ PORTNAME= xen PKGNAMESUFFIX= -kernel PORTVERSION= 4.7.1 PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= http://downloads.xenproject.org/release/xen/${PORTVERSION}/ MAINTAINER= royger@FreeBSD.org COMMENT= Hypervisor using a microkernel design LICENSE= GPLv2 ONLY_FOR_ARCHS= amd64 USES= cpe gmake python:build # We need to use ld from ports because the version in base doesn't # support the '--build-id' switch that's needed for live hypervisor # hot-patching. Once the ld version in base supports this option the # dependency can be removed. # # GNU objcopy is used instead of elftc objcopy because of bug #533: # https://sourceforge.net/p/elftoolchain/tickets/533/ # Once this is solved we should be able to switch to elfcopy. # # And finally we also need to use nm from binutils because the one # from base cannot deal with i386pep binary files which is the format # of the Xen EFI image (note that FreeBSD cannot yet boot as Dom0 from EFI, # but the image is built anyway). This is reported to elftc as bug #534: # https://sourceforge.net/p/elftoolchain/tickets/534/ MAKE_ARGS= clang=y PYTHON=${PYTHON_CMD} LD="${LD}" OBJCOPY="${OBJCOPY}" \ NM="${NM}" USE_BINUTILS= yes NO_MTREE= yes STRIP= # PLIST_FILES= /boot/xen \ /boot/xen.4th EXTRA_PATCHES= ${FILESDIR}/0001-xen-logdirty-prevent-preemption-if-finished.patch:-p1 \ ${FILESDIR}/0002-xen-rework-paging_log_dirty_op-to-work-with-hvm-gues.patch:-p1 \ ${FILESDIR}/kconf_arch.patch:-p1 \ - ${FILESDIR}/xsa191.patch \ - ${FILESDIR}/xsa192.patch \ - ${FILESDIR}/xsa193-4.7.patch \ - ${FILESDIR}/xsa194.patch \ - ${FILESDIR}/xsa195.patch \ - ${FILESDIR}/xsa200-4.7.patch \ - ${FILESDIR}/xsa204-4.7.patch \ - ${FILESDIR}/xsa202.patch + ${FILESDIR}/xsa191.patch:-p1 \ + ${FILESDIR}/xsa192.patch:-p1 \ + ${FILESDIR}/xsa193-4.7.patch:-p1 \ + ${FILESDIR}/xsa194.patch:-p1 \ + ${FILESDIR}/xsa195.patch:-p1 \ + ${FILESDIR}/xsa200-4.7.patch:-p1 \ + ${FILESDIR}/xsa204-4.7.patch:-p1 \ + ${FILESDIR}/xsa202.patch:-p1 .include .if ${OPSYS} != FreeBSD IGNORE= Only supported on FreeBSD .endif .if ${OSVERSION} < 1100055 IGNORE= Only supported on recent FreeBSD 11 .endif pre-build: ${MAKE_CMD} -C ${WRKSRC}/xen defconfig ${MAKE_ARGS} # Enable hypervisor hot-patching. echo 'CONFIG_XSPLICE=y' >> ${WRKSRC}/xen/.config echo 'CONFIG_FAST_SYMBOL_LOOKUP=y' >> ${WRKSRC}/xen/.config # The ports native 'build' target cannot be used because it sets # CFLAGS, and that breaks the Xen build system. do-build: ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${WRKSRC}/xen build ${MAKE_ARGS} do-install: ${MKDIR} ${STAGEDIR}/boot ${INSTALL_PROGRAM} ${WRKSRC}/xen/xen ${STAGEDIR}/boot ${INSTALL_DATA} ${FILESDIR}/xen.4th ${STAGEDIR}/boot .include Index: head/mail/alpine/Makefile =================================================================== --- head/mail/alpine/Makefile (revision 431678) +++ head/mail/alpine/Makefile (revision 431679) @@ -1,174 +1,173 @@ # $FreeBSD$ PORTNAME?= alpine PORTVERSION= 2.20 PORTREVISION?= 1 CATEGORIES?= mail news ipv6 MASTER_SITES= http://patches.freeiz.com/alpine/release/src/ DIST_SUBDIR= alpine-${PORTVERSION} MAINTAINER= mbeis@xs4all.nl COMMENT?= Mail and news client descended from Pine LICENSE= APACHE20 OPTIONS_DEFINE= DOCS SSL THREADS MOUSE NLS ISPELL NOSPELL OPTIONS_DEFAULT+= DOCS SSL THREADS MOUSE SSL_DESC= Build with SSL (installs: security/openssl if pre 10.x) MOUSE_DESC= Enable mouse support for xterm ISPELL_DESC= Use ispell instead of aspell as default speller NOSPELL_DESC= Use no default speller (overrides both) .if !defined(PICO_ALPINE_SLAVE) OPTIONS_DEFINE+= PICO IPV6 LDAP PASSFILE CONS25 MAILDIR SSL OPTIONS_DEFAULT+= PICO SSL PICO_DESC= Build and install pico, the default editor PASSFILE_DESC= Support for a stored password file (DANGEROUS) CONS25_DESC= Add a patch to support color for default console MAILDIR_DESC= Add a patch for maildir support .endif USES= libtool ncurses tar:xz MAKE_JOBS_UNSAFE= yes GNU_CONFIGURE= yes THREADS_CONFIGURE_WITH= pthread MOUSE_CONFIGURE_ENABLE= mouse NLS_CONFIGURE_ENABLE= nls IPV6_CONFIGURE_WITH= ipv6 SSL_USES= ssl .if !defined(PICO_ALPINE_SLAVE) PORTDOCSbase= LICENSE NOTICE README PORTDOCSdoc= brochure.txt PORTDOCShtml= tech-notes/background.html tech-notes/cmd-line.html \ tech-notes/config-notes.html tech-notes/config.html \ tech-notes/index.html tech-notes/installation.html \ tech-notes/introduction.html tech-notes/low-level.html \ tech-notes/tech-notes.txt PORTDOCS= ${PORTDOCSbase} ${PORTDOCSdoc} ${PORTDOCShtml} CONFIGURE_ARGS+=--with-system-pinerc=${PREFIX}/etc/alpine.conf \ --with-system-fixed-pinerc=${PREFIX}/etc/alpine.conf.fixed \ --with-password-prog=/usr/bin/passwd \ --with-system-mail-directory=/var/mail .endif CONFIGURE_ARGS+=--with-debug-level=2 \ --enable-background-post --without-krb5 --without-tcl MAKE_ARGS+= CC="${CC}" CXX="${CXX}" GCCCFLAGS="${CFLAGS}" .include .if ${PORT_OPTIONS:MSSL} CONFIGURE_ARGS+= --with-ssl-dir=${OPENSSLDIR} \ --with-ssl-include-dir=${OPENSSLINC} \ --with-ssl-lib-dir=${OPENSSLLIB} \ --with-ssl-certs-dir=${OPENSSLDIR}/certs .else CONFIGURE_ARGS+= --without-ssl .endif .include .if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel} BROKEN= Does not build with openssl-devel .endif .if ! ${PORT_OPTIONS:MNOSPELL} .if ! ${PORT_OPTIONS:MISPELL} CONFIGURE_ARGS+=--with-interactive-spellcheck=${LOCALBASE}/bin/aspell BUILD_DEPENDS+= aspell:textproc/aspell RUN_DEPENDS+= aspell:textproc/aspell .else CONFIGURE_ARGS+= --with-interactive-spellcheck=${LOCALBASE}/bin/ispell BUILD_DEPENDS+= ispell:textproc/aspell-ispell RUN_DEPENDS+= ispell:textproc/aspell-ispell .endif .else CONFIGURE_ARGS+=--without-simple-spellcheck --without-interactive-spellcheck .endif .if !defined(PICO_ALPINE_SLAVE) .if ${PORT_OPTIONS:MPICO} RUN_DEPENDS+= pico:editors/pico-alpine .endif .if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes CONFIGURE_ARGS+= --with-ldap-dir=${LOCALBASE} .else CONFIGURE_ARGS+= --without-ldap .endif .if ${PORT_OPTIONS:MPASSFILE} ALPINE_PASSFILE?= .alpine.pwd CONFIGURE_ARGS+= --with-passfile=.alpine.pwd .endif .if ${PORT_OPTIONS:MMAILDIR} PATCH_SITES= http://patches.freeiz.com/alpine/patches/alpine-${PORTVERSION}/ -PATCHFILES+= maildir.patch.gz -PATCH_DIST_ARGS+= -E --quiet -d ${PATCH_WRKSRC} -p1 +PATCHFILES+= maildir.patch.gz:-p1 .endif .if ${PORT_OPTIONS:MCONS25} EXTRA_PATCHES= ${FILESDIR}/cons25-alpine_keymenu.c .endif post-patch: @${CP} ${WRKSRC}/imap/Makefile ${WRKSRC}/imap/Makefile.presed @${SED} -e "s#^\(all:.*\) bundled\$$#\1#" \ ${WRKSRC}/imap/Makefile.presed > ${WRKSRC}/imap/Makefile @${CP} ${WRKSRC}/pico/Makefile.in ${WRKSRC}/pico/Makefile.in.presed @${SED} -e "s#^bin_PROGRAMS = pico.*#bin_PROGRAMS =#" \ -e "s#\$$(pico_SOURCES) \$$(pilot_SOURCES)##" \ ${WRKSRC}/pico/Makefile.in.presed > ${WRKSRC}/pico/Makefile.in @${CP} ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.presed @${SED} -e "s#doc/pico.1 doc/pilot.1 ##" \ ${WRKSRC}/Makefile.in.presed > ${WRKSRC}/Makefile.in @${CP} ${WRKSRC}/imap/src/osdep/unix/Makefile \ ${WRKSRC}/imap/src/osdep/unix/Makefile.presed @${SED} -e "s#^LOCKPGM=.*#LOCKPGM= ${PREFIX}/libexec/mlock#" \ ${WRKSRC}/imap/src/osdep/unix/Makefile.presed \ > ${WRKSRC}/imap/src/osdep/unix/Makefile @for i in ${WRKSRC}/README ${WRKSRC}/doc/alpine.1 \ ${WRKSRC}/doc/*.txt \ ${WRKSRC}/doc/tech-notes/*.txt \ ${WRKSRC}/doc/tech-notes/*.html \ ${WRKSRC}/pith/pine.hlp ; do \ ${CP} $$i $$i.presed ; \ ${SED} -e "s:/usr/local/lib/:${PREFIX}/etc/:g" \ -e "s:/usr/local/pine.conf:${PREFIX}/etc/pine.conf:g" \ -e "s:pine\.conf:alpine.conf:g" \ -e "s:/usr/local:${PREFIX}:g" \ -e "s:@@PREFIX@@:${PREFIX}:g" \ $$i.presed > $$i ; \ done post-install: ${STAGEDIR}${PREFIX}/bin/alpine -conf > ${STAGEDIR}${PREFIX}/etc/alpine.conf.sample .if ${PORT_OPTIONS:MDOCS} ${INSTALL} -d ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/tech-notes .for f in ${PORTDOCSbase} ${INSTALL_MAN} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR} .endfor .for f in ${PORTDOCSdoc} ${INSTALL_MAN} ${WRKSRC}/doc/$f ${STAGEDIR}${DOCSDIR} .endfor .for f in ${PORTDOCShtml} ${INSTALL_MAN} ${WRKSRC}/doc/$f ${STAGEDIR}${DOCSDIR}/tech-notes .endfor .endif # PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # @${CAT} ${PKGMESSAGE} .endif # !defined(PICO_ALPINE_SLAVE) .include Index: head/sysutils/xen-tools/Makefile =================================================================== --- head/sysutils/xen-tools/Makefile (revision 431678) +++ head/sysutils/xen-tools/Makefile (revision 431679) @@ -1,86 +1,86 @@ # $FreeBSD$ PORTNAME= xen PKGNAMESUFFIX= -tools PORTVERSION= 4.7.1 PORTREVISION= 1 CATEGORIES= sysutils emulators MASTER_SITES= http://downloads.xenproject.org/release/xen/${PORTVERSION}/ MAINTAINER= royger@FreeBSD.org COMMENT= Xen management tool, based on LibXenlight LICENSE= GPLv2 LGPL3 LICENSE_COMB= multi BROKEN_FreeBSD_10= does not build LIB_DEPENDS= libyajl.so:devel/yajl \ liblzo2.so:archivers/lzo2 \ libpixman-1.so:x11/pixman \ libargp.so:devel/argp-standalone BUILD_DEPENDS= dev86>0:devel/dev86 \ seabios>0:misc/seabios \ markdown>0:textproc/markdown OPTIONS_DEFINE= DOCS ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= "not yet ported to anything other than amd64" USES= cpe gettext gmake libtool localbase:ldflags perl5 pkgconfig \ python shebangfix USE_GNOME= glib20 USE_LDCONFIG= yes GNU_CONFIGURE= yes MAKE_ARGS= clang=y QEMU_ARGS= --disable-gtk \ --disable-smartcard-nss \ --disable-sdl \ --disable-vte \ --disable-curses \ --disable-tools \ --disable-curl \ --cxx=c++ EXTRA_PATCHES= ${FILESDIR}/var_paths.patch:-p1 \ ${FILESDIR}/xsa198.patch:-p1 \ - ${FILESDIR}/0001-libxl-fix-creation-of-pkgconf-install-dir.patch \ - ${FILESDIR}/0001-tools-configure-fix-pkg-config-install-path-for-Free.patch \ - ${FILESDIR}/0001-libs-xenstore-set-correct-FreeBSD-device.patch + ${FILESDIR}/0001-libxl-fix-creation-of-pkgconf-install-dir.patch:-p1 \ + ${FILESDIR}/0001-tools-configure-fix-pkg-config-install-path-for-Free.patch:-p1 \ + ${FILESDIR}/0001-libs-xenstore-set-correct-FreeBSD-device.patch:-p1 CONFIGURE_ARGS+= --with-extra-qemuu-configure-args="${QEMU_ARGS}" \ --with-system-seabios=${LOCALBASE}/share/seabios/bios.bin # Disable bash and xgettext tests, they are not needed on FreeBSD. CONFIGURE_ENV+= ac_cv_path_BASH=${TRUE} SHEBANG_FILES= tools/misc/xencov_split \ tools/misc/xen-ringwatch ALL_TARGET= tools docs INSTALL_TARGET= install-tools install-docs .include .if ${OPSYS} != FreeBSD IGNORE= only supported on FreeBSD .endif post-patch: @${REINPLACE_CMD} "s,x86_64,amd64,g" ${WRKSRC}/tools/configure @${REINPLACE_CMD} -e "s,/var/lib,/var/db,g" \ ${WRKSRC}/tools/Makefile \ ${WRKSRC}/tools/libxc/include/xenguest.h \ ${WRKSRC}/tools/libxl/libxl_dom.c \ ${WRKSRC}/tools/libxl/libxl_dm.c \ ${WRKSRC}/tools/qemu-xen-traditional/i386-dm/helper2.c \ ${WRKSRC}/docs/man/* @for p in `ls ${FILESDIR}/*qemuu*.patch 2>/dev/null`; do \ ${ECHO_CMD} "====> Applying $${p##*/}" ; \ ${PATCH} -s -p1 -i $${p} -d ${WRKSRC}/tools/qemu-xen ; \ done post-install: ${MKDIR} ${STAGEDIR}/var/run/xen .include