Index: head/lang/p5-JavaScript-SpiderMonkey/Makefile =================================================================== --- head/lang/p5-JavaScript-SpiderMonkey/Makefile (revision 446935) +++ head/lang/p5-JavaScript-SpiderMonkey/Makefile (revision 446936) @@ -1,26 +1,27 @@ # Created by: kappa@FreeBSD.org.ua # $FreeBSD$ PORTNAME= JavaScript-SpiderMonkey PORTVERSION= 0.21 PORTREVISION= 2 CATEGORIES= lang perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- MAINTAINER= sunpoet@FreeBSD.org COMMENT= Perl interface to Mozilla JavaScript implementation LICENSE= ART10 GPLv1 LICENSE_COMB= dual LIB_DEPENDS= libjs.so:lang/spidermonkey17 TEST_DEPENDS= p5-Log-Log4perl>=0:devel/p5-Log-Log4perl USE_PERL5= configure USES= perl5 +CFLAGS+= -I${LOCALBASE}/include/js-1.7/ post-patch: @${REINPLACE_CMD} -e 's|libjs.a|libjs.so|' ${WRKSRC}/Makefile.PL .include Index: head/lang/p5-JavaScript-SpiderMonkey/files/patch-Makefile.PL =================================================================== --- head/lang/p5-JavaScript-SpiderMonkey/files/patch-Makefile.PL (revision 446935) +++ head/lang/p5-JavaScript-SpiderMonkey/files/patch-Makefile.PL (revision 446936) @@ -1,14 +1,17 @@ ---- Makefile.PL.orig 2010-11-17 13:51:38.000000000 +0100 -+++ Makefile.PL 2010-11-17 13:59:54.000000000 +0100 -@@ -71,11 +71,6 @@ - $include_dir =~ s/$c_header$//; - push @JS_INCL_DIRS, $include_dir; - } -- foreach my $headerfile(glob "$include_path/*/$c_header") { -- my $include_dir = $headerfile; +--- Makefile.PL.orig 2011-10-23 12:27:21.000000000 +0200 ++++ Makefile.PL 2017-06-03 21:50:44.801687000 +0200 +@@ -68,13 +68,8 @@ + next if ! -f $libfile; + my $include_path = $possible_install_paths{$install_path}; + foreach my $c_header(@c_header_files) { +- if (-f "$include_path/$c_header") { ++ if (-f "$include_path/js-1.7/$c_header") { + my $include_dir = "$include_path/$c_header"; - $include_dir =~ s/$c_header$//; - push @JS_INCL_DIRS, $include_dir; - } - } - if (scalar(@JS_INCL_DIRS) == scalar(@c_header_files)) { - $JS_LIB_DIR = $libfile; +- foreach my $headerfile(glob "$include_path/*/$c_header") { +- my $include_dir = $headerfile; + $include_dir =~ s/$c_header$//; + push @JS_INCL_DIRS, $include_dir; + } Index: head/lang/spidermonkey17/Makefile =================================================================== --- head/lang/spidermonkey17/Makefile (revision 446935) +++ head/lang/spidermonkey17/Makefile (revision 446936) @@ -1,68 +1,70 @@ # Created by: Dan Rench # $FreeBSD$ PORTNAME= spidermonkey17 DISTVERSION= 1.7.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang MASTER_SITES= MOZILLA/js DISTNAME= js-${DISTVERSION} MAINTAINER= citric@cubicone.tmetic.com COMMENT= Standalone JavaScript interpreter from the Mozilla project LIB_DEPENDS= libnspr4.so:devel/nspr CONFLICTS= njs-[0-9]* MAKE_ARGS+= JS_THREADSAFE=YES \ PROG_LIBS="-lreadline -lncurses -lm -lpthread" \ LDFLAGS="-L${LOCALBASE}/lib" CFLAGS+= -I${LOCALBASE}/include/nspr BROKEN_armv6= fails to link: final link failed: Nonrepresentable section on output BROKEN_mips64= fails to link: final link failed: Nonrepresentable section on output BROKEN_sparc64= fails to link USES= gmake ncurses readline MAKEFILE= Makefile.ref ALL_TARGET= ${OPSYS}`${UNAME} -r`_DBG.OBJ/js MAKE_ENV+= CCC="${CXX}" USE_LDCONFIG= yes SRC_DIR= js/src JSH= jsapi.h jsarena.h jsarray.h jsatom.h jsautocfg.h jsbool.h \ jsclist.h jscntxt.h jscompat.h jsconfig.h jsdate.h jsdhash.h \ jsdtoa.h jsemit.h jsexn.h jsfun.h jsgc.h jshash.h jsinterp.h \ jsiter.h jslibmath.h jslock.h jslong.h jsmath.h jsnum.h jsobj.h \ jsopcode.h jsosdep.h jsotypes.h jsparse.h jsprf.h jsprvtd.h \ jspubtd.h jsutil.h jsregexp.h jsscan.h jsscope.h jsscript.h \ jsstr.h jstypes.h jsxdrapi.h jsxml.h \ js.msg jsproto.tbl -PLIST_FILES= bin/js lib/libjs.so lib/libjs.so.1 ${JSH:S,^,include/,} +PLIST_FILES= bin/js lib/libjs.so lib/libjs.so.1 ${JSH:S,^,include/js-1.7/,} WRKSRC= ${WRKDIR}/${SRC_DIR} EXTRACT_AFTER_ARGS= --exclude js/jsd OPTIONS_DEFINE= UTF8 .include .if ${PORT_OPTIONS:MUTF8} CFLAGS+= -DJS_C_STRINGS_ARE_UTF8 .endif do-configure: ${CP} ${WRKSRC}/config/Linux_All.mk \ ${WRKSRC}/config/${OPSYS}`${UNAME} -r`.mk do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${OPSYS}`${UNAME} -r`_DBG.OBJ/js \ ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/${OPSYS}`${UNAME} -r`_DBG.OBJ/libjs.so \ ${STAGEDIR}${PREFIX}/lib ${LN} -sf libjs.so ${STAGEDIR}${PREFIX}/lib/libjs.so.1 ${CP} ${WRKSRC}/${OPSYS}`${UNAME} -r`_DBG.OBJ/jsautocfg.h ${WRKSRC} - @${INSTALL_DATA} ${JSH:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/include/ + @${MKDIR} ${STAGEDIR}${PREFIX}/include/js-1.7 + @${INSTALL_DATA} ${JSH:S,^,${WRKSRC}/,} \ + ${STAGEDIR}${PREFIX}/include/js-1.7/ .include Index: head/net/mediatomb/Makefile =================================================================== --- head/net/mediatomb/Makefile (revision 446935) +++ head/net/mediatomb/Makefile (revision 446936) @@ -1,117 +1,117 @@ # Created by: Leonhard Wimmer # $FreeBSD$ PORTNAME= mediatomb PORTVERSION= 0.12.1 PORTREVISION= 17 CATEGORIES= net multimedia MASTER_SITES= SF/${PORTNAME}/MediaTomb/${PORTVERSION} MAINTAINER= leo@mediatomb.cc COMMENT= UPnP AV MediaServer LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libexpat.so:textproc/expat2 GNU_CONFIGURE= yes LDFLAGS+= -lpthread ${ICONV_LIB} CONFIGURE_ARGS= --with-search="${LOCALBASE}" \ --disable-inotify CONFIGURE_ENV= PTHREAD_LIBS="-lpthread" USES= compiler:gcc-c++11-lib iconv localbase:ldflags USE_RC_SUBR= mediatomb USERS= mediatomb GROUPS= ${USERS} SUB_FILES= config.xml.dist \ pkg-install \ pkg-deinstall SUB_LIST= MEDIATOMB_USER=${USERS} \ MEDIATOMB_GROUP=${GROUPS} \ MEDIATOMB_DIR=${DESTDIR}/var/db/mediatomb OPTIONS_DEFINE= JS LIBEXIF FFMPEGTHUMBNAILER \ EXTERNAL_TRANSCODING CURL DEBUG OPTIONS_MULTI= DB OPTIONS_MULTI_DB= SQLITE MYSQL OPTIONS_RADIO= METADATA TAG OPTIONS_RADIO_METADATA= FFMPEG LIBEXTRACTOR OPTIONS_RADIO_TAG= TAGLIB ID3LIB OPTIONS_DEFAULT= SQLITE MYSQL JS LIBEXIF TAGLIB FFMPEG FFMPEGTHUMBNAILER \ EXTERNAL_TRANSCODING CURL METADATA_DESC= Metadata extractor TAG_DESC= Tag library DB_DESC= Database backend JS_DESC= JavaScript (SpiderMonkey) support TAGLIB_DESC= taglib support FFMPEG_DESC= ffmpeg metadata extraction support FFMPEGTHUMBNAILER_DESC= ffmpeg thumbnailer support EXTERNAL_TRANSCODING_DESC= external transcoding support ID3LIB_DESC= id3lib support LIBEXTRACTOR_DESC= libextractor support SQLITE_USES= sqlite SQLITE_CONFIGURE_ENABLE= sqlite3 SQLITE_CONFIGURE_ON= --with-sqlite3-h="${LOCALBASE}/include" \ --with-sqlite3-libs="${LOCALBASE}/lib" MYSQL_USES= mysql MYSQL_CONFIGURE_ENABLE= mysql MYSQL_CONFIGURE_ON= --with-mysql-cfg="${LOCALBASE}/bin/mysql_config" JS_CONFIGURE_ENABLE= libjs -JS_CONFIGURE_ON= --with-js-h="${LOCALBASE}/include" \ +JS_CONFIGURE_ON= --with-js-h="${LOCALBASE}/include/js-1.7" \ --with-js-libs="${LOCALBASE}/lib" JS_LIB_DEPENDS= libjs.so:lang/spidermonkey17 LIBEXIF_CONFIGURE_ENABLE= libexif LIBEXIF_CONFIGURE_ON= --with-libexif-h="${LOCALBASE}/include" \ --with-libexif-libs="${LOCALBASE}/lib" LIBEXIF_LIB_DEPENDS= libexif.so:graphics/libexif EXTERNAL_TRANSCODING_CONFIGURE_ENABLE= external-transcoding FFMPEGTHUMBNAILER_CONFIGURE_ENABLE= ffmpegthumbnailer FFMPEGTHUMBNAILER_CONFIGURE_ON= --with-ffmpegthumbnailer-h="${LOCALBASE}/include" \ --with-ffmpegthumbnailer-libs="${LOCALBASE}/lib" FFMPEGTHUMBNAILER_LIB_DEPENDS= libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer # CURL is only useful in combination with EXTERNAL_TRANSCODING CURL_IMPLIES= EXTERNAL_TRANSCODING CURL_CONFIGURE_ENABLE= curl CURL_CONFIGURE_ON= --with-curl-cfg="${LOCALBASE}/bin/curl-config" CURL_LIB_DEPENDS= libcurl.so:ftp/curl FFMPEG_CONFIGURE_ENABLE= ffmpeg FFMPEG_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg LIBEXTRACTOR_CONFIGURE_ENABLE= libextractor LIBEXTRACTOR_CONFIGURE_ON= --with-extractor-h="${LOCALBASE}/include" \ --with-extractor-libs="${LOCALBASE}/lib" LIBEXTRACTOR_LIB_DEPENDS= libextractor.so:textproc/libextractor LIBEXTRACTOR_BROKEN= LIBEXTRACTOR option fails to configure (checking for EXTRACTOR_getKeywords in -lextractor... no) ID3LIB_CONFIGURE_ENABLE= id3lib ID3LIB_CONFIGURE_ON= --with-id3lib-h="${LOCALBASE}/include" \ --with-id3lib-libs="${LOCALBASE}/lib" ID3LIB_LIB_DEPENDS= libid3.so:audio/id3lib TAGLIB_CONFIGURE_ENABLE= taglib TAGLIB_CONFIGURE_ON= --with-taglib-cfg="${LOCALBASE}/bin/taglib-config" TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib DEBUG_CONFIGURE_ENABLE= tombdebug post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/mediatomb @${MKDIR} ${STAGEDIR}/var/log/mediatomb @${MKDIR} ${STAGEDIR}/var/db/mediatomb ${INSTALL_DATA} ${WRKDIR}/config.xml.dist ${STAGEDIR}${PREFIX}/etc/mediatomb/config.xml.dist .include Index: head/www/elinks/Makefile =================================================================== --- head/www/elinks/Makefile (revision 446935) +++ head/www/elinks/Makefile (revision 446936) @@ -1,105 +1,106 @@ # Created by: Michael Vasilenko # $FreeBSD$ PORTNAME= elinks DISTVERSION= 0.11.7 PORTREVISION= 8 CATEGORIES= www MASTER_SITES= http://elinks.or.cz/download/ MAINTAINER= beat@FreeBSD.org COMMENT= Links text WWW browser with enhancements LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes USES= bison cpe execinfo gmake localbase ssl tar:bzip2 CONFIGURE_ARGS= --without-zlib LIBS+= -lexecinfo OPTIONS_DEFINE= 88COLORS 256COLORS SPIDERMONKEY XBELMARKS LOCAL_CGI \ FINGER GOPHER BITTORRENT NNTP FTP FSP SMB EXMODE \ HIGHLIGHT IDN NOROOT FASTMEM PERL \ LUA GUILE ICONV MOUSE NLS OPTIONS_DEFAULT= 88COLORS 256COLORS FTP EXMODE HIGHLIGHT FASTMEM MOUSE OPTIONS_SUB= yes 88COLORS_DESC= 88 color support 256COLORS_DESC= 256 color support SPIDERMONKEY_DESC= ECMAScript support (via SpiderMonkey) XBELMARKS_DESC= XBEL bookmarks (via expat) LOCAL_CGI_DESC= Local CGI support FSP_DESC= FSP protocol support (via fsplib) EXMODE_DESC= Exmode (CLI) support HIGHLIGHT_DESC= HTML highlighting using DOM engine NOROOT_DESC= Prevention of usage by root FASTMEM_DESC= Fast memory allocation functions NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-nls GUILE_LIB_DEPENDS= libguile.so:lang/guile GUILE_CONFIGURE_WITH= guile LUA_USES= lua:51 LUA_CONFIGURE_WITH= lua LUA_CPPFLAGS= -I${LUA_INCDIR} LUA_LDFLAGS= -L${LUA_LIBDIR} PERL_USES= perl5 PERL_CONFIGURE_WITH= perl FASTMEM_CONFIGURE_ON= --enable-fastmem IDN_LIB_DEPENDS= libidn.so:dns/libidn IDN_CONFIGURE_WITH= idn NOROOT_CONFIGURE_ON= --enable-no-root HIGHLIGHT_CONFIGURE_ON= --enable-html-highlight EXMODE_CONFIGURE_ON= --enable-exmode SMB_USES= samba # smbclient SMB_CONFIGURE_ENABLE= smb FSP_RUN_DEPENDS= ${LOCALBASE}/lib/libfsplib.a:net/fsplib FSP_BUILD_DEPENDS= ${LOCALBASE}/lib/libfsplib.a:net/fsplib FSP_CONFIGURE_ENABLE= fsp FTP_CONFIGURE_ENABLE= ftp NNTP_CONFIGURE_ENABLE= nntp BITTORRENT_CONFIGURE_ENABLE= bittorrent GOPHER_CONFIGURE_ENABLE= gopher MOUSE_CONFIGURE_ENABLE= mouse FINGER_CONFIGURE_ENABLE= finger LOCAL_CGI_CONFIGURE_ENABLE= cgi XBELMARKS_LIB_DEPENDS= libexpat.so:textproc/expat2 XBELMARKS_CONFIGURE_ON= --enable-xbel --with-expat XBELNARKS_CONFIGURE_OFF=--disable-xbel 256COLORS_CONFIGURE_ON= --enable-256-colors 88COLORS_CONFIGURE_ON= --enable-88-colors SPIDERMONKEY_BUILD_DEPENDS= ${LOCALBASE}/lib/libjs.so:lang/spidermonkey17 SPIDERMONKEY_RUN_DEPENDS= js:lang/spidermonkey17 SPIDERMONKEY_LIB_DEPENDS= libnspr4.so:devel/nspr -SPIDERMONKEY_CFLAGS= -I${LOCALBASE}/include/nspr +SPIDERMONKEY_CFLAGS= -I${LOCALBASE}/include/nspr \ + -I${LOCALBASE}/include/js-1.7 SPIDERMONKEY_LDFLAGS= -lnspr4 -pthread -lpthread -lm SPIDERMONKEY_CONFIGURE_ON= --enable-sm-scripting --with-spidermonkey SPIDERMONKEY_CONFIGURE_OFF= --disable-sm-scripting --without-spidermonkey ICONV_USES= iconv ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} .include