Index: head/databases/monetdb/Makefile =================================================================== --- head/databases/monetdb/Makefile (revision 474553) +++ head/databases/monetdb/Makefile (revision 474554) @@ -1,252 +1,250 @@ # Created by: Jim Ohlstein # $FreeBSD$ PORTNAME= monetdb PORTVERSION= 11.15.19 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= http://www.monetdb.org/downloads/sources/Feb2013-SP6/ DISTNAME= MonetDB-${PORTVERSION} MAINTAINER= jim@ohlste.in COMMENT= Multithreaded "column-oriented" SQL databasee LICENSE= MonetDB_License LICENSE_NAME= MonetDB Public License Version 1.1 LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libpcre.so:devel/pcre USE_GNOME= libxml2 USES= bison iconv gmake libtool pkgconfig tar:xz USE_LDCONFIG= yes USE_RC_SUBR= monetdbd WRKSRC= ${WRKDIR}/MonetDB-${PORTVERSION} CONFIGURE_ENV= openssl_CFLAGS=-I/usr/include \ openssl_LIBS="-L/usr/lib -lssl -lcrypto" LDFLAGS+= -L${PREFIX}/lib CFLAGS+= -I${PREFIX}/include INSTALL_TARGET= install-strip OPTIONS_DEFINE= CONSOLE CURL DATACELL FITS GEOM JDBC MEROCONTROL ODBC \ PERL RDF RUBYGEMS SPHINXCLIENT TESTING OPTIMIZE OPTIONS_RADIO= PYTHON OPTIONS_RADIO_PYTHON= PYTHON2 PYTHON3 OPTIONS_SINGLE= PASSWD_HASH_ALGORITHM OPTIONS_SINGLE_PASSWD_HASH_ALGORITHM= MD5 SHA1 RIPEMD160 SHA224 SHA256 \ SHA384 SHA512 OPTIONS_DEFAULT= PERL PYTHON2 SHA512 NO_OPTIONS_SORT= yes OPTIONS_SUB= yes CONSOLE_DESC= Direct console on the server (involves security risks) CURL_DESC= cURL support DATACELL_DESC= Datacell stream components (experimental) FITS_DESC= Support for FITS via CFITSIO GEOM_DESC= Support for geom module JDBC_DESC= Build the MonetDB JDBC (java) driver MEROCONTROL_DESC= Bbuild the Merovingian control driver (requires java) ODBC_DESC= ODBC support via unixODBC PASSWD_HASH_ALGORITHM_DESC= Password hash algorithm MD5_DESC= MD5 password hash SHA1_DESC= SHA1 password hash RIPEMD160_DESC= RIPEMD160 password hash SHA224_DESC= SHA224 password hash SHA256_DESC= SHA256 password hash SHA384_DESC= SHA384 password hash SHA512_DESC= SHA512 password hash PERL_DESC= Build and install Perl modules PYTHON2_DESC= Build and install Python 2.7 packages PYTHON3_DESC= Build and install Python 3.3 packages RDF_DESC= Support for RDF (experimental) RUBYGEMS_DESC= Build and install ruby gems SPHINXCLIENT_DESC= Sphinxclient support TESTING_DESC= Build and install testing (requires Python2 and Perl) OPTIMIZE_DESC= Extra compiler optimization flags MONETDB_VARDIR?= /var MONETDB_LOGDIR?= ${MONETDB_VARDIR}/log/${PORTNAME} MONETDB_RUNDIR?= ${MONETDB_VARDIR}/run/${PORTNAME} MONETDB_LIBDIR?= ${PREFIX}/lib MONETDB_INCLUDEDIR?= ${PREFIX}/include PLIST_SUB+= MONETDB_LOGDIR=${MONETDB_LOGDIR} \ MONETDB_RUNDIR=${MONETDB_RUNDIR} \ PERL_PORT=${PERL_PORT} GNU_CONFIGURE= yes USERS= monetdb GROUPS= monetdb CONFIGURE_ARGS+= --enable-gdk \ --enable-monetdb5 \ --enable-gdk \ --enable-sql \ --enable-jaql \ --enable-largefile \ --with-bz2 \ --with-logdir=${MONETDB_LOGDIR} \ --with-rundir=${MONETDB_RUNDIR} \ --bindir=${PREFIX}/bin \ --libdir=${MONETDB_LIBDIR} \ --includedir=${MONETDB_INCLUDEDIR} \ --localstatedir="${PREFIX}/var" \ --docdir=${PREFIX}/${DATADIR} SPHINXCLIENT_CONFIGURE_WITH= sphinxclient MEROCONTROL_CONFIGURE_ENABLE= merocontrol DATACELL_CONFIGURE_ENABLE= datacell OPTIMIZE_CONFIGURE_ENABLE= optimize RUBYGEMS_CONFIGURE_WITH= rubygem CONSOLE_CONFIGURE_ENABLE= console TESTING_CONFIGURE_ENABLE= testing FITS_CONFIGURE_ENABLE= fits GEOM_CONFIGURE_ENABLE= geom JDBC_CONFIGURE_ENABLE= jdbc ODBC_CONFIGURE_ENABLE= odbc PERL_CONFIGURE_WITH= perl RDF_CONFIGURE_ENABLE= rdf SPHINXCLIENT_LIB_DEPENDS= libsphinxclient.so:textproc/libsphinxclient RUBYGEMS_BUILD_DEPENDS= gem:devel/ruby-gems RUBYGEMS_RUN_DEPENDS= gem:devel/ruby-gems -PYTHON3_BUILD_DEPENDS= python3:lang/python3 -PYTHON3_RUN_DEPENDS= python3:lang/python3 CURL_LIB_DEPENDS= libcurl.so:ftp/curl FITS_LIB_DEPENDS= libcfitsio.so:astro/cfitsio GEOM_LIB_DEPENDS= libgeos.so:graphics/geos ODBC_LIB_DEPENDS= libodbcinst.so:databases/unixODBC PERL_BUILD_DEPENDS= p5-DBI>=1.08:databases/p5-DBI PERL_RUN_DEPENDS= p5-DBI>=1.08:databases/p5-DBI RDF_LIB_DEPENDS= libraptor.so:textproc/raptor PERL_USES= perl5 .include .if ${PORT_OPTIONS:MFITS} CATEGORIES+= science .endif .if ${PORT_OPTIONS:MGEOM} CATEGORIES+= math .endif .if ${PORT_OPTIONS:MJDBC} || ${PORT_OPTIONS:MMEROCONTROL} CATEGORIES+= java BUILD_DEPENDS+= ant:devel/apache-ant USE_JAVA= yes JAVA_VENDOR= openjdk JAVA_BUILD= yes JAVA_RUN= yes PLIST_SUB+= JAVA="" .else PLIST_SUB+= JAVA="@comment " .endif .if ${PORT_OPTIONS:MPERL} USE_PERL5= run build CATEGORIES+= perl5 .endif .if ${PORT_OPTIONS:MRDF} CATEGORIES+= textproc .endif .if ${PORT_OPTIONS:MRUBYGEMS} CATEGORIES+= ruby .endif .if ${PORT_OPTIONS:MTESTING} . if empty(PORT_OPTIONS:MPYTHON2) || empty(PORT_OPTIONS:MPERL) IGNORE= testing option requires both Python2 and Perl . endif .endif .if ${PORT_OPTIONS:MPYTHON2} || ${PORT_OPTIONS:MPYTHON3} CATEGORIES+= python PLIST_SUB+= PYTHON= .else PLIST_SUB+= PYTHON="@comment " .endif .if ${PORT_OPTIONS:MPYTHON2} USES+= python:2.7 PLIST_SUB+= PYTHON_VER=${PYTHON_VER} CONFIGURE_ARGS+= --with-python2=${PYTHON_CMD} \ --without-python3 .else CONFIGURE_ARGS+= --without-python2 .endif .if ${PORT_OPTIONS:MPYTHON3} USES+= python:3.4+ USE_PYTHON= py3kplist PLIST_SUB+= PYTHON_VER=${PYTHON_VER} CONFIGURE_ARGS+= --with-python3=${PYTHON_CMD} \ --without-python2 .else CONFIGURE_ARGS+= --without-python3 .endif .if ${PORT_OPTIONS:MMD5} CONFIGURE_ARGS+= --with-password-backend=MD5 .elif ${PORT_OPTIONS:MSHA1} CONFIGURE_ARGS+= --with-password-backend=SHA1 .elif ${PORT_OPTIONS:MRIPEMD160} CONFIGURE_ARGS+= --with-password-backend=RIPEMD160 .elif ${PORT_OPTIONS:MSHA224} CONFIGURE_ARGS+= --with-password-backend=SHA224 .elif ${PORT_OPTIONS:MSHA256} CONFIGURE_ARGS+= --with-password-backend=SHA256 .elif ${PORT_OPTIONS:MSHA384} CONFIGURE_ARGS+= -with-password-backend=SHA384 .elif ${PORT_OPTIONS:MSHA512} CONFIGURE_ARGS+= -with-password-backend=SHA512 .endif pre-install: ${INSTALL_DATA} ${WRKSRC}/clients/mapilib/monetdb-mapi.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig ${INSTALL_DATA} ${WRKSRC}/common/stream/monetdb-stream.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig ${MKDIR} ${STAGEDIR}${MONETDB_LOGDIR} \ ${STAGEDIR}${MONETDB_RUNDIR} \ ${STAGEDIR}${DOCSDIR} .if ${PORT_OPTIONS:MPERL} ${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/DBD/monetdb \ ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/MonetDB .endif ${INSTALL_DATA} ${WRKSRC}/sql/dump-restore.* ${STAGEDIR}${DOCSDIR} post-install: ${RM} -r ${STAGEDIR}${PREFIX}/share/doc/MonetDB-SQL-11.15.19 ${RM} -r ${STAGEDIR}${PREFIX}/etc/tmpfiles.d ${MV} ${STAGEDIR}${PREFIX}/var/* ${STAGEDIR}${PREFIX} ${RMDIR} ${STAGEDIR}${PREFIX}/var .if ${PORT_OPTIONS:MPERL} ${MV} ${STAGEDIR}${PREFIX}/Mapi.pm \ ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL} ${MV} ${STAGEDIR}${PREFIX}/DBD/monetdb.pm \ ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/DBD ${MV} ${STAGEDIR}${PREFIX}/DBD/monetdb/*.pm \ ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/DBD/monetdb ${MV} ${STAGEDIR}${PREFIX}/MonetDB \ ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL} ${RM} -r ${STAGEDIR}${PREFIX}/DBD .endif .if ${PORT_OPTIONS:MPYTHON2} || ${PORT_OPTIONS:MPYTHON3} # Python support has broken DESTDIR support, force recompile cd ${STAGEDIR}${PREFIX} && \ ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -d ${PYTHONPREFIX_SITELIBDIR} \ -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} .endif .include Index: head/devel/libzim/Makefile =================================================================== --- head/devel/libzim/Makefile (revision 474553) +++ head/devel/libzim/Makefile (revision 474554) @@ -1,22 +1,22 @@ # $FreeBSD$ PORTNAME= libzim PORTVERSION= 4.0.0 CATEGORIES= devel MAINTAINER= swills@FreeBSD.org COMMENT= Reference implementation of the ZIM specification -BUILD_DEPENDS= python3-config:lang/python3 - LIB_DEPENDS= libicui18n.so:devel/icu \ libxapian.so:databases/xapian-core USES= compiler:c++11-lang meson pkgconfig python:3.4+ USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= openzim # Using gcc6 and libstdc++ leads to error because xapian-core is linked with libc++ BROKEN_FreeBSD_10= /usr/include/c++/v1/memory:4004:35: error: no viable overloaded '=' + +BINARY_ALIAS= python3=python${PYTHON_VER} python3-config=python${PYTHON_VER}-config .include Index: head/x11/radare-cutter/Makefile =================================================================== --- head/x11/radare-cutter/Makefile (revision 474553) +++ head/x11/radare-cutter/Makefile (revision 474554) @@ -1,35 +1,36 @@ # $FreeBSD$ PORTNAME= radare-cutter PORTVERSION= 1.5 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= swills@FreeBSD.org COMMENT= GUI for radare2 reverse engineering framework LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/../COPYING -BUILD_DEPENDS= python3:lang/python3 -RUN_DEPENDS= python3:lang/python3 - LIB_DEPENDS= libr_bin.so:devel/radare2 USES= pkgconfig python:3.4+ qmake:outsource qt:5 USE_GITHUB= yes GH_ACCOUNT= radareorg GH_PROJECT= cutter USE_QT= buildtools_build core gui location network qml quick svg \ webchannel webengine widgets USE_GL= gl WRKSRC_SUBDIR= src PLIST_FILES= bin/Cutter \ share/appdata/Cutter.appdata.xml \ share/applications/Cutter.desktop \ share/pixmaps/cutter.svg + +post-patch: + @${REINPLACE_CMD} 's/python3/python-${PYTHON_VER}/' ${WRKSRC}/Cutter.pro .include Index: head/x11-wm/fvwm2/Makefile =================================================================== --- head/x11-wm/fvwm2/Makefile (revision 474553) +++ head/x11-wm/fvwm2/Makefile (revision 474554) @@ -1,135 +1,132 @@ # Created by: peter # $FreeBSD$ PORTNAME= fvwm PORTVERSION= 2.6.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= https://github.com/fvwmorg/fvwm/releases/download/${PORTVERSION}/ \ http://www.fvwm.org/generated/icon_download/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= cy@FreeBSD.org COMMENT= Popular virtual window manager for X -BUILD_DEPENDS= python3:lang/python3 RUN_DEPENDS= gm4:devel/m4 \ - p5-XML-Parser>=0:textproc/p5-XML-Parser \ - python3:lang/python3 + p5-XML-Parser>=0:textproc/p5-XML-Parser LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 # Other ports this port cannot coexist with CONFLICTS?= fvwm1-1.* fvwm-2.[457].* GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-mandoc --without-gnome --disable-gtk -CONFIGURE_ENV= PYTHON=${PYTHON_CMD} +CONFIGURE_ARGS= --disable-mandoc --without-gnome --disable-gtk \ + ac_cv_path_PYTHON=${PYTHON_CMD} USES= gmake perl5 pkgconfig python:3.4+ gettext readline -USE_PYTHON= xdg USE_XORG= xcursor xft xinerama xpm xrender x11 ice xext USE_GNOME= cairo OPTIONS_DEFINE= ICONS ICONV STROKE RPLAY SESSION_MGMT PNG SVG BIDI NLS OPTIONS_DEFAULT=ICONS ICONV SESSION_MGMT PNG OPTIONS_SUB= yes STROKE_DESC= support for mouse gestures RPLAY_DESC= RPlay support in FvwmEvent SESSION_MGMT_DESC= Session Management support BIDI_DESC= Asian bi-directional text support PLIST_SUB= FVWM_VERSION="${PORTVERSION}" .include .if ${PORT_OPTIONS:MICONS} FVWM_ICONS= fvwm_icons-20070101 DISTFILES+= ${FVWM_ICONS}.tar.bz2 .endif .if ${PORT_OPTIONS:MICONV} CONFIGURE_ARGS+= --with-iconv-library=${LOCALBASE}/lib \ --with-iconv-includes=${LOCALBASE}/include \ --enable-iconv USES+= iconv .else CONFIGURE_ARGS+= --disable-iconv .endif .if ${PORT_OPTIONS:MSTROKE} LIB_DEPENDS+= libstroke.so:devel/libstroke CONFIGURE_ARGS+= --with-stroke-library=${LOCALBASE}/lib \ --with-stroke-includes=${LOCALBASE}/include .else CONFIGURE_ARGS+= --without-stroke-library .endif .if ${PORT_OPTIONS:MRPLAY} LIB_DEPENDS+= librplay.so:audio/rplay CONFIGURE_ARGS+= --with-rplay-library=${LOCALBASE}/lib \ --with-rplay-includes=${LOCALBASE}/include .else CONFIGURE_ARGS+= --without-rplay-library .endif .if ${PORT_OPTIONS:MSESSION_MGMT} USE_XORG+= sm .else CONFIGURE_ARGS+= --disable-sm .endif .if ${PORT_OPTIONS:MPNG} LIB_DEPENDS+= libpng.so:graphics/png CONFIGURE_ARGS+= --with-png-includes=${LOCALBASE}/include \ --with-png-library=${LOCALBASE}/lib .else CONFIGURE_ARGS+= --without-png-library .endif .if ${PORT_OPTIONS:MSVG} USE_GNOME+= librsvg2 .else CONFIGURE_ARGS+= --disable-rsvg .endif .if ${PORT_OPTIONS:MBIDI} LIB_DEPENDS+= libfribidi.so:converters/fribidi CONFIGURE_ARGS+= --enable-bidi \ --with-bidi-bindir=${LOCALBASE}/bin .else CONFIGURE_ARGS+= --disable-bidi .endif .if ${PORT_OPTIONS:MNLS} CONFIGURE_ARGS+= --with-intl-library=${LOCALBASE}/lib \ --with-intl-includes=${LOCALBASE}/include .else CONFIGURE_ARGS+= --disable-nls .endif .include .if ${PORT_OPTIONS:MICONS} post-extract: @${MKDIR} ${WRKDIR}/icons @${TAR} -xzf ${DISTDIR}/${FVWM_ICONS}.tar.bz2 -C ${WRKDIR}/icons .endif post-patch: @${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' \ ${WRKSRC}/modules/FvwmM4/FvwmM4.c @${REINPLACE_CMD} -e 's,/etc/,${LOCALBASE}/etc/,g' \ ${WRKSRC}/bin/fvwm-menu-desktop.in post-install: ${INSTALL_DATA} ${FILESDIR}/system.fvwm2rc \ ${STAGEDIR}${PREFIX}/etc/system.fvwm2rc.dist .if ${PORT_OPTIONS:MICONS} ${MKDIR} ${STAGEDIR}${PREFIX}/share/fvwm/pixmaps ${INSTALL_DATA} ${WRKDIR}/icons/${FVWM_ICONS}/*.xpm \ ${STAGEDIR}${PREFIX}/share/fvwm/pixmaps .endif .include