From owner-svn-ports-branches@FreeBSD.ORG Mon Dec 16 08:04:40 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 86086A59; Mon, 16 Dec 2013 08:04:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 57E191330; Mon, 16 Dec 2013 08:04:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG84e5F027876; Mon, 16 Dec 2013 08:04:40 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG84ehJ027875; Mon, 16 Dec 2013 08:04:40 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312160804.rBG84ehJ027875@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 16 Dec 2013 08:04:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336615 - branches/2014Q1 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 08:04:40 -0000 Author: bapt Date: Mon Dec 16 08:04:39 2013 New Revision: 336615 URL: http://svnweb.freebsd.org/changeset/ports/336615 Log: Branch 2014Q1 This is a stable branch which will be maintained for 3 month all commit going into that branch should have been approved by portmgr@ or portmgr-lurkers@ Allowed commit in that branch: - security fixes - build/runtime fixes - infrastructure changes (at portmgr discression) - all other cases should be discussed with portmgr With hat: portmgr Added: branches/2014Q1/ - copied from r336614, head/ From owner-svn-ports-branches@FreeBSD.ORG Mon Dec 16 12:59:05 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 895A0D05; Mon, 16 Dec 2013 12:59:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 741CE1E00; Mon, 16 Dec 2013 12:59:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGCx5GV036708; Mon, 16 Dec 2013 12:59:05 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGCx4ZN036703; Mon, 16 Dec 2013 12:59:04 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312161259.rBGCx4ZN036703@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 16 Dec 2013 12:59:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336632 - in branches/2014Q1/ports-mgmt: pkg pkg-devel pkg-devel/files pkg/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 12:59:05 -0000 Author: bapt Date: Mon Dec 16 12:59:04 2013 New Revision: 336632 URL: http://svnweb.freebsd.org/changeset/ports/336632 Log: MFH: r336622 Fix sefault while cleaning up It only happens if one has list or key/value list in pkg.conf a workaround to update is to comment it out the time to upgrade Reported by: many Pointyhat to: bapt (again) Added: branches/2014Q1/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config - copied unchanged from r336622, head/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config branches/2014Q1/ports-mgmt/pkg/files/patch-libpkg_pkg_config - copied unchanged from r336622, head/ports-mgmt/pkg/files/patch-libpkg_pkg_config Modified: branches/2014Q1/ports-mgmt/pkg-devel/Makefile branches/2014Q1/ports-mgmt/pkg/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/ports-mgmt/pkg-devel/Makefile ============================================================================== --- branches/2014Q1/ports-mgmt/pkg-devel/Makefile Mon Dec 16 12:52:18 2013 (r336631) +++ branches/2014Q1/ports-mgmt/pkg-devel/Makefile Mon Dec 16 12:59:04 2013 (r336632) @@ -2,6 +2,7 @@ PORTNAME= pkg DISTVERSION= 1.2.4 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= http://files.etoilebsd.net/pkg/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ Copied: branches/2014Q1/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config (from r336622, head/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config Mon Dec 16 12:59:04 2013 (r336632, copy of r336622, head/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config) @@ -0,0 +1,28 @@ +--- libpkg/pkg_config.c.orig 2013-12-16 08:52:39.000000000 +0100 ++++ libpkg/pkg_config.c 2013-12-16 12:09:13.093549000 +0100 +@@ -293,6 +293,7 @@ + static size_t c_size = sizeof(c) / sizeof(struct config_entry); + + static void pkg_config_kv_free(struct pkg_config_kv *); ++static void pkg_config_value_free(struct pkg_config_value *); + static void pkg_config_free(struct pkg_config *conf); + static struct pkg_repo *pkg_repo_new(const char *name, const char *url); + +@@ -440,7 +441,7 @@ + continue; + } + if (!conf->fromenv) { +- pkg_config_free(conf); ++ HASH_FREE(conf->list, pkg_config_value, pkg_config_value_free); + conf->list = NULL; + obj_walk_array(cur, conf); + } +@@ -452,7 +453,7 @@ + continue; + } + if (!conf->fromenv) { +- pkg_config_free(conf); ++ HASH_FREE(conf->kvlist, pkg_config_kv, pkg_config_kv_free); + conf->kvlist = NULL; + obj_walk_object(cur, conf); + } Modified: branches/2014Q1/ports-mgmt/pkg/Makefile ============================================================================== --- branches/2014Q1/ports-mgmt/pkg/Makefile Mon Dec 16 12:52:18 2013 (r336631) +++ branches/2014Q1/ports-mgmt/pkg/Makefile Mon Dec 16 12:59:04 2013 (r336632) @@ -2,6 +2,7 @@ PORTNAME= pkg DISTVERSION= 1.2.4 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= http://files.etoilebsd.net/pkg/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ Copied: branches/2014Q1/ports-mgmt/pkg/files/patch-libpkg_pkg_config (from r336622, head/ports-mgmt/pkg/files/patch-libpkg_pkg_config) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/ports-mgmt/pkg/files/patch-libpkg_pkg_config Mon Dec 16 12:59:04 2013 (r336632, copy of r336622, head/ports-mgmt/pkg/files/patch-libpkg_pkg_config) @@ -0,0 +1,28 @@ +--- libpkg/pkg_config.c.orig 2013-12-16 08:52:39.000000000 +0100 ++++ libpkg/pkg_config.c 2013-12-16 12:09:13.093549000 +0100 +@@ -293,6 +293,7 @@ + static size_t c_size = sizeof(c) / sizeof(struct config_entry); + + static void pkg_config_kv_free(struct pkg_config_kv *); ++static void pkg_config_value_free(struct pkg_config_value *); + static void pkg_config_free(struct pkg_config *conf); + static struct pkg_repo *pkg_repo_new(const char *name, const char *url); + +@@ -440,7 +441,7 @@ + continue; + } + if (!conf->fromenv) { +- pkg_config_free(conf); ++ HASH_FREE(conf->list, pkg_config_value, pkg_config_value_free); + conf->list = NULL; + obj_walk_array(cur, conf); + } +@@ -452,7 +453,7 @@ + continue; + } + if (!conf->fromenv) { +- pkg_config_free(conf); ++ HASH_FREE(conf->kvlist, pkg_config_kv, pkg_config_kv_free); + conf->kvlist = NULL; + obj_walk_object(cur, conf); + } From owner-svn-ports-branches@FreeBSD.ORG Mon Dec 16 13:11:41 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C0BB7F80; Mon, 16 Dec 2013 13:11:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AC36E1EF2; Mon, 16 Dec 2013 13:11:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGDBfO8042998; Mon, 16 Dec 2013 13:11:41 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGDBfHQ042996; Mon, 16 Dec 2013 13:11:41 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312161311.rBGDBfHQ042996@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 16 Dec 2013 13:11:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336633 - in branches/2014Q1: . net-p2p net-p2p/libtorrent-rasterbar-15 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 13:11:41 -0000 Author: bapt Date: Mon Dec 16 13:11:40 2013 New Revision: 336633 URL: http://svnweb.freebsd.org/changeset/ports/336633 Log: MFH: r336625 Remove expired port: 2013-12-13 net-p2p/libtorrent-rasterbar-15: Unusable, development ceased Deleted: branches/2014Q1/net-p2p/libtorrent-rasterbar-15/ Modified: branches/2014Q1/MOVED branches/2014Q1/net-p2p/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/MOVED ============================================================================== --- branches/2014Q1/MOVED Mon Dec 16 12:59:04 2013 (r336632) +++ branches/2014Q1/MOVED Mon Dec 16 13:11:40 2013 (r336633) @@ -5305,3 +5305,4 @@ security/snortsms||2013-12-15|Has expire sysutils/hammerhead||2013-12-15|Has expired: Development no more active net-p2p/libtorrent-rasterbar-15-python||2013-12-15|Has expired: Unusable, development ceased graphics/openexr_ctl||2013-12-15|Has expired: Now distributed with ampasCTL-1.5 +net-p2p/libtorrent-rasterbar-15||2013-12-16|Has expired: Unusable, development ceased Modified: branches/2014Q1/net-p2p/Makefile ============================================================================== --- branches/2014Q1/net-p2p/Makefile Mon Dec 16 12:59:04 2013 (r336632) +++ branches/2014Q1/net-p2p/Makefile Mon Dec 16 13:11:40 2013 (r336633) @@ -46,7 +46,6 @@ SUBDIR += libtorrent SUBDIR += libtorrent-devel SUBDIR += libtorrent-rasterbar - SUBDIR += libtorrent-rasterbar-15 SUBDIR += libtorrent-rasterbar-python SUBDIR += linux-jigdo SUBDIR += linuxdcpp From owner-svn-ports-branches@FreeBSD.ORG Mon Dec 16 13:51:00 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F1F2BA4A; Mon, 16 Dec 2013 13:50:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D26A011A0; Mon, 16 Dec 2013 13:50:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGDoxf1057000; Mon, 16 Dec 2013 13:50:59 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGDowF3056992; Mon, 16 Dec 2013 13:50:58 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312161350.rBGDowF3056992@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 16 Dec 2013 13:50:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336636 - in branches/2014Q1/games/springlobby: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 13:51:00 -0000 Author: bapt Date: Mon Dec 16 13:50:57 2013 New Revision: 336636 URL: http://svnweb.freebsd.org/changeset/ports/336636 Log: MFH: r336617 - Update to 0.180 - Support staging - Use new LIB_DEPENDS syntax - Use new OPTIONS features This is needed for r336625 [1] Reported by: rene [1] Added: branches/2014Q1/games/springlobby/files/patch-lsl-fmemopen - copied unchanged from r336617, head/games/springlobby/files/patch-lsl-fmemopen branches/2014Q1/games/springlobby/files/patch-src-downloader-lib-src-lib-xmlrpc++-src-base64.h - copied unchanged from r336617, head/games/springlobby/files/patch-src-downloader-lib-src-lib-xmlrpc++-src-base64.h branches/2014Q1/games/springlobby/files/patch-src-lsl-src-lslunitsync-unitsync.cpp - copied unchanged from r336617, head/games/springlobby/files/patch-src-lsl-src-lslunitsync-unitsync.cpp branches/2014Q1/games/springlobby/files/patch-src-lsl-src-lslutils-misc.cpp - copied unchanged from r336617, head/games/springlobby/files/patch-src-lsl-src-lslutils-misc.cpp branches/2014Q1/games/springlobby/files/patch-src-spring.cpp - copied unchanged from r336617, head/games/springlobby/files/patch-src-spring.cpp Deleted: branches/2014Q1/games/springlobby/files/patch-CMakeLists.txt branches/2014Q1/games/springlobby/files/patch-src-battlelistctrl.cpp Modified: branches/2014Q1/games/springlobby/Makefile branches/2014Q1/games/springlobby/distinfo branches/2014Q1/games/springlobby/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/springlobby/Makefile ============================================================================== --- branches/2014Q1/games/springlobby/Makefile Mon Dec 16 13:41:56 2013 (r336635) +++ branches/2014Q1/games/springlobby/Makefile Mon Dec 16 13:50:57 2013 (r336636) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= springlobby -PORTVERSION= 0.143 -PORTREVISION= 2 +PORTVERSION= 0.180 CATEGORIES= games net MASTER_SITES= http://www.springlobby.info/tarballs/ \ http://mirror.amdmi3.ru/distfiles/ @@ -11,11 +10,14 @@ MASTER_SITES= http://www.springlobby.inf MAINTAINER= amdmi3@FreeBSD.org COMMENT= Cross-platform lobby client for the Spring RTS project +LICENSE= GPLv2 + RUN_DEPENDS= spring:${PORTSDIR}/games/spring -LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ + libboost_thread.so:${PORTSDIR}/devel/boost-libs USE_BZIP2= yes -USES= cmake +USES= cmake pkgconfig compiler:c++11-lib CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \ -DENABLE_DEBUG_REPORT=FALSE USE_WX= 2.8+ @@ -23,41 +25,24 @@ WX_UNICODE= yes PORTDOCS= * -OPTIONS_DEFINE= TORRENT SOUND DOCS NLS -OPTIONS_DEFAULT= TORRENT SOUND -TORRENT_DESC= Support automatic content downloads via torrent -SOUND_DESC= Enable sound - -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CMAKE_ARGS+= -DOPTION_TRANSLATION_SUPPORT:BOOL=OFF -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MTORRENT} -LIB_DEPENDS+= torrent-rasterbar:${PORTSDIR}/net-p2p/libtorrent-rasterbar-15 -.else -CMAKE_ARGS+= -DOPTION_TORRENT_SYSTEM:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MSOUND} -USE_OPENAL= al -.else -CMAKE_ARGS+= -DOPTION_SOUND:BOOL=OFF -.endif - -post-patch: - @${REINPLACE_CMD} -e '//d' \ - ${WRKSRC}/src/utils/curlhelper.h \ - ${WRKSRC}/src/utils/downloader.cpp -.if ! ${PORT_OPTIONS:MDOCS} - @${REINPLACE_CMD} -e '/install.*FILES.*share\/doc/ d' \ - ${WRKSRC}/CMakeLists.txt -.endif +OPTIONS_DEFINE= SOUND NLS NOTIFY DOCS +OPTIONS_DEFAULT=SOUND NOTIFY +OPTIONS_SUB= yes + +SOUND_DESC= Enable sound notifications +NOTIFY_DESC= Enable libnotify support for popup status messages + +NLS_CMAKE_ON= -DOPTION_TRANSLATION_SUPPORT:BOOL=ON +NLS_CMAKE_OFF= -DOPTION_TRANSLATION_SUPPORT:BOOL=OFF +NLS_USES= gettext + +SOUND_CMAKE_ON= -DOPTION_SOUND:BOOL=ON +SOUND_CMAKE_OFF= -DOPTION_SOUND:BOOL=OFF +SOUND_LIB_DEPENDS= libalure.so:${PORTSDIR}/audio/alure +SOUND_USE= OPENAL=al + +NOTIFY_CMAKE_ON= -DOPTION_NOTIFY=ON +NOTIFY_CMAKE_OFF= -DOPTION_NOTIFY=OFF +NOTIFY_LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify .include Modified: branches/2014Q1/games/springlobby/distinfo ============================================================================== --- branches/2014Q1/games/springlobby/distinfo Mon Dec 16 13:41:56 2013 (r336635) +++ branches/2014Q1/games/springlobby/distinfo Mon Dec 16 13:50:57 2013 (r336636) @@ -1,2 +1,2 @@ -SHA256 (springlobby-0.143.tar.bz2) = 4694a0d88c7409a42cc83cd10b80226aa2cc5b2f0f83fa95351638fee3e77b61 -SIZE (springlobby-0.143.tar.bz2) = 1797369 +SHA256 (springlobby-0.180.tar.bz2) = ca9612fd4b8beb940169dfdbca76d15a73daee90ceb35c12f5ef451e79e6576c +SIZE (springlobby-0.180.tar.bz2) = 2543659 Copied: branches/2014Q1/games/springlobby/files/patch-lsl-fmemopen (from r336617, head/games/springlobby/files/patch-lsl-fmemopen) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/springlobby/files/patch-lsl-fmemopen Mon Dec 16 13:50:57 2013 (r336636, copy of r336617, head/games/springlobby/files/patch-lsl-fmemopen) @@ -0,0 +1,32 @@ +diff --git src/CMakeLists.txt src/CMakeLists.txt +index a1d9e3a..d82dac8 100644 +--- src/lsl/src/CMakeLists.txt ++++ src/lsl/src/CMakeLists.txt +@@ -11,6 +11,14 @@ ENDIF ( EXISTS ${libSpringLobby_BINARY_DIR}/libSpringLobby_config.h OR EXISTS + INCLUDE_DIRECTORIES(${libSpringLobby_SOURCE_DIR}/lib) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) + ++INCLUDE (CheckFunctionExists) ++ ++SET(CMAKE_REQUIRED_INCLUDES stdio.h) ++CHECK_FUNCTION_EXISTS(fmemopen HAVE_FMEMOPEN) ++IF(HAVE_FMEMOPEN) ++ ADD_DEFINITIONS(-DHAVE_FMEMOPEN) ++ENDIF(HAVE_FMEMOPEN) ++ + add_subdirectory( lslutils ) + if (LSLSERVER) + add_subdirectory( lsl ) +diff --git src/lslunitsync/image.cpp src/lslunitsync/image.cpp +index fbc4591..e26215c 100644 +--- src/lsl/src/lslunitsync/image.cpp ++++ src/lsl/src/lslunitsync/image.cpp +@@ -14,7 +14,7 @@ + #include + + +-#ifdef WIN32 ++#if !defined(HAVE_FMEMOPEN) + #include + //! we need our own fmemopen implementation since its posix only + FILE* fmemopen(void* data, size_t size, const char* mode) Copied: branches/2014Q1/games/springlobby/files/patch-src-downloader-lib-src-lib-xmlrpc++-src-base64.h (from r336617, head/games/springlobby/files/patch-src-downloader-lib-src-lib-xmlrpc++-src-base64.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/springlobby/files/patch-src-downloader-lib-src-lib-xmlrpc++-src-base64.h Mon Dec 16 13:50:57 2013 (r336636, copy of r336617, head/games/springlobby/files/patch-src-downloader-lib-src-lib-xmlrpc++-src-base64.h) @@ -0,0 +1,11 @@ +--- src/downloader/lib/src/lib/xmlrpc++/src/base64.h.orig 2013-02-10 22:02:43.000000000 +0400 ++++ src/downloader/lib/src/lib/xmlrpc++/src/base64.h 2013-12-10 04:19:12.257112752 +0400 +@@ -13,6 +13,8 @@ + # include + #endif + ++#include ++ + static + int _base64Chars[]= {'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z', + 'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z', Copied: branches/2014Q1/games/springlobby/files/patch-src-lsl-src-lslunitsync-unitsync.cpp (from r336617, head/games/springlobby/files/patch-src-lsl-src-lslunitsync-unitsync.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/springlobby/files/patch-src-lsl-src-lslunitsync-unitsync.cpp Mon Dec 16 13:50:57 2013 (r336636, copy of r336617, head/games/springlobby/files/patch-src-lsl-src-lslunitsync-unitsync.cpp) @@ -0,0 +1,17 @@ +--- src/lsl/src/lslunitsync/unitsync.cpp.orig 2013-11-23 01:34:07.000000000 +0400 ++++ src/lsl/src/lslunitsync/unitsync.cpp 2013-12-10 04:23:40.875093997 +0400 +@@ -55,13 +55,7 @@ + { + static std::locale l("C"); + static boost::is_iless il(l); +- try { +- //this fails on certain names +- return il(first,second); +- } +- catch(...) { +- return first < second; +- } ++ return first < second; + } + + bool Unitsync::LoadUnitSyncLib( const std::string& unitsyncloc ) Copied: branches/2014Q1/games/springlobby/files/patch-src-lsl-src-lslutils-misc.cpp (from r336617, head/games/springlobby/files/patch-src-lsl-src-lslutils-misc.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/springlobby/files/patch-src-lsl-src-lslutils-misc.cpp Mon Dec 16 13:50:57 2013 (r336636, copy of r336617, head/games/springlobby/files/patch-src-lsl-src-lslutils-misc.cpp) @@ -0,0 +1,10 @@ +--- src/lsl/src/lslutils/misc.cpp.orig 2013-08-31 14:17:00.000000000 +0400 ++++ src/lsl/src/lslutils/misc.cpp 2013-12-10 04:20:26.887107289 +0400 +@@ -3,6 +3,7 @@ + + #include + #include ++#include + + namespace LSL { + namespace Util { Copied: branches/2014Q1/games/springlobby/files/patch-src-spring.cpp (from r336617, head/games/springlobby/files/patch-src-spring.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/springlobby/files/patch-src-spring.cpp Mon Dec 16 13:50:57 2013 (r336636, copy of r336617, head/games/springlobby/files/patch-src-spring.cpp) @@ -0,0 +1,10 @@ +--- src/spring.cpp.orig 2013-11-23 01:34:04.000000000 +0400 ++++ src/spring.cpp 2013-12-10 04:26:29.352082590 +0400 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + + #include "spring.h" Modified: branches/2014Q1/games/springlobby/pkg-plist ============================================================================== --- branches/2014Q1/games/springlobby/pkg-plist Mon Dec 16 13:41:56 2013 (r336635) +++ branches/2014Q1/games/springlobby/pkg-plist Mon Dec 16 13:50:57 2013 (r336636) @@ -18,8 +18,6 @@ share/icons/hicolor/scalable/apps/spring %%NLS%%share/locale/sv/LC_MESSAGES/springlobby.mo %%NLS%%share/locale/uk/LC_MESSAGES/springlobby.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/springlobby.mo -%%NLS%%@dirrmtry share/locale/en_US/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/en_US @dirrmtry share/icons/hicolor/scalable/apps @dirrmtry share/icons/hicolor/scalable @dirrmtry share/icons/hicolor From owner-svn-ports-branches@FreeBSD.ORG Mon Dec 16 19:13:29 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AB41762E; Mon, 16 Dec 2013 19:13:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 95C4110E1; Mon, 16 Dec 2013 19:13:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGJDTjE076567; Mon, 16 Dec 2013 19:13:29 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGJDSOo076558; Mon, 16 Dec 2013 19:13:28 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312161913.rBGJDSOo076558@svn.freebsd.org> From: Antoine Brodin Date: Mon, 16 Dec 2013 19:13:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336659 - in branches/2014Q1/devel/libreadline-java: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 19:13:29 -0000 Author: antoine Date: Mon Dec 16 19:13:27 2013 New Revision: 336659 URL: http://svnweb.freebsd.org/changeset/ports/336659 Log: MFH r336652: - Fix build with clang - Stage support - Do not hardcode /usr/local PR: ports/184751 Submitted by: Martin Kammerhofer (maintainer) Approved by: portmgr (implicit) Added: branches/2014Q1/devel/libreadline-java/files/jython.sh.in - copied unchanged from r336652, head/devel/libreadline-java/files/jython.sh.in branches/2014Q1/devel/libreadline-java/files/pkg-message.in - copied unchanged from r336652, head/devel/libreadline-java/files/pkg-message.in Deleted: branches/2014Q1/devel/libreadline-java/files/jython.sh branches/2014Q1/devel/libreadline-java/pkg-message Modified: branches/2014Q1/devel/libreadline-java/Makefile branches/2014Q1/devel/libreadline-java/files/JReadlineCompleter.py branches/2014Q1/devel/libreadline-java/files/patch-src-native-Makefile branches/2014Q1/devel/libreadline-java/files/patch-src-native-org_gnu_readline_Readline.c Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/libreadline-java/Makefile ============================================================================== --- branches/2014Q1/devel/libreadline-java/Makefile Mon Dec 16 19:10:23 2013 (r336658) +++ branches/2014Q1/devel/libreadline-java/Makefile Mon Dec 16 19:13:27 2013 (r336659) @@ -4,7 +4,7 @@ PORTNAME= libreadline-java PORTVERSION= 0.8.0 DISTVERSIONSUFFIX= -src -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel java MASTER_SITES= SF/java-readline/java-readline/${PORTVERSION} @@ -17,39 +17,33 @@ RUN_DEPENDS= ${LOCALBASE}/include/editli ALL_TARGET= # empty MAKE_ENV= JAVA_HOME="${JAVA_HOME}" JAVA="${JAVA}" JAVAC="${JAVAC}" \ JAVAH="${JAVAH}" JAR_="${JAR}" -PKGMESSAGE= ${WRKDIR}/pkg-message +SUB_FILES= pkg-message jython.sh PLIST_FILES= %%JAVAJARDIR%%/libreadline-java.jar lib/libJavaReadline.so \ lib/libJavaEditline.so lib/libJavaGetline.so -.if !defined(NOPORTDOCS) -PLIST_FILES+= %%DOCSDIR%%/README.1st %%DOCSDIR%%/README \ - %%DOCSDIR%%/jython.sh %%DOCSDIR%%/JReadlineCompleter.py \ - @dirrm\ %%DOCSDIR%% -.endif -USE_GMAKE= yes +PORTDOCS= README.1st README jython.sh JReadlineCompleter.py +USES= gmake USE_JAVA= yes USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} MAKE_JOBS_UNSAFE= yes -NO_STAGE= yes +OPTIONS_DEFINE= DOCS + +.include + do-install: - ${INSTALL_DATA} ${WRKSRC}/libreadline-java.jar ${JAVAJARDIR} - ${INSTALL_DATA} ${WRKSRC}/libJavaReadline.so ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/libJavaEditline.so ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/libJavaGetline.so ${PREFIX}/lib -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.1st ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_DATA} ${FILESDIR}/jython.sh ${DOCSDIR} - ${INSTALL_DATA} ${FILESDIR}/JReadlineCompleter.py ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/libreadline-java.jar ${STAGEDIR}${JAVAJARDIR} + ${INSTALL_DATA} ${WRKSRC}/libJavaReadline.so ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/libJavaEditline.so ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/libJavaGetline.so ${STAGEDIR}${PREFIX}/lib +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.1st ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/jython.sh ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${FILESDIR}/JReadlineCompleter.py ${STAGEDIR}${DOCSDIR} .endif -post-install: - @${SED} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|g' -- \ - ${.CURDIR}/pkg-message >${PKGMESSAGE} - @${CAT} ${PKGMESSAGE} - .if !defined(BATCH) test: cd ${WRKSRC} && ${MAKE_ENV} ${GMAKE} test # Now type something! Modified: branches/2014Q1/devel/libreadline-java/files/JReadlineCompleter.py ============================================================================== --- branches/2014Q1/devel/libreadline-java/files/JReadlineCompleter.py Mon Dec 16 19:10:23 2013 (r336658) +++ branches/2014Q1/devel/libreadline-java/files/JReadlineCompleter.py Mon Dec 16 19:13:27 2013 (r336659) @@ -4,6 +4,10 @@ # # This is rlcompleter.py from CPython 2.5.1 adapted for Jython # and libreadline-java. +# +# NOTE: Jython >= 2.5 already includes rlcompleter, +# see http://www.jython.org/docs/library/rlcompleter.html +# This is useful for older Jython versions only! """TAB-completion for Jython + libreadline-java @@ -105,9 +109,13 @@ class PyCompleter: try: if state == 0: if "." in text: - self.matches = self.attr_matches(text) + matches = self.attr_matches(text) else: - self.matches = self.global_matches(text) + matches = self.global_matches(text) + # remove duplicates and sort + matches = list(set(matches)) + matches.sort() + self.matches = matches return self.matches[state] except (AttributeError, IndexError, NameError): return None Copied: branches/2014Q1/devel/libreadline-java/files/jython.sh.in (from r336652, head/devel/libreadline-java/files/jython.sh.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/libreadline-java/files/jython.sh.in Mon Dec 16 19:13:27 2013 (r336659, copy of r336652, head/devel/libreadline-java/files/jython.sh.in) @@ -0,0 +1,56 @@ +#!/bin/sh +# Invoke Jython. +# jython.sh,v 1.5 2007/09/28 09:13:55 martin Exp +# +# The path names below are for Jython 2.5.3 on FreeBSD. +# +# NOTE: Jython >= 2.5 already includes rlcompleter, +# see http://www.jython.org/docs/library/rlcompleter.html +# This is useful for older Jython versions only! + +if [ -d "%%LOCALBASE%%/lib/jython22" ] ; then + _ver=22 +else + _ver= +fi +CP="%%LOCALBASE%%/lib/jython${_ver}/jython.jar" +defs= +wrapper= + +case "${JYTHON_CONSOLE:-Editline}" in + *[Ee]dit[Ll]ine) + CP="$CP:%%LOCALBASE%%/share/java/classes/libreadline-java.jar" + defs="-Dpython.console=org.python.util.ReadlineConsole" + defs="$defs -Dpython.console.readlinelib=Editline" + ;; + *[Gg]et[Ll]ine) + CP="$CP:%%LOCALBASE%%/share/java/classes/libreadline-java.jar" + defs="-Dpython.console=org.python.util.ReadlineConsole" + defs="$defs -Dpython.console.readlinelib=Getline" + ;; + *[Jj][Ll]ine) + CP="$CP:%%LOCALBASE%%/share/java/classes/jline.jar" + defs="-Dpython.console=" + wrapper=jline.ConsoleRunner + ;; + *[Rr]ead[Ll]ine) + CP="$CP:%%LOCALBASE%%/share/java/classes/libreadline-java.jar" + defs="-Dpython.console=org.python.util.ReadlineConsole" + defs="$defs -Dpython.console.readlinelib=GnuReadline" + ;; + *) + echo >&2 "$0: illegal value of JYTHON_CONSOLE: $JYTHON_CONSOLE" + exit 64 + ;; +esac + + +if [ -n "$CLASSPATH" ]; then + CP="$CP:$CLASSPATH" +fi + +exec java -Dpython.home="%%LOCALBASE%%/lib/jython${_ver}" \ + -Dpython.cachedir="${HOME}/.jython-cachedir" \ + -classpath "$CP" $wrapper org.python.util.jython $defs "$@" + +#EOF# Modified: branches/2014Q1/devel/libreadline-java/files/patch-src-native-Makefile ============================================================================== --- branches/2014Q1/devel/libreadline-java/files/patch-src-native-Makefile Mon Dec 16 19:10:23 2013 (r336658) +++ branches/2014Q1/devel/libreadline-java/files/patch-src-native-Makefile Mon Dec 16 19:13:27 2013 (r336659) @@ -1,6 +1,13 @@ ---- src/native/Makefile.orig 2003-01-07 07:14:35.000000000 -0300 -+++ src/native/Makefile 2008-02-16 18:53:37.000000000 -0300 -@@ -44,10 +44,12 @@ +--- src/native/Makefile.orig 2003-01-07 11:14:35.000000000 +0100 ++++ src/native/Makefile 2013-12-13 08:29:23.000000000 +0100 +@@ -38,25 +38,28 @@ + INCLUDES = -I "c:/Programme/DevStudio/VC/include" \ + -I $(JAVAINCLUDE) -I $(JAVANATINC) + LIB = "c:/Programme/DevStudio/VC/lib" +-CC = cl ++#CC = gcc + OBJ_EXT := obj + LIB_PRE := LIB_EXT := dll CFLAGS=-DWIN32=$(WIN32) -D__IBMC__ else @@ -16,7 +23,8 @@ ifeq (cygwin,$(WIN32)) JavaGetline_LIBS = -lcygwin endif -@@ -55,8 +57,9 @@ +-CC = gcc ++CC = cc OBJ_EXT := o LIB_PRE := lib LIB_EXT := so Modified: branches/2014Q1/devel/libreadline-java/files/patch-src-native-org_gnu_readline_Readline.c ============================================================================== --- branches/2014Q1/devel/libreadline-java/files/patch-src-native-org_gnu_readline_Readline.c Mon Dec 16 19:10:23 2013 (r336658) +++ branches/2014Q1/devel/libreadline-java/files/patch-src-native-org_gnu_readline_Readline.c Mon Dec 16 19:13:27 2013 (r336659) @@ -1,5 +1,14 @@ --- src/native/org_gnu_readline_Readline.c.orig 2003-01-07 11:14:35.000000000 +0100 -+++ src/native/org_gnu_readline_Readline.c 2007-09-27 09:21:14.000000000 +0200 ++++ src/native/org_gnu_readline_Readline.c 2013-12-12 20:40:36.000000000 +0100 +@@ -430,7 +430,7 @@ + jtext = (*jniEnv)->NewStringUTF(jniEnv,text); + + if (jniMethodId == 0) { +- return; ++ return 0; + } + + completion = (*jniEnv)->CallObjectMethod(jniEnv, jniObject, @@ -560,6 +560,21 @@ #endif Copied: branches/2014Q1/devel/libreadline-java/files/pkg-message.in (from r336652, head/devel/libreadline-java/files/pkg-message.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/libreadline-java/files/pkg-message.in Mon Dec 16 19:13:27 2013 (r336659, copy of r336652, head/devel/libreadline-java/files/pkg-message.in) @@ -0,0 +1,5 @@ +-------------------------------------------------- +To use readline-java add the file +%%JAVAJARDIR%%/libreadline-java.jar +to your classpath! +-------------------------------------------------- From owner-svn-ports-branches@FreeBSD.ORG Mon Dec 16 22:13:37 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 013EEAC8; Mon, 16 Dec 2013 22:13:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E0B7012E0; Mon, 16 Dec 2013 22:13:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGMDaR4044434; Mon, 16 Dec 2013 22:13:36 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGMDaSS044433; Mon, 16 Dec 2013 22:13:36 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312162213.rBGMDaSS044433@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 16 Dec 2013 22:13:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336674 - branches/2014Q1/security/tripwire X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 22:13:37 -0000 Author: bapt Date: Mon Dec 16 22:13:36 2013 New Revision: 336674 URL: http://svnweb.freebsd.org/changeset/ports/336674 Log: MFH: r336672 Fix another useless and redundant test that is now broken Reported by: Peter Looyenga , jhellenthal@dataix.net Modified: branches/2014Q1/security/tripwire/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/tripwire/Makefile ============================================================================== --- branches/2014Q1/security/tripwire/Makefile Mon Dec 16 22:07:24 2013 (r336673) +++ branches/2014Q1/security/tripwire/Makefile Mon Dec 16 22:13:36 2013 (r336674) @@ -119,7 +119,7 @@ install-config-files: .ifdef PACKAGE_BUILDING @ cd ${WRKSRC} && PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${GMAKE} install-data-hook .else -.if ${PORT_OPTIONS:MSW_ONLY} && ${WITH_SW_ONLY} == "true" +.if ${PORT_OPTIONS:MSW_ONLY} @ cd ${WRKSRC} && PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${GMAKE} install-data-hook .else @ cd ${WRKSRC} && PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} TW_PROMPT=${TW_PROMPT} ${GMAKE} install-data-hook From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 17 08:20:46 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3224D858; Tue, 17 Dec 2013 08:20:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1D14D18DA; Tue, 17 Dec 2013 08:20:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH8KjKC067672; Tue, 17 Dec 2013 08:20:45 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH8KjDk067668; Tue, 17 Dec 2013 08:20:45 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312170820.rBH8KjDk067668@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 17 Dec 2013 08:20:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336698 - in branches/2014Q1: security/vuxml www/phpmyfaq X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 08:20:46 -0000 Author: bapt Date: Tue Dec 17 08:20:44 2013 New Revision: 336698 URL: http://svnweb.freebsd.org/changeset/ports/336698 Log: MFH: r336678 - update to 2.8.4 - add stage support Security: 3b86583a-66a7-11e3-868f-0025905a4771 Modified: branches/2014Q1/security/vuxml/vuln.xml branches/2014Q1/www/phpmyfaq/Makefile branches/2014Q1/www/phpmyfaq/distinfo branches/2014Q1/www/phpmyfaq/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Tue Dec 17 08:08:59 2013 (r336697) +++ branches/2014Q1/security/vuxml/vuln.xml Tue Dec 17 08:20:44 2013 (r336698) @@ -51,6 +51,36 @@ Note: Please add new entries to the beg --> + + phpmyfaq -- arbitrary PHP code execution vulnerability + + + phpmyfaq + 2.8.4 + + + + +

The phpMyFAQ team reports:

+
+

Secunia noticed while analysing the advisory that authenticated + users with "Right to add attachments" are able to exploit an already + publicly known issue in the bundled Ajax File Manager of phpMyFAQ version + 2.8.3, which leads to arbitrary PHP code execution for authenticated + users with the permission "Right to add attachments".

+
+ + + + http://www.phpmyfaq.de/advisory_2013-11-26.php + http://en.securitylab.ru/lab/PT-2013-41 + + + 2013-11-26 + 2013-12-16 + + + zabbix -- shell command injection vulnerability Modified: branches/2014Q1/www/phpmyfaq/Makefile ============================================================================== --- branches/2014Q1/www/phpmyfaq/Makefile Tue Dec 17 08:08:59 2013 (r336697) +++ branches/2014Q1/www/phpmyfaq/Makefile Tue Dec 17 08:20:44 2013 (r336698) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= phpmyfaq -PORTVERSION= 2.8.2 +PORTVERSION= 2.8.4 CATEGORIES= www MASTER_SITES= http://www.phpmyfaq.de/download/ @@ -11,20 +11,20 @@ COMMENT= A multilingual, completely data WRKSRC= ${WRKDIR}/${PORTNAME} +NEED_ROOT= yes + USE_PHP= filter json mysql pcre pdf session xml xmlrpc xmlwriter zlib FAQ_DIR= attachments data images inc pdf xml NO_BUILD= YES WANT_PHP_WEB= YES +NO_ARCH= YES -NO_STAGE= yes do-install: - -${MKDIR} ${WWWDIR} - @cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${WWWDIR} + @${MKDIR} ${STAGEDIR}${WWWDIR} + @cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR} .for i in ${FAQ_DIR} - -@${MKDIR} ${WWWDIR}/${i} - @${CHMOD} 777 ${WWWDIR}/${i} + @${MKDIR} ${STAGEDIR}${WWWDIR}/${i} + @${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}/${i} ${STAGEDIR}${WWWDIR}/config .endfor - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} - @${CAT} ${PKGMESSAGE} .include Modified: branches/2014Q1/www/phpmyfaq/distinfo ============================================================================== --- branches/2014Q1/www/phpmyfaq/distinfo Tue Dec 17 08:08:59 2013 (r336697) +++ branches/2014Q1/www/phpmyfaq/distinfo Tue Dec 17 08:20:44 2013 (r336698) @@ -1,2 +1,2 @@ -SHA256 (phpmyfaq-2.8.2.tar.gz) = 2ab6452da45dacd3bd771597671371881a4c9d13352b4c70d608b686779c3db6 -SIZE (phpmyfaq-2.8.2.tar.gz) = 3896352 +SHA256 (phpmyfaq-2.8.4.tar.gz) = da4762ce824a973f0303762e9028ea9c7e1b1b0bc0f7721388046bd1c35b0164 +SIZE (phpmyfaq-2.8.4.tar.gz) = 3903889 Modified: branches/2014Q1/www/phpmyfaq/pkg-plist ============================================================================== --- branches/2014Q1/www/phpmyfaq/pkg-plist Tue Dec 17 08:08:59 2013 (r336697) +++ branches/2014Q1/www/phpmyfaq/pkg-plist Tue Dec 17 08:20:44 2013 (r336698) @@ -1,3 +1,16 @@ +@exec mkdir -p %D/www/phpmyfaq/attachments +@exec mkdir -p %D/www/phpmyfaq/data +@exec mkdir -p %D/www/phpmyfaq/images +@exec mkdir -p %D/www/phpmyfaq/inc +@exec mkdir -p %D/www/phpmyfaq/pdf +@exec mkdir -p %D/www/phpmyfaq/xml +@exec chown %%WWWOWN%%:%%WWWGRP%% %D/www/phpmyfaq/attachments +@exec chown %%WWWOWN%%:%%WWWGRP%% %D/www/phpmyfaq/config +@exec chown %%WWWOWN%%:%%WWWGRP%% %D/www/phpmyfaq/data +@exec chown %%WWWOWN%%:%%WWWGRP%% %D/www/phpmyfaq/images +@exec chown %%WWWOWN%%:%%WWWGRP%% %D/www/phpmyfaq/inc +@exec chown %%WWWOWN%%:%%WWWGRP%% %D/www/phpmyfaq/pdf +@exec chown %%WWWOWN%%:%%WWWGRP%% %D/www/phpmyfaq/xml %%WWWDIR%%/_.htaccess %%WWWDIR%%/_httpd.ini %%WWWDIR%%/_lighttpd.conf @@ -24,6 +37,7 @@ %%WWWDIR%%/admin/assets/font/fontawesome-webfont.svg %%WWWDIR%%/admin/assets/font/fontawesome-webfont.ttf %%WWWDIR%%/admin/assets/font/fontawesome-webfont.woff +%%WWWDIR%%/admin/assets/js/record.js %%WWWDIR%%/admin/assets/js/uploadcheck.js %%WWWDIR%%/admin/assets/js/user.js %%WWWDIR%%/admin/assets/less/style.less @@ -876,6 +890,7 @@ %%WWWDIR%%/assets/template/default/favicon.ico %%WWWDIR%%/assets/template/default/glossary.tpl %%WWWDIR%%/assets/template/default/images/arrow.gif +%%WWWDIR%%/assets/template/default/indexPassword.tpl %%WWWDIR%%/assets/template/default/index.tpl %%WWWDIR%%/assets/template/default/indexLogin.tpl %%WWWDIR%%/assets/template/default/indexMaintenance.tpl @@ -1264,7 +1279,7 @@ @dirrm %%WWWDIR%%/xml @dirrm %%WWWDIR%%/services/twitter @dirrm %%WWWDIR%%/services -@dirrmtry %%WWWDIR%%/pdf +@dirrm %%WWWDIR%%/pdf @dirrm %%WWWDIR%%/multisite @dirrm %%WWWDIR%%/lang @dirrm %%WWWDIR%%/install @@ -1357,16 +1372,16 @@ @dirrm %%WWWDIR%%/inc/PMF/Attachment @dirrm %%WWWDIR%%/inc/PMF @dirrm %%WWWDIR%%/inc -@dirrmtry %%WWWDIR%%/images +@dirrm %%WWWDIR%%/images @dirrm %%WWWDIR%%/feed/topten @dirrm %%WWWDIR%%/feed/openquestions @dirrm %%WWWDIR%%/feed/news @dirrm %%WWWDIR%%/feed/latest @dirrm %%WWWDIR%%/feed/category @dirrm %%WWWDIR%%/feed -@dirrmtry %%WWWDIR%%/data -@dirrmtry %%WWWDIR%%/config -@dirrmtry %%WWWDIR%%/attachments +@dirrm %%WWWDIR%%/data +@dirrm %%WWWDIR%%/config +@dirrm %%WWWDIR%%/attachments @dirrm %%WWWDIR%%/assets/template/default/less @dirrm %%WWWDIR%%/assets/template/default/images @dirrm %%WWWDIR%%/assets/template/default/css From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 17 08:43:07 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C19BEC27; Tue, 17 Dec 2013 08:43:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9348D1A51; Tue, 17 Dec 2013 08:43:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH8h726074965; Tue, 17 Dec 2013 08:43:07 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH8h7En074963; Tue, 17 Dec 2013 08:43:07 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312170843.rBH8h7En074963@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 17 Dec 2013 08:43:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336699 - branches/2014Q1/games/netradiant X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 08:43:07 -0000 Author: bapt Date: Tue Dec 17 08:43:06 2013 New Revision: 336699 URL: http://svnweb.freebsd.org/changeset/ports/336699 Log: MFH: r336695 Fix packaging on !i386. Modified: branches/2014Q1/games/netradiant/Makefile branches/2014Q1/games/netradiant/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/netradiant/Makefile ============================================================================== --- branches/2014Q1/games/netradiant/Makefile Tue Dec 17 08:20:44 2013 (r336698) +++ branches/2014Q1/games/netradiant/Makefile Tue Dec 17 08:43:06 2013 (r336699) @@ -32,6 +32,7 @@ LDFLAGS+= -L${LOCALBASE}/lib SUB_FILES= ${PORTNAME} SUB_LIST= ARCH=${ARCH} +PLIST_SUB:= ${SUB_LIST} post-patch: # Add missing checks for __FreeBSD__ Modified: branches/2014Q1/games/netradiant/pkg-plist ============================================================================== --- branches/2014Q1/games/netradiant/pkg-plist Tue Dec 17 08:20:44 2013 (r336698) +++ branches/2014Q1/games/netradiant/pkg-plist Tue Dec 17 08:43:06 2013 (r336699) @@ -97,7 +97,7 @@ man/man6/q3map2.6.gz %%DATADIR%%/gl/zfill_vp.glp %%DATADIR%%/gl/zfill_vp.glsl %%DATADIR%%/global.xlink -%%DATADIR%%/heretic2/h2data.i386 +%%DATADIR%%/heretic2/h2data.%%ARCH%% %%DATADIR%%/modules/archivepak.so %%DATADIR%%/modules/archivewad.so %%DATADIR%%/modules/archivezip.so @@ -157,12 +157,12 @@ man/man6/q3map2.6.gz %%DATADIR%%/plugins/ufoaiplug.so %%DATADIR%%/q1.game/default_build_menu.xml %%DATADIR%%/q1.game/id1/entities.ent -%%DATADIR%%/q2map.i386 -%%DATADIR%%/q3data.i386 +%%DATADIR%%/q2map.%%ARCH%% +%%DATADIR%%/q3data.%%ARCH%% %%DATADIR%%/q3data.qdt -%%DATADIR%%/q3map2.i386 -%%DATADIR%%/qdata3.i386 -%%DATADIR%%/radiant.i386 +%%DATADIR%%/q3map2.%%ARCH%% +%%DATADIR%%/qdata3.%%ARCH%% +%%DATADIR%%/radiant.%%ARCH%% %%DATADIR%%/warsow.game/basewsw/default_shaderlist.txt %%DATADIR%%/warsow.game/basewsw/entities.def %%DATADIR%%/warsow.game/default_build_menu.xml From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 17 10:06:10 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F04D3774; Tue, 17 Dec 2013 10:06:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DC49B1139; Tue, 17 Dec 2013 10:06:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHA6Aqk004595; Tue, 17 Dec 2013 10:06:10 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHA6At6004593; Tue, 17 Dec 2013 10:06:10 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201312171006.rBHA6At6004593@svn.freebsd.org> From: Guido Falsi Date: Tue, 17 Dec 2013 10:06:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336706 - branches/2014Q1/audio/gxmms2/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 10:06:11 -0000 Author: madpilot Date: Tue Dec 17 10:06:10 2013 New Revision: 336706 URL: http://svnweb.freebsd.org/changeset/ports/336706 Log: MFH: r336702 Fix build on 10 and head due to new ld behavior. Approved by: portmgr-lurkers (mat) Modified: branches/2014Q1/audio/gxmms2/files/patch-Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/gxmms2/files/patch-Makefile ============================================================================== --- branches/2014Q1/audio/gxmms2/files/patch-Makefile Tue Dec 17 09:41:43 2013 (r336705) +++ branches/2014Q1/audio/gxmms2/files/patch-Makefile Tue Dec 17 10:06:10 2013 (r336706) @@ -1,5 +1,5 @@ ---- Makefile.orig Sun Mar 4 14:28:26 2007 -+++ Makefile Sun Mar 4 14:30:42 2007 +--- Makefile.orig 2009-01-04 19:30:38.000000000 +0100 ++++ Makefile 2013-12-15 22:56:10.004889065 +0100 @@ -1,8 +1,6 @@ # Makefile for gxmms2 and gkrellxmms2 @@ -9,3 +9,12 @@ ALLFILES=gkrellxmms2/*.c gkrellxmms2/*.h gkrellxmms2/*.xpm gmedialib/*.c gmedialib/*.h gmedialib/*.xpm gtrackinfo/*.c gtrackinfo/*.h gxmms2src/*.c gxmms2src/*.h gxmms2src/*.xpm sdecode/*.c sdecode/*.h xmms2ctrl/*.c xmms2ctrl/*.h Makefile README COPYING CHANGELOG +@@ -13,7 +11,7 @@ + + CFLAGS ?= -O2 + CFLAGS := -Wall -fPIC $(GTK_CFLAGS) $(XMMS2_CFLAGS) -I. $(CFLAGS) +-LIBS = $(GTK_LIB) $(XMMS2_LIB) ++LIBS = $(GTK_LIB) $(XMMS2_LIB) -lX11 + + KRELLLFLAGS=-shared + From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 17 16:44:03 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 18B8BBBC; Tue, 17 Dec 2013 16:44:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 042FC15D6; Tue, 17 Dec 2013 16:44:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHGi2mr051242; Tue, 17 Dec 2013 16:44:02 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHGi2GD051241; Tue, 17 Dec 2013 16:44:02 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201312171644.rBHGi2GD051241@svn.freebsd.org> From: Guido Falsi Date: Tue, 17 Dec 2013 16:44:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336742 - branches/2014Q1/security/ssh_askpass_gtk2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 16:44:03 -0000 Author: madpilot Date: Tue Dec 17 16:44:02 2013 New Revision: 336742 URL: http://svnweb.freebsd.org/changeset/ports/336742 Log: MFH: r336735 - Fix build on 10 and head due to new ld behavior - Stagify PR: ports/184926 Submitted by: me Approved by: arved (maintainer, via email) Approved by: portmgr (bapt) Modified: branches/2014Q1/security/ssh_askpass_gtk2/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/ssh_askpass_gtk2/Makefile ============================================================================== --- branches/2014Q1/security/ssh_askpass_gtk2/Makefile Tue Dec 17 16:28:50 2013 (r336741) +++ branches/2014Q1/security/ssh_askpass_gtk2/Makefile Tue Dec 17 16:44:02 2013 (r336742) @@ -19,12 +19,12 @@ USES= pkgconfig PLIST_FILES= bin/ssh-askpass-fullscreen -NO_STAGE= yes post-patch: - ${REINPLACE_CMD} -e "s,gcc,${CC}," ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e "s,gcc,${CC}," \ + -e "/${CC}/s,$$, -lX11," ${WRKSRC}/Makefile do-install: cd ${WRKSRC};\ - ${INSTALL_PROGRAM} ssh-askpass-fullscreen ${PREFIX}/bin/ssh-askpass-fullscreen;\ + ${INSTALL_PROGRAM} ssh-askpass-fullscreen ${STAGEDIR}${PREFIX}/bin/ssh-askpass-fullscreen .include From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 17 17:42:53 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6DEDC2D5; Tue, 17 Dec 2013 17:42:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3F8B81A86; Tue, 17 Dec 2013 17:42:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHHgrjh072890; Tue, 17 Dec 2013 17:42:53 GMT (envelope-from avilla@svn.freebsd.org) Received: (from avilla@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHHgqVP072888; Tue, 17 Dec 2013 17:42:52 GMT (envelope-from avilla@svn.freebsd.org) Message-Id: <201312171742.rBHHgqVP072888@svn.freebsd.org> From: Alberto Villa Date: Tue, 17 Dec 2013 17:42:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336744 - branches/2014Q1/devel/edb/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 17:42:53 -0000 Author: avilla Date: Tue Dec 17 17:42:52 2013 New Revision: 336744 URL: http://svnweb.freebsd.org/changeset/ports/336744 Log: MFH: r336673 - Fix build with Clang. PR: 184298 Submitted by: avilla (myself) Approved by: itechbear@gmail.com (maintainer timeout) Approved by: portmgr (bapt) Added: branches/2014Q1/devel/edb/files/patch-src__edisassm__Instruction32.h - copied unchanged from r336673, head/devel/edb/files/patch-src__edisassm__Instruction32.h Modified: branches/2014Q1/devel/edb/files/patch-src__src.pro Directory Properties: branches/2014Q1/ (props changed) Copied: branches/2014Q1/devel/edb/files/patch-src__edisassm__Instruction32.h (from r336673, head/devel/edb/files/patch-src__edisassm__Instruction32.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/edb/files/patch-src__edisassm__Instruction32.h Tue Dec 17 17:42:52 2013 (r336744, copy of r336673, head/devel/edb/files/patch-src__edisassm__Instruction32.h) @@ -0,0 +1,10 @@ +--- ./src/edisassm/Instruction32.h.orig 2011-12-20 22:04:57.000000000 +0100 ++++ ./src/edisassm/Instruction32.h 2013-11-20 18:01:17.389439581 +0100 +@@ -290,7 +290,6 @@ + template + void Instruction::decode_const_Iw(const uint8_t *buf) { + UNUSED(buf); +- UNUSED(size); + + operand_t &operand = next_operand(); + Modified: branches/2014Q1/devel/edb/files/patch-src__src.pro ============================================================================== --- branches/2014Q1/devel/edb/files/patch-src__src.pro Tue Dec 17 16:50:18 2013 (r336743) +++ branches/2014Q1/devel/edb/files/patch-src__src.pro Tue Dec 17 17:42:52 2013 (r336744) @@ -1,5 +1,5 @@ ---- ./src/src.pro.orig 2011-12-12 21:27:25.000000000 +0000 -+++ ./src/src.pro 2012-09-13 21:26:00.215566381 +0000 +--- ./src/src.pro.orig 2011-12-12 22:27:25.000000000 +0100 ++++ ./src/src.pro 2013-11-20 18:01:37.379434373 +0100 @@ -5,7 +5,7 @@ INCLUDEPATH += ./widgets ../include RESOURCES = debugger.qrc @@ -9,3 +9,12 @@ INSTALLS += target QT += xml +@@ -241,7 +241,7 @@ + + linux-g++*: QMAKE_LFLAGS += -rdynamic + openbsd-g++*: QMAKE_LFLAGS += -lkvm -Wl,--export-dynamic +- freebsd-g++*: QMAKE_LFLAGS += -lkvm -Wl,--export-dynamic ++ freebsd-*: QMAKE_LFLAGS += -lkvm -Wl,--export-dynamic + macx-g++*: QMAKE_LFLAGS += -rdynamic + + From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 17 18:52:20 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3F18E48A; Tue, 17 Dec 2013 18:52:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 10C6F112A; Tue, 17 Dec 2013 18:52:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHIqJXk098592; Tue, 17 Dec 2013 18:52:19 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHIqJ0G098589; Tue, 17 Dec 2013 18:52:19 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312171852.rBHIqJ0G098589@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 17 Dec 2013 18:52:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336754 - in branches/2014Q1: devel/generate editors/vim X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 18:52:20 -0000 Author: bapt Date: Tue Dec 17 18:52:19 2013 New Revision: 336754 URL: http://svnweb.freebsd.org/changeset/ports/336754 Log: MFH: r336753 Fix build after gtk update Modified: branches/2014Q1/devel/generate/Makefile branches/2014Q1/editors/vim/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/generate/Makefile ============================================================================== --- branches/2014Q1/devel/generate/Makefile Tue Dec 17 18:37:45 2013 (r336753) +++ branches/2014Q1/devel/generate/Makefile Tue Dec 17 18:52:19 2013 (r336754) @@ -10,12 +10,14 @@ EXTRACT_SUFX= .tgz MAINTAINER= darcy@druid.net COMMENT= Simple text pre-processor -USE_GMAKE= yes -MAN1= generate.1 +USES= gmake -PLIST_FILES= bin/generate bin/rgenerate +PLIST_FILES= bin/generate bin/rgenerate \ + man/man1/generate.1.gz + +MAKE_ARGS+= MANDIR=${STAGEDIR}${MAN1PREFIX}/man \ + BINDIR=${STAGEDIR}${PREFIX}/bin -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's,^CFLAGS *=,CFLAGS +=,' \ ${WRKSRC}/Makefile Modified: branches/2014Q1/editors/vim/Makefile ============================================================================== --- branches/2014Q1/editors/vim/Makefile Tue Dec 17 18:37:45 2013 (r336753) +++ branches/2014Q1/editors/vim/Makefile Tue Dec 17 18:52:19 2013 (r336754) @@ -12,7 +12,7 @@ PORTNAME= vim # ! PATCHLEVEL to that level. PATCHLEVEL= 110 PORTVERSION= 7.4.${PATCHLEVEL} -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= editors MASTER_SITES= VIM DISTNAME= ${PORTNAME}-${PORTVERSION:R} @@ -141,7 +141,7 @@ USE_XORG+= xaw . if ${PORT_OPTIONS:MGTK2} USE_GNOME= gtk20 CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${LOCALBASE}" -MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" +MAKE_ARGS+= X_LIBS="$(X_LIBS) -lX11 -lXt" USE_XORG+= xt . endif @@ -149,7 +149,7 @@ USE_XORG+= xt USE_GNOME= libgnomeui PKGNAMESUFFIX= -gnome2 CONF_OPT_GUI= "--enable-gui=gnome2" -MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" +MAKE_ARGS+= X_LIBS="$(X_LIBS) -lX11 -lXt" USE_XORG+= xt glproto . endif From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 17 20:40:25 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9A8F4A4D; Tue, 17 Dec 2013 20:40:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6D20B1929; Tue, 17 Dec 2013 20:40:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHKePYA035342; Tue, 17 Dec 2013 20:40:25 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHKeP1D035340; Tue, 17 Dec 2013 20:40:25 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201312172040.rBHKeP1D035340@svn.freebsd.org> From: Bryan Drewery Date: Tue, 17 Dec 2013 20:40:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336763 - in branches/2014Q1: devel/generate editors/vim X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 20:40:25 -0000 Author: bdrewery Date: Tue Dec 17 20:40:24 2013 New Revision: 336763 URL: http://svnweb.freebsd.org/changeset/ports/336763 Log: Revert r336754 Requested by: bapt Modified: branches/2014Q1/devel/generate/Makefile branches/2014Q1/editors/vim/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/generate/Makefile ============================================================================== --- branches/2014Q1/devel/generate/Makefile Tue Dec 17 20:36:38 2013 (r336762) +++ branches/2014Q1/devel/generate/Makefile Tue Dec 17 20:40:24 2013 (r336763) @@ -10,14 +10,12 @@ EXTRACT_SUFX= .tgz MAINTAINER= darcy@druid.net COMMENT= Simple text pre-processor -USES= gmake +USE_GMAKE= yes +MAN1= generate.1 -PLIST_FILES= bin/generate bin/rgenerate \ - man/man1/generate.1.gz - -MAKE_ARGS+= MANDIR=${STAGEDIR}${MAN1PREFIX}/man \ - BINDIR=${STAGEDIR}${PREFIX}/bin +PLIST_FILES= bin/generate bin/rgenerate +NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's,^CFLAGS *=,CFLAGS +=,' \ ${WRKSRC}/Makefile Modified: branches/2014Q1/editors/vim/Makefile ============================================================================== --- branches/2014Q1/editors/vim/Makefile Tue Dec 17 20:36:38 2013 (r336762) +++ branches/2014Q1/editors/vim/Makefile Tue Dec 17 20:40:24 2013 (r336763) @@ -12,7 +12,7 @@ PORTNAME= vim # ! PATCHLEVEL to that level. PATCHLEVEL= 110 PORTVERSION= 7.4.${PATCHLEVEL} -PORTREVISION?= 2 +PORTREVISION?= 1 CATEGORIES?= editors MASTER_SITES= VIM DISTNAME= ${PORTNAME}-${PORTVERSION:R} @@ -141,7 +141,7 @@ USE_XORG+= xaw . if ${PORT_OPTIONS:MGTK2} USE_GNOME= gtk20 CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${LOCALBASE}" -MAKE_ARGS+= X_LIBS="$(X_LIBS) -lX11 -lXt" +MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" USE_XORG+= xt . endif @@ -149,7 +149,7 @@ USE_XORG+= xt USE_GNOME= libgnomeui PKGNAMESUFFIX= -gnome2 CONF_OPT_GUI= "--enable-gui=gnome2" -MAKE_ARGS+= X_LIBS="$(X_LIBS) -lX11 -lXt" +MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" USE_XORG+= xt glproto . endif From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 17 21:35:38 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4AEBF7BE; Tue, 17 Dec 2013 21:35:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 364B11F53; Tue, 17 Dec 2013 21:35:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHLZcQR056795; Tue, 17 Dec 2013 21:35:38 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHLZckR056794; Tue, 17 Dec 2013 21:35:38 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312172135.rBHLZckR056794@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 17 Dec 2013 21:35:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336772 - branches/2014Q1/editors/vim X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 21:35:38 -0000 Author: bapt Date: Tue Dec 17 21:35:37 2013 New Revision: 336772 URL: http://svnweb.freebsd.org/changeset/ports/336772 Log: MFH: r336753 Fix build after gtk update Modified: branches/2014Q1/editors/vim/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/editors/vim/Makefile ============================================================================== --- branches/2014Q1/editors/vim/Makefile Tue Dec 17 21:30:56 2013 (r336771) +++ branches/2014Q1/editors/vim/Makefile Tue Dec 17 21:35:37 2013 (r336772) @@ -12,7 +12,7 @@ PORTNAME= vim # ! PATCHLEVEL to that level. PATCHLEVEL= 110 PORTVERSION= 7.4.${PATCHLEVEL} -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= editors MASTER_SITES= VIM DISTNAME= ${PORTNAME}-${PORTVERSION:R} @@ -141,7 +141,7 @@ USE_XORG+= xaw . if ${PORT_OPTIONS:MGTK2} USE_GNOME= gtk20 CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${LOCALBASE}" -MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" +MAKE_ARGS+= X_LIBS="$(X_LIBS) -lX11 -lXt" USE_XORG+= xt . endif @@ -149,7 +149,7 @@ USE_XORG+= xt USE_GNOME= libgnomeui PKGNAMESUFFIX= -gnome2 CONF_OPT_GUI= "--enable-gui=gnome2" -MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" +MAKE_ARGS+= X_LIBS="$(X_LIBS) -lX11 -lXt" USE_XORG+= xt glproto . endif From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 17 21:55:22 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 52E61FF6; Tue, 17 Dec 2013 21:55:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3E96610C3; Tue, 17 Dec 2013 21:55:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHLtMcY063961; Tue, 17 Dec 2013 21:55:22 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHLtMOa063960; Tue, 17 Dec 2013 21:55:22 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312172155.rBHLtMOa063960@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 17 Dec 2013 21:55:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336775 - branches/2014Q1/databases/evolution-data-server X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 21:55:22 -0000 Author: bapt Date: Tue Dec 17 21:55:21 2013 New Revision: 336775 URL: http://svnweb.freebsd.org/changeset/ports/336775 Log: MFH: r336771 Fix LIB_DEPENDS conversion Reported by: truckman Modified: branches/2014Q1/databases/evolution-data-server/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/databases/evolution-data-server/Makefile ============================================================================== --- branches/2014Q1/databases/evolution-data-server/Makefile Tue Dec 17 21:49:44 2013 (r336774) +++ branches/2014Q1/databases/evolution-data-server/Makefile Tue Dec 17 21:55:21 2013 (r336775) @@ -12,7 +12,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= The data backends for the Evolution integrated mail/PIM suite -LIB_DEPENDS= libsoup-2.so:${PORTSDIR}/devel/libsoup \ +LIB_DEPENDS= libsoup-2.4.so:${PORTSDIR}/devel/libsoup \ libgdata.so:${PORTSDIR}/devel/libgdata \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libical.so:${PORTSDIR}/devel/libical \ From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 17 22:02:10 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D8EAF7EA; Tue, 17 Dec 2013 22:02:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C44F61173; Tue, 17 Dec 2013 22:02:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHM2AH1067716; Tue, 17 Dec 2013 22:02:10 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHM2A9d067715; Tue, 17 Dec 2013 22:02:10 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201312172202.rBHM2A9d067715@svn.freebsd.org> From: Bryan Drewery Date: Tue, 17 Dec 2013 22:02:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336781 - branches/2014Q1/devel/coccinelle X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 22:02:10 -0000 Author: bdrewery Date: Tue Dec 17 22:02:10 2013 New Revision: 336781 URL: http://svnweb.freebsd.org/changeset/ports/336781 Log: MFH r336748: - Fix the usage of 'python' to get rid of the implicit lang/python dependency - Fix the PCRE detection, while here Modified: branches/2014Q1/devel/coccinelle/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/coccinelle/Makefile ============================================================================== --- branches/2014Q1/devel/coccinelle/Makefile Tue Dec 17 22:01:03 2013 (r336780) +++ branches/2014Q1/devel/coccinelle/Makefile Tue Dec 17 22:02:10 2013 (r336781) @@ -12,7 +12,7 @@ COMMENT= Coccinelle is a program matchin LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre -USES= shebangfix gmake perl5 +USES= shebangfix gmake perl5 pkgconfig:build GNU_CONFIGURE= yes USE_PERL5= build USE_PYTHON= 2.6+ @@ -20,6 +20,7 @@ USE_OCAML= 3.0+ bash_CMD= ${SH} SHEBANG_FILES= setup/echo.sh MAKE_ARGS+= PYTHON_VERSION=${PYTHON_VER} +CONFIGURE_ENV+= PYVER=${PYTHON_VER} PYTHON=${PYTHON_CMD} post-install: ${STRIP_CMD} ${STAGEDIR}${DATADIR}/dllpcre_stubs.so \ From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 17 22:04:21 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 498749F5; Tue, 17 Dec 2013 22:04:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 34CF21192; Tue, 17 Dec 2013 22:04:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHM4L1x068089; Tue, 17 Dec 2013 22:04:21 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHM4LIt068088; Tue, 17 Dec 2013 22:04:21 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201312172204.rBHM4LIt068088@svn.freebsd.org> From: Bryan Drewery Date: Tue, 17 Dec 2013 22:04:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336782 - branches/2014Q1/databases/py-pylibmc X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 22:04:21 -0000 Author: bdrewery Date: Tue Dec 17 22:04:20 2013 New Revision: 336782 URL: http://svnweb.freebsd.org/changeset/ports/336782 Log: MFH r336749: - Fix a typo in LIB_DEPENDS (s/libmemcached.do/libmemcached.so) [1] - Add stage support Modified: branches/2014Q1/databases/py-pylibmc/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/databases/py-pylibmc/Makefile ============================================================================== --- branches/2014Q1/databases/py-pylibmc/Makefile Tue Dec 17 22:02:10 2013 (r336781) +++ branches/2014Q1/databases/py-pylibmc/Makefile Tue Dec 17 22:04:20 2013 (r336782) @@ -12,11 +12,10 @@ COMMENT= Python libmemcached wrapper LICENSE= BSD -LIB_DEPENDS= libmemcached.do:${PORTSDIR}/databases/libmemcached +LIB_DEPENDS= libmemcached.so:${PORTSDIR}/databases/libmemcached MAKE_ENV+= LIBMEMCACHED="${LOCALBASE}" USE_PYTHON= 2.5+ USE_PYDISTUTILS= yes -NO_STAGE= yes .include From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 17 22:14:07 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 09774EBB; Tue, 17 Dec 2013 22:14:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E79BD1248; Tue, 17 Dec 2013 22:14:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHME66o072036; Tue, 17 Dec 2013 22:14:06 GMT (envelope-from decke@svn.freebsd.org) Received: (from decke@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHME6KC072031; Tue, 17 Dec 2013 22:14:06 GMT (envelope-from decke@svn.freebsd.org) Message-Id: <201312172214.rBHME6KC072031@svn.freebsd.org> From: Bernhard Froehlich Date: Tue, 17 Dec 2013 22:14:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336783 - in branches/2014Q1/emulators: virtualbox-ose virtualbox-ose-legacy virtualbox-ose-legacy/files virtualbox-ose/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 22:14:07 -0000 Author: decke Date: Tue Dec 17 22:14:05 2013 New Revision: 336783 URL: http://svnweb.freebsd.org/changeset/ports/336783 Log: MFH r336768,336773: - Disable stripping away RPATH on FreeBSD for Hardened-R3 binaries. This fixes the remaining compat9x problems because the virtualbox buildsystem did remove our RPATH on some binaries if hardening is enabled. The hardening is a collection of additional safety checks for all virtualbox suid binaries and is always enabled. Reported by: many FreeBSD 10 users With hat: portmgr Modified: branches/2014Q1/emulators/virtualbox-ose-legacy/Makefile branches/2014Q1/emulators/virtualbox-ose-legacy/files/patch-Config.kmk branches/2014Q1/emulators/virtualbox-ose/Makefile branches/2014Q1/emulators/virtualbox-ose/files/patch-Config.kmk Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/emulators/virtualbox-ose-legacy/Makefile ============================================================================== --- branches/2014Q1/emulators/virtualbox-ose-legacy/Makefile Tue Dec 17 22:04:20 2013 (r336782) +++ branches/2014Q1/emulators/virtualbox-ose-legacy/Makefile Tue Dec 17 22:14:05 2013 (r336783) @@ -3,6 +3,7 @@ PORTNAME= virtualbox-ose DISTVERSION= 4.2.20 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ Modified: branches/2014Q1/emulators/virtualbox-ose-legacy/files/patch-Config.kmk ============================================================================== --- branches/2014Q1/emulators/virtualbox-ose-legacy/files/patch-Config.kmk Tue Dec 17 22:04:20 2013 (r336782) +++ branches/2014Q1/emulators/virtualbox-ose-legacy/files/patch-Config.kmk Tue Dec 17 22:14:05 2013 (r336783) @@ -1,6 +1,6 @@ ---- Config.kmk.orig 2013-10-15 13:01:31.000000000 +0200 -+++ Config.kmk 2013-10-20 14:43:19.015746151 +0200 -@@ -3387,16 +3387,16 @@ +--- Config.kmk.orig 2013-11-28 19:29:52.000000000 +0100 ++++ Config.kmk 2013-12-17 20:15:54.000000000 +0100 +@@ -3260,16 +3260,16 @@ $(VBOX_GCC_WARN) -Wpointer-arith -Winline $(VBOX_GCC_Wno-pointer-sign) $(VBOX_GCC_fdiagnostics-show-option) \ -Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \ -Wimplicit-function-declaration -Werror-implicit-function-declaration \ @@ -20,7 +20,7 @@ $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \ -nostdinc TEMPLATE_VBOXR0DRV_CXXFLAGS.x86 = $(TEMPLATE_VBOXR0DRV_CFLAGS.x86) -@@ -3630,8 +3630,6 @@ +@@ -3486,8 +3486,6 @@ /usr/X11R6/include \ /usr/local/include TEMPLATE_VBOXR3EXE_LIBPATH += \ @@ -29,7 +29,16 @@ /usr/local/lib else ifeq ($(KBUILD_TARGET),solaris) TEMPLATE_VBOXR3EXE_TOOL = GXX3PLAIN -@@ -4206,8 +4204,6 @@ +@@ -3670,7 +3668,7 @@ + # not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp + # TEMPLATE_VBOXR3HARDENEDEXE_LIBS += cap + endif +-ifn1of ($(KBUILD_TARGET), win os2) ++ifn1of ($(KBUILD_TARGET), win os2 freebsd) + TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS)) + TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux)) + endif +@@ -3976,8 +3974,6 @@ /usr/X11R6/include \ /usr/local/include TEMPLATE_VBOXMAINEXE_LIBPATH += \ @@ -38,7 +47,7 @@ /usr/local/lib else ifeq ($(KBUILD_TARGET),solaris) TEMPLATE_VBOXMAINEXE_TOOL = GXX3PLAIN -@@ -4673,8 +4669,6 @@ +@@ -4392,8 +4388,6 @@ /usr/X11R6/include \ /usr/local/include TEMPLATE_VBOXQT4GUIEXE_LIBPATH += \ @@ -47,7 +56,7 @@ /usr/local/lib endif ifeq ($(KBUILD_TARGET),solaris) -@@ -4869,8 +4863,6 @@ +@@ -4576,8 +4570,6 @@ /usr/X11R6/include \ /usr/local/include TEMPLATE_VBOXBLDPROG_LIBPATH += \ Modified: branches/2014Q1/emulators/virtualbox-ose/Makefile ============================================================================== --- branches/2014Q1/emulators/virtualbox-ose/Makefile Tue Dec 17 22:04:20 2013 (r336782) +++ branches/2014Q1/emulators/virtualbox-ose/Makefile Tue Dec 17 22:14:05 2013 (r336783) @@ -3,7 +3,7 @@ PORTNAME= virtualbox-ose DISTVERSION= 4.2.20 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ Modified: branches/2014Q1/emulators/virtualbox-ose/files/patch-Config.kmk ============================================================================== --- branches/2014Q1/emulators/virtualbox-ose/files/patch-Config.kmk Tue Dec 17 22:04:20 2013 (r336782) +++ branches/2014Q1/emulators/virtualbox-ose/files/patch-Config.kmk Tue Dec 17 22:14:05 2013 (r336783) @@ -1,6 +1,6 @@ ---- Config.kmk.orig 2013-10-15 13:01:31.000000000 +0200 -+++ Config.kmk 2013-10-20 14:43:19.015746151 +0200 -@@ -3387,16 +3387,16 @@ +--- Config.kmk.orig 2013-11-28 19:29:52.000000000 +0100 ++++ Config.kmk 2013-12-17 20:15:54.000000000 +0100 +@@ -3260,16 +3260,16 @@ $(VBOX_GCC_WARN) -Wpointer-arith -Winline $(VBOX_GCC_Wno-pointer-sign) $(VBOX_GCC_fdiagnostics-show-option) \ -Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \ -Wimplicit-function-declaration -Werror-implicit-function-declaration \ @@ -20,7 +20,7 @@ $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \ -nostdinc TEMPLATE_VBOXR0DRV_CXXFLAGS.x86 = $(TEMPLATE_VBOXR0DRV_CFLAGS.x86) -@@ -3630,8 +3630,6 @@ +@@ -3486,8 +3486,6 @@ /usr/X11R6/include \ /usr/local/include TEMPLATE_VBOXR3EXE_LIBPATH += \ @@ -29,7 +29,16 @@ /usr/local/lib else ifeq ($(KBUILD_TARGET),solaris) TEMPLATE_VBOXR3EXE_TOOL = GXX3PLAIN -@@ -4206,8 +4204,6 @@ +@@ -3670,7 +3668,7 @@ + # not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp + # TEMPLATE_VBOXR3HARDENEDEXE_LIBS += cap + endif +-ifn1of ($(KBUILD_TARGET), win os2) ++ifn1of ($(KBUILD_TARGET), win os2 freebsd) + TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS)) + TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux)) + endif +@@ -3976,8 +3974,6 @@ /usr/X11R6/include \ /usr/local/include TEMPLATE_VBOXMAINEXE_LIBPATH += \ @@ -38,7 +47,7 @@ /usr/local/lib else ifeq ($(KBUILD_TARGET),solaris) TEMPLATE_VBOXMAINEXE_TOOL = GXX3PLAIN -@@ -4673,8 +4669,6 @@ +@@ -4392,8 +4388,6 @@ /usr/X11R6/include \ /usr/local/include TEMPLATE_VBOXQT4GUIEXE_LIBPATH += \ @@ -47,7 +56,7 @@ /usr/local/lib endif ifeq ($(KBUILD_TARGET),solaris) -@@ -4869,8 +4863,6 @@ +@@ -4576,8 +4570,6 @@ /usr/X11R6/include \ /usr/local/include TEMPLATE_VBOXBLDPROG_LIBPATH += \ From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 17 22:17:15 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0EC9E580; Tue, 17 Dec 2013 22:17:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EDA201290; Tue, 17 Dec 2013 22:17:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHMHE1U072560; Tue, 17 Dec 2013 22:17:14 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHMHEOk072557; Tue, 17 Dec 2013 22:17:14 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201312172217.rBHMHEOk072557@svn.freebsd.org> From: Bryan Drewery Date: Tue, 17 Dec 2013 22:17:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336784 - in branches/2014Q1/devel/glib20: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 22:17:15 -0000 Author: bdrewery Date: Tue Dec 17 22:17:14 2013 New Revision: 336784 URL: http://svnweb.freebsd.org/changeset/ports/336784 Log: MFH r336732: Add "nullfs" to the list of system internal file system types. This prevents gvfs-trashd from latching on to jail mounts and preventing them from being unmounted. Modified: branches/2014Q1/devel/glib20/Makefile branches/2014Q1/devel/glib20/files/patch-gio_gunixmounts.c Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/glib20/Makefile ============================================================================== --- branches/2014Q1/devel/glib20/Makefile Tue Dec 17 22:14:05 2013 (r336783) +++ branches/2014Q1/devel/glib20/Makefile Tue Dec 17 22:17:14 2013 (r336784) @@ -4,7 +4,7 @@ PORTNAME= glib PORTVERSION= 2.36.3 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 Modified: branches/2014Q1/devel/glib20/files/patch-gio_gunixmounts.c ============================================================================== --- branches/2014Q1/devel/glib20/files/patch-gio_gunixmounts.c Tue Dec 17 22:14:05 2013 (r336783) +++ branches/2014Q1/devel/glib20/files/patch-gio_gunixmounts.c Tue Dec 17 22:17:14 2013 (r336784) @@ -1,6 +1,6 @@ ---- gio/gunixmounts.c.orig 2012-05-02 22:02:54.000000000 -0500 -+++ gio/gunixmounts.c 2012-05-02 22:15:35.000000000 -0500 -@@ -155,6 +155,9 @@ +--- gio/gunixmounts.c.orig 2013-06-09 18:03:17.000000000 -0400 ++++ gio/gunixmounts.c 2013-12-14 11:45:36.749181267 -0500 +@@ -155,6 +155,9 @@ struct _GUnixMountMonitor { GFileMonitor *fstab_monitor; GFileMonitor *mtab_monitor; @@ -10,7 +10,7 @@ GSource *proc_mounts_watch_source; }; -@@ -167,6 +170,8 @@ +@@ -167,6 +170,8 @@ static GUnixMountMonitor *the_mount_moni static GList *_g_get_unix_mounts (void); static GList *_g_get_unix_mount_points (void); @@ -19,7 +19,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT); #define MOUNT_POLL_INTERVAL 4000 -@@ -193,6 +198,7 @@ +@@ -193,6 +198,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix #endif #if (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H) @@ -27,7 +27,7 @@ #include #include #include -@@ -243,22 +249,29 @@ +@@ -243,22 +249,29 @@ g_unix_is_mount_path_system_internal (co "/", /* we already have "Filesystem root" in Nautilus */ "/bin", "/boot", @@ -57,15 +57,18 @@ "/var", "/var/crash", "/var/local", -@@ -299,6 +312,7 @@ +@@ -299,8 +312,10 @@ guess_system_internal (const char *mount "devfs", "devpts", "ecryptfs", + "fdescfs", "kernfs", "linprocfs", ++ "nullfs", "proc", -@@ -1122,6 +1136,10 @@ + "procfs", + "ptyfs", +@@ -1126,6 +1141,10 @@ get_mounts_timestamp (void) if (stat (monitor_file, &buf) == 0) return (guint64)buf.st_mtime; } @@ -76,7 +79,7 @@ return 0; } -@@ -1267,6 +1285,13 @@ +@@ -1271,6 +1290,13 @@ g_unix_mount_monitor_finalize (GObject * g_object_unref (monitor->mtab_monitor); } @@ -90,7 +93,7 @@ the_mount_monitor = NULL; G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object); -@@ -1348,6 +1373,52 @@ +@@ -1352,6 +1378,52 @@ mtab_file_changed (GFileMonitor *mo } static gboolean @@ -143,7 +146,7 @@ proc_mounts_changed (GIOChannel *channel, GIOCondition cond, gpointer user_data) -@@ -1412,6 +1483,12 @@ +@@ -1416,6 +1488,12 @@ g_unix_mount_monitor_init (GUnixMountMon g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor); } } From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 17 22:19:37 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1BAE779E; Tue, 17 Dec 2013 22:19:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 072B912B4; Tue, 17 Dec 2013 22:19:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHMJae0072876; Tue, 17 Dec 2013 22:19:36 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHMJamt072874; Tue, 17 Dec 2013 22:19:36 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201312172219.rBHMJamt072874@svn.freebsd.org> From: Bryan Drewery Date: Tue, 17 Dec 2013 22:19:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336785 - branches/2014Q1/devel/generate X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 22:19:37 -0000 Author: bdrewery Date: Tue Dec 17 22:19:36 2013 New Revision: 336785 URL: http://svnweb.freebsd.org/changeset/ports/336785 Log: MFH r336719: devel/generate: update to 2.8 - Update to 2.8 - Allow staging - USES gmake - Drop maintainership Modified: branches/2014Q1/devel/generate/Makefile branches/2014Q1/devel/generate/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/generate/Makefile ============================================================================== --- branches/2014Q1/devel/generate/Makefile Tue Dec 17 22:17:14 2013 (r336784) +++ branches/2014Q1/devel/generate/Makefile Tue Dec 17 22:19:36 2013 (r336785) @@ -2,20 +2,21 @@ # $FreeBSD$ PORTNAME= generate -PORTVERSION= 2.6 +PORTVERSION= 2.8 CATEGORIES= devel -MASTER_SITES= ftp://ftp.druid.net/pub/distrib/ +MASTER_SITES= http://www.druid.net/darcy/ EXTRACT_SUFX= .tgz -MAINTAINER= darcy@druid.net +MAINTAINER= ports@FreeBSD.org COMMENT= Simple text pre-processor -USE_GMAKE= yes -MAN1= generate.1 +USES= gmake -PLIST_FILES= bin/generate bin/rgenerate +MAKE_ARGS= BINDIR=${STAGEDIR}${PREFIX}/bin \ + MANDIR=${STAGEDIR}${PREFIX}/man + +PLIST_FILES= bin/generate bin/rgenerate man/man1/generate.1.gz -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's,^CFLAGS *=,CFLAGS +=,' \ ${WRKSRC}/Makefile Modified: branches/2014Q1/devel/generate/distinfo ============================================================================== --- branches/2014Q1/devel/generate/distinfo Tue Dec 17 22:17:14 2013 (r336784) +++ branches/2014Q1/devel/generate/distinfo Tue Dec 17 22:19:36 2013 (r336785) @@ -1,2 +1,2 @@ -SHA256 (generate-2.6.tgz) = 609e166f66b4bb3028fb9e5486ffddff98fc7bf4f354659516c2b86a800948bd -SIZE (generate-2.6.tgz) = 29045 +SHA256 (generate-2.8.tgz) = 03f5778f7578319ab45b11a59e302e957cb20f993da32b81876fa45148a04633 +SIZE (generate-2.8.tgz) = 31594 From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 17 22:23:16 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8FFDFA0D; Tue, 17 Dec 2013 22:23:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7B15B1320; Tue, 17 Dec 2013 22:23:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHMNG2h075751; Tue, 17 Dec 2013 22:23:16 GMT (envelope-from decke@svn.freebsd.org) Received: (from decke@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHMNG5l075750; Tue, 17 Dec 2013 22:23:16 GMT (envelope-from decke@svn.freebsd.org) Message-Id: <201312172223.rBHMNG5l075750@svn.freebsd.org> From: Bernhard Froehlich Date: Tue, 17 Dec 2013 22:23:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336786 - branches/2014Q1/audio/py-tagpy X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 22:23:16 -0000 Author: decke Date: Tue Dec 17 22:23:15 2013 New Revision: 336786 URL: http://svnweb.freebsd.org/changeset/ports/336786 Log: MFH r336761: - Unbreak build Reported by: exp-run (PR 184591) Modified: branches/2014Q1/audio/py-tagpy/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/py-tagpy/Makefile ============================================================================== --- branches/2014Q1/audio/py-tagpy/Makefile Tue Dec 17 22:19:36 2013 (r336785) +++ branches/2014Q1/audio/py-tagpy/Makefile Tue Dec 17 22:23:15 2013 (r336786) @@ -14,7 +14,7 @@ COMMENT= Python bindings for Scott Wheel LICENSE= MIT LIB_DEPENDS= libboost_python.so:${PORTSDIR}/devel/boost-python-libs \ - libtag;so:${PORTSDIR}/audio/taglib + libtag.so:${PORTSDIR}/audio/taglib USES= shebangfix HAS_CONFIGURE= yes From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 17 22:25:00 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AEB2EB99; Tue, 17 Dec 2013 22:25:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 803591336; Tue, 17 Dec 2013 22:25:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHMP0nq076024; Tue, 17 Dec 2013 22:25:00 GMT (envelope-from decke@svn.freebsd.org) Received: (from decke@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHMP0Nl076018; Tue, 17 Dec 2013 22:25:00 GMT (envelope-from decke@svn.freebsd.org) Message-Id: <201312172225.rBHMP0Nl076018@svn.freebsd.org> From: Bernhard Froehlich Date: Tue, 17 Dec 2013 22:25:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336787 - in branches/2014Q1/multimedia/libav: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 22:25:00 -0000 Author: decke Date: Tue Dec 17 22:24:59 2013 New Revision: 336787 URL: http://svnweb.freebsd.org/changeset/ports/336787 Log: MFH r336760: - Unbreak the build for most environments after graphics/opencv changed its library flags for pkg-config Added: branches/2014Q1/multimedia/libav/files/patch-configure - copied unchanged from r336760, head/multimedia/libav/files/patch-configure Modified: branches/2014Q1/multimedia/libav/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/multimedia/libav/Makefile ============================================================================== --- branches/2014Q1/multimedia/libav/Makefile Tue Dec 17 22:23:15 2013 (r336786) +++ branches/2014Q1/multimedia/libav/Makefile Tue Dec 17 22:24:59 2013 (r336787) @@ -205,7 +205,7 @@ post-patch: @${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \ ${WRKSRC}/configure \ ${WRKSRC}/libavcodec/libgsm.c - ${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${STAGEDIR}${PREFIX}/libdata/pkgconfig|' \ + @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${STAGEDIR}${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/library.mak .include Copied: branches/2014Q1/multimedia/libav/files/patch-configure (from r336760, head/multimedia/libav/files/patch-configure) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/multimedia/libav/files/patch-configure Tue Dec 17 22:24:59 2013 (r336787, copy of r336760, head/multimedia/libav/files/patch-configure) @@ -0,0 +1,13 @@ +--- configure.orig 2013-12-17 19:12:24.000000000 +0100 ++++ configure 2013-12-17 19:12:49.000000000 +0100 +@@ -730,8 +730,8 @@ + + check_ld(){ + log check_ld "$@" +- flags=$(filter_out '-l*' "$@") +- libs=$(filter '-l*' "$@") ++ flags=$(filter_out '-l*|*.so' "$@") ++ libs=$(filter '-l*|*.so' "$@") + check_cc $($cflags_filter $flags) || return + flags=$($ldflags_filter $flags) + libs=$($ldflags_filter $libs) From owner-svn-ports-branches@FreeBSD.ORG Wed Dec 18 00:06:37 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1E840748; Wed, 18 Dec 2013 00:06:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0AEEA1A9A; Wed, 18 Dec 2013 00:06:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBI06aiT014090; Wed, 18 Dec 2013 00:06:36 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBI06ani014089; Wed, 18 Dec 2013 00:06:36 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312180006.rBI06ani014089@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 18 Dec 2013 00:06:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336794 - branches/2014Q1/Mk X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Dec 2013 00:06:37 -0000 Author: bapt Date: Wed Dec 18 00:06:36 2013 New Revision: 336794 URL: http://svnweb.freebsd.org/changeset/ports/336794 Log: MFH: r336793 Fix user belonging to multiple groups when a package is staged Reported by: flo Modified: branches/2014Q1/Mk/bsd.port.mk Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/Mk/bsd.port.mk ============================================================================== --- branches/2014Q1/Mk/bsd.port.mk Wed Dec 18 00:03:53 2013 (r336793) +++ branches/2014Q1/Mk/bsd.port.mk Wed Dec 18 00:06:36 2013 (r336794) @@ -4277,10 +4277,12 @@ create-users-groups: IFS=","; for _login in $$members; do \ for _user in ${USERS}; do \ if [ "x$${_user}" = "x$${_login}" ]; then \ + if [ "${NO_STAGE}" = "yes" ]; then \ if ! ${PW} groupshow ${_group} | ${GREP} -qw $${_login}; then \ ${ECHO_MSG} "Adding user \`$${_login}' to group \`${_group}'."; \ ${PW} groupmod ${_group} -m $${_login}; \ fi; \ + fi; \ if [ -z "${WITH_PKGNG}" ]; then \ ${ECHO_CMD} "@exec if ! ${PW} groupshow ${_group} | ${GREP} -qw $${_login}; then \ echo \"Adding user '$${_login}' to group '${_group}'.\"; \ From owner-svn-ports-branches@FreeBSD.ORG Wed Dec 18 00:08:31 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8190B96D; Wed, 18 Dec 2013 00:08:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6D2471AAA; Wed, 18 Dec 2013 00:08:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBI08Vvx014511; Wed, 18 Dec 2013 00:08:31 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBI08VtF014509; Wed, 18 Dec 2013 00:08:31 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312180008.rBI08VtF014509@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 18 Dec 2013 00:08:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336795 - branches/2014Q1/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Dec 2013 00:08:31 -0000 Author: bapt Date: Wed Dec 18 00:08:30 2013 New Revision: 336795 URL: http://svnweb.freebsd.org/changeset/ports/336795 Log: MFH: r336790 - document asterisk vulnerabilities - correctly order references [1] Reported by: remko [1] Modified: branches/2014Q1/security/vuxml/vuln.xml Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Wed Dec 18 00:06:36 2013 (r336794) +++ branches/2014Q1/security/vuxml/vuln.xml Wed Dec 18 00:08:30 2013 (r336795) @@ -51,6 +51,55 @@ Note: Please add new entries to the beg --> + + asterisk -- multiple vulnerabilities + + + asterisk10 + 10.12.4 + + + asterisk11 + 11.6.1 + + + asterisk18 + 1.8.24.1 + + + + +

The Asterisk project reports:

+
+

A 16 bit SMS message that contains an odd message length value will + cause the message decoding loop to run forever. The message buffer is + not on the stack but will be overflowed resulting in corrupted memory + and an immediate crash.

+

External control protocols, such as the Asterisk Manager Interface, + often have the ability to get and set channel variables; this allows + the execution of dialplan functions. Dialplan functions within + Asterisk are incredibly powerful, which is wonderful for building + applications using Asterisk. But during the read or write execution, + certain diaplan functions do much more. For example, reading the SHELL() + function can execute arbitrary commands on the system Asterisk is + running on. Writing to the FILE() function can change any file that + Asterisk has write access to. When these functions are executed from an + external protocol, that execution could result in a privilege escalation.

+
+ + + + CVE-2013-7100 + http://downloads.asterisk.org/pub/security/AST-2013-006.pdf + http://downloads.asterisk.org/pub/security/AST-2013-007.pdf + https://www.asterisk.org/security + + + 2013-12-16 + 2013-12-17 + + + phpmyfaq -- arbitrary PHP code execution vulnerability @@ -72,12 +121,13 @@ Note: Please add new entries to the beg - http://www.phpmyfaq.de/advisory_2013-11-26.php http://en.securitylab.ru/lab/PT-2013-41 + http://www.phpmyfaq.de/advisory_2013-11-26.php 2013-11-26 2013-12-16 + 2013-12-17 From owner-svn-ports-branches@FreeBSD.ORG Wed Dec 18 00:10:27 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 770BEA58; Wed, 18 Dec 2013 00:10:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 56F031AB9; Wed, 18 Dec 2013 00:10:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBI0AR66015234; Wed, 18 Dec 2013 00:10:27 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBI0APfv015218; Wed, 18 Dec 2013 00:10:25 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312180010.rBI0APfv015218@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 18 Dec 2013 00:10:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336796 - in branches/2014Q1/net: asterisk asterisk/files asterisk10 asterisk11 asterisk11/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Dec 2013 00:10:27 -0000 Author: bapt Date: Wed Dec 18 00:10:25 2013 New Revision: 336796 URL: http://svnweb.freebsd.org/changeset/ports/336796 Log: MFH: r336791 - Update net/aserisk to 1.8.25.0 - Update net/aserisk10 to 10.12.4 - Update net/aserisk11 to 11.7.0 - mark net/aserisk10 DEPRECATED, it has reached its EOL Security: 0c39bafc-6771-11e3-868f-0025905a4771 Added: branches/2014Q1/net/asterisk11/files/patch-main__http.c - copied unchanged from r336791, head/net/asterisk11/files/patch-main__http.c Modified: branches/2014Q1/net/asterisk/Makefile branches/2014Q1/net/asterisk/distinfo branches/2014Q1/net/asterisk/files/patch-main__asterisk.exports.in (contents, props changed) branches/2014Q1/net/asterisk10/Makefile branches/2014Q1/net/asterisk10/distinfo branches/2014Q1/net/asterisk11/Makefile branches/2014Q1/net/asterisk11/distinfo branches/2014Q1/net/asterisk11/files/patch-main__asterisk.exports.in (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net/asterisk/Makefile ============================================================================== --- branches/2014Q1/net/asterisk/Makefile Wed Dec 18 00:08:30 2013 (r336795) +++ branches/2014Q1/net/asterisk/Makefile Wed Dec 18 00:10:25 2013 (r336796) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 1.8.23.1 +PORTVERSION= 1.8.25.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -26,9 +26,8 @@ CONFIGURE_ARGS= --with-gsm=${LOCALBASE} LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 USE_CSTD= gnu89 -USE_GMAKE= yes USE_GNOME= libxml2 -USES= bison +USES= bison gmake USE_RC_SUBR= asterisk MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ Modified: branches/2014Q1/net/asterisk/distinfo ============================================================================== --- branches/2014Q1/net/asterisk/distinfo Wed Dec 18 00:08:30 2013 (r336795) +++ branches/2014Q1/net/asterisk/distinfo Wed Dec 18 00:10:25 2013 (r336796) @@ -1,2 +1,2 @@ -SHA256 (asterisk-1.8.23.1.tar.gz) = 22c7d54be24de0560ecca482674b85dbfac359faa63702084353074f40dc16a7 -SIZE (asterisk-1.8.23.1.tar.gz) = 25270506 +SHA256 (asterisk-1.8.25.0.tar.gz) = b218de8a7db9af370890b12c63863343f5459ae7a4ce23d386ec159c10241670 +SIZE (asterisk-1.8.25.0.tar.gz) = 29473304 Modified: branches/2014Q1/net/asterisk/files/patch-main__asterisk.exports.in ============================================================================== --- branches/2014Q1/net/asterisk/files/patch-main__asterisk.exports.in Wed Dec 18 00:08:30 2013 (r336795) +++ branches/2014Q1/net/asterisk/files/patch-main__asterisk.exports.in Wed Dec 18 00:10:25 2013 (r336796) @@ -1,9 +1,9 @@ ---- main/asterisk.exports.in.orig 2012-04-10 21:41:26.211743996 +0200 -+++ main/asterisk.exports.in 2012-04-10 21:41:49.229621831 +0200 -@@ -44,6 +44,8 @@ - LINKER_SYMBOL_PREFIXres_srtp; - LINKER_SYMBOL_PREFIXres_srtp_policy; - LINKER_SYMBOL_PREFIXsecure_call_info; +--- main/asterisk.exports.in.orig 2013-08-22 10:19:02.000000000 +0200 ++++ main/asterisk.exports.in 2013-10-27 13:37:29.053477896 +0100 +@@ -63,6 +63,8 @@ + + */ + LINKER_SYMBOL_PREFIX_IO_stdin_used; + LINKER_SYMBOL_PREFIX__progname; + LINKER_SYMBOL_PREFIXenviron; local: Modified: branches/2014Q1/net/asterisk10/Makefile ============================================================================== --- branches/2014Q1/net/asterisk10/Makefile Wed Dec 18 00:08:30 2013 (r336795) +++ branches/2014Q1/net/asterisk10/Makefile Wed Dec 18 00:10:25 2013 (r336796) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 10.12.3 +PORTVERSION= 10.12.4 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -19,14 +19,16 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mp ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 +DEPRECATED= asterisk 10 reached EOL on 2013-12-15 +EXPIRATION_DATE=2014-02-28 + GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gsm=${LOCALBASE} LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 USE_CSTD= gnu89 -USE_GMAKE= yes USE_GNOME= libxml2 -USES= bison +USES= bison gmake USE_RC_SUBR= asterisk MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ Modified: branches/2014Q1/net/asterisk10/distinfo ============================================================================== --- branches/2014Q1/net/asterisk10/distinfo Wed Dec 18 00:08:30 2013 (r336795) +++ branches/2014Q1/net/asterisk10/distinfo Wed Dec 18 00:10:25 2013 (r336796) @@ -1,2 +1,2 @@ -SHA256 (asterisk-10.12.3.tar.gz) = f4efd185c5e8d0e6b2e246e4afde8d2420da642e288fbc237bd90b1ab0d24757 -SIZE (asterisk-10.12.3.tar.gz) = 25119235 +SHA256 (asterisk-10.12.4.tar.gz) = d719e09677e2aa7866f506a8b3f83016aa27a3c652b975b7d2beebe5891e2ee9 +SIZE (asterisk-10.12.4.tar.gz) = 25120413 Modified: branches/2014Q1/net/asterisk11/Makefile ============================================================================== --- branches/2014Q1/net/asterisk11/Makefile Wed Dec 18 00:08:30 2013 (r336795) +++ branches/2014Q1/net/asterisk11/Makefile Wed Dec 18 00:10:25 2013 (r336796) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 11.5.1 +PORTVERSION= 11.7.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -25,9 +25,8 @@ LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 CFLAGS+= -I${LOCALBASE}/include USE_CSTD= gnu89 -USE_GMAKE= yes USE_GNOME= libxml2 -USES= bison +USES= bison gmake USE_RC_SUBR= asterisk MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ @@ -38,7 +37,9 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLA NOISY_BUILD=YES \ DOCSDIR=${DOCSDIR} \ ASTCFLAGS="${CFLAGS}" -MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8 +MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8 astdb2bdb.8 \ + astdb2sqlite3.8 + CONFLICTS_BUILD= linuxthreads-* CONFLICTS_INSTALL= asterisk*-1.4* asterisk*-1.6* asterisk*-1.8* Modified: branches/2014Q1/net/asterisk11/distinfo ============================================================================== --- branches/2014Q1/net/asterisk11/distinfo Wed Dec 18 00:08:30 2013 (r336795) +++ branches/2014Q1/net/asterisk11/distinfo Wed Dec 18 00:10:25 2013 (r336796) @@ -1,2 +1,2 @@ -SHA256 (asterisk-11.5.1.tar.gz) = fefa9def9c8f97c89931f12b29b3ac616ae1a8454c01c524678163061dcb42b2 -SIZE (asterisk-11.5.1.tar.gz) = 30580447 +SHA256 (asterisk-11.7.0.tar.gz) = 4fb283b96447f5d871632a14069f35643c8c34d08d6ec5fedf0ae3df30e0c397 +SIZE (asterisk-11.7.0.tar.gz) = 34779538 Modified: branches/2014Q1/net/asterisk11/files/patch-main__asterisk.exports.in ============================================================================== --- branches/2014Q1/net/asterisk11/files/patch-main__asterisk.exports.in Wed Dec 18 00:08:30 2013 (r336795) +++ branches/2014Q1/net/asterisk11/files/patch-main__asterisk.exports.in Wed Dec 18 00:10:25 2013 (r336796) @@ -1,9 +1,9 @@ ---- main/asterisk.exports.in.orig 2012-04-10 21:44:03.532803004 +0200 -+++ main/asterisk.exports.in 2012-04-10 21:44:41.134621539 +0200 -@@ -44,6 +44,8 @@ - LINKER_SYMBOL_PREFIXres_srtp; - LINKER_SYMBOL_PREFIXres_srtp_policy; - LINKER_SYMBOL_PREFIXsecure_call_info; +--- main/asterisk.exports.in.orig 2013-08-22 10:22:39.000000000 +0200 ++++ main/asterisk.exports.in 2013-10-27 13:38:56.825678450 +0100 +@@ -65,6 +65,8 @@ + + */ + LINKER_SYMBOL_PREFIX_IO_stdin_used; + LINKER_SYMBOL_PREFIX__progname; + LINKER_SYMBOL_PREFIXenviron; local: Copied: branches/2014Q1/net/asterisk11/files/patch-main__http.c (from r336791, head/net/asterisk11/files/patch-main__http.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net/asterisk11/files/patch-main__http.c Wed Dec 18 00:10:25 2013 (r336796, copy of r336791, head/net/asterisk11/files/patch-main__http.c) @@ -0,0 +1,11 @@ +--- main/http.c.orig 2013-12-17 23:42:58.982720307 +0100 ++++ main/http.c 2013-12-17 23:43:16.054863909 +0100 +@@ -1024,7 +1024,7 @@ + struct http_uri_redirect *redirect; + struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; + uint32_t bindport = DEFAULT_PORT; +- RAII_VAR(struct ast_sockaddr *, addrs, NULL, ast_free); ++ struct ast_sockaddr *addrs = NULL; + int num_addrs = 0; + int http_tls_was_enabled = 0; + From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 19 12:41:25 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CD8F6619; Thu, 19 Dec 2013 12:41:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B98B71CEC; Thu, 19 Dec 2013 12:41:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJCfP9m016076; Thu, 19 Dec 2013 12:41:25 GMT (envelope-from dbn@svn.freebsd.org) Received: (from dbn@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJCfPow016075; Thu, 19 Dec 2013 12:41:25 GMT (envelope-from dbn@svn.freebsd.org) Message-Id: <201312191241.rBJCfPow016075@svn.freebsd.org> From: David Naylor Date: Thu, 19 Dec 2013 12:41:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336893 - branches/2014Q1/x11-toolkits/py-kivy X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 12:41:25 -0000 Author: dbn Date: Thu Dec 19 12:41:25 2013 New Revision: 336893 URL: http://svnweb.freebsd.org/changeset/ports/336893 Log: MFH r336691: Fix build of x11-toolkits/py-kivy on some systems (pygame.joystick related). On some systems pygame.joystick does not import into python preventing some documentation from being built, thus some missing files on install. For documentation building prevent any attempt to import pygame.joystick as a work-around. Approved by: portmgr-lurkers (mat) Modified: branches/2014Q1/x11-toolkits/py-kivy/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/x11-toolkits/py-kivy/Makefile ============================================================================== --- branches/2014Q1/x11-toolkits/py-kivy/Makefile Thu Dec 19 12:30:43 2013 (r336892) +++ branches/2014Q1/x11-toolkits/py-kivy/Makefile Thu Dec 19 12:41:25 2013 (r336893) @@ -122,6 +122,8 @@ post-build: do-build-docs do-build-docs: ${MKDIR} ${WRKSRC}/doc/build/doctrees ${WRKSRC}/doc/build/html \ ${WRKSRC}/doc/build/latex-a4 ${WRKSRC}/doc/build/latex-letter + ${REINPLACE_CMD} -i '' -e 's/\(import pygame\.joystick\)/#\1/' \ + ${WRKSRC}/kivy/input/providers/androidjoystick.py (cd ${WRKSRC}; \ ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} doc/autobuild.py) (cd ${WRKSRC}; \ @@ -142,6 +144,8 @@ do-build-docs: ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC}/doc/build/latex-letter \ all-pdf > /dev/null .endif + ${REINPLACE_CMD} -i '' -e 's/#\(import pygame\.joystick\)/\1/' \ + ${WRKSRC}/kivy/input/providers/androidjoystick.py post-install: do-install-docs From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 19 13:44:59 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2BB6818A; Thu, 19 Dec 2013 13:44:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 170A111F7; Thu, 19 Dec 2013 13:44:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJDiwHN039462; Thu, 19 Dec 2013 13:44:58 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJDiwuS039460; Thu, 19 Dec 2013 13:44:58 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312191344.rBJDiwuS039460@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 19 Dec 2013 13:44:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336903 - branches/2014Q1/security/gnupg1 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 13:44:59 -0000 Author: bapt Date: Thu Dec 19 13:44:58 2013 New Revision: 336903 URL: http://svnweb.freebsd.org/changeset/ports/336903 Log: MFH: r336839 - Upgrade to 1.4.16 (security fix). References: http://lists.gnupg.org/pipermail/gnupg-announce/2013q4/000337.html Modified: branches/2014Q1/security/gnupg1/Makefile branches/2014Q1/security/gnupg1/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/gnupg1/Makefile ============================================================================== --- branches/2014Q1/security/gnupg1/Makefile Thu Dec 19 13:30:13 2013 (r336902) +++ branches/2014Q1/security/gnupg1/Makefile Thu Dec 19 13:44:58 2013 (r336903) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gnupg -PORTVERSION= 1.4.15 +PORTVERSION= 1.4.16 #PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} Modified: branches/2014Q1/security/gnupg1/distinfo ============================================================================== --- branches/2014Q1/security/gnupg1/distinfo Thu Dec 19 13:30:13 2013 (r336902) +++ branches/2014Q1/security/gnupg1/distinfo Thu Dec 19 13:44:58 2013 (r336903) @@ -1,4 +1,4 @@ -SHA256 (gnupg-1.4.15.tar.bz2) = b6bb40a8f96dc1227b69f8e3b35f0bc4c8276923147f6069cae2f6307c62795d -SIZE (gnupg-1.4.15.tar.bz2) = 3654415 -SHA256 (gnupg-1.4.15.tar.bz2.sig) = fc2caeb473d42659d2099c2738f571d0a8cb72fd28308c6c3f07ccaa76ec5fce -SIZE (gnupg-1.4.15.tar.bz2.sig) = 287 +SHA256 (gnupg-1.4.16.tar.bz2) = 7b3b748e6aaa338092a0b26b1730cd9355765b55e3684f58dd70f9a1b00f4a2f +SIZE (gnupg-1.4.16.tar.bz2) = 3656752 +SHA256 (gnupg-1.4.16.tar.bz2.sig) = dac6f454d6593c955914324c9df04885696ed3e93f62b7f624095533a80b1035 +SIZE (gnupg-1.4.16.tar.bz2.sig) = 287 From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 19 13:45:58 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EC43C2B0; Thu, 19 Dec 2013 13:45:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BDCFE120A; Thu, 19 Dec 2013 13:45:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJDjw23039709; Thu, 19 Dec 2013 13:45:58 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJDjwuJ039708; Thu, 19 Dec 2013 13:45:58 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312191345.rBJDjwuJ039708@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 19 Dec 2013 13:45:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336904 - branches/2014Q1/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 13:45:59 -0000 Author: bapt Date: Thu Dec 19 13:45:58 2013 New Revision: 336904 URL: http://svnweb.freebsd.org/changeset/ports/336904 Log: MFH: r336840 Add about gnupg-1.4.16. Modified: branches/2014Q1/security/vuxml/vuln.xml Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Thu Dec 19 13:44:58 2013 (r336903) +++ branches/2014Q1/security/vuxml/vuln.xml Thu Dec 19 13:45:58 2013 (r336904) @@ -51,6 +51,51 @@ Note: Please add new entries to the beg --> + + gnupg -- RSA Key Extraction via Low-Bandwidth Acoustic Cryptanalysis attack + + + gnupg + 1.4.16 + + + + +

Werner Koch reports:

+
+

CVE-2013-4576 has been assigned to this security bug.

+ +

The paper describes two attacks. The first attack allows +to distinguish keys: An attacker is able to notice which key is +currently used for decryption. This is in general not a problem but +may be used to reveal the information that a message, encrypted to a +commonly not used key, has been received by the targeted machine. We +do not have a software solution to mitigate this attack.

+ +

The second attack is more serious. It is an adaptive +chosen ciphertext attack to reveal the private key. A possible +scenario is that the attacker places a sensor (for example a standard +smartphone) in the vicinity of the targeted machine. That machine is +assumed to do unattended RSA decryption of received mails, for example +by using a mail client which speeds up browsing by opportunistically +decrypting mails expected to be read soon. While listening to the +acoustic emanations of the targeted machine, the smartphone will send +new encrypted messages to that machine and re-construct the private +key bit by bit. A 4096 bit RSA key used on a laptop can be revealed +within an hour.

+
+ + + + CVE-2013-4576 + http://lists.gnupg.org/pipermail/gnupg-announce/2013q4/000337.html + + + 2013-12-18 + 2013-12-18 + + + asterisk -- multiple vulnerabilities From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 19 13:48:56 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E14554C0; Thu, 19 Dec 2013 13:48:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C157E1235; Thu, 19 Dec 2013 13:48:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJDmuZx040155; Thu, 19 Dec 2013 13:48:56 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJDmu8l040152; Thu, 19 Dec 2013 13:48:56 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312191348.rBJDmu8l040152@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 19 Dec 2013 13:48:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336905 - in branches/2014Q1: ftp/curl ftp/curl/files security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 13:48:57 -0000 Author: bapt Date: Thu Dec 19 13:48:55 2013 New Revision: 336905 URL: http://svnweb.freebsd.org/changeset/ports/336905 Log: MFH: r336860 Apply vendor fix for CVE-2013-6422, cURL libcurl cert name check ignore with GnuTLS. Document the vulnerability fix in vuxml while I'm here. Added: branches/2014Q1/ftp/curl/files/patch-CVE-2013-6422 - copied unchanged from r336860, head/ftp/curl/files/patch-CVE-2013-6422 Modified: branches/2014Q1/ftp/curl/Makefile branches/2014Q1/security/vuxml/vuln.xml Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/ftp/curl/Makefile ============================================================================== --- branches/2014Q1/ftp/curl/Makefile Thu Dec 19 13:45:58 2013 (r336904) +++ branches/2014Q1/ftp/curl/Makefile Thu Dec 19 13:48:55 2013 (r336905) @@ -3,7 +3,7 @@ PORTNAME= curl PORTVERSION= 7.33.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ftp www MASTER_SITES= http://curl.haxx.se/download/ \ LOCAL/sunpoet Copied: branches/2014Q1/ftp/curl/files/patch-CVE-2013-6422 (from r336860, head/ftp/curl/files/patch-CVE-2013-6422) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/ftp/curl/files/patch-CVE-2013-6422 Thu Dec 19 13:48:55 2013 (r336905, copy of r336860, head/ftp/curl/files/patch-CVE-2013-6422) @@ -0,0 +1,32 @@ +--- ./lib/gtls.c.orig 2013-10-12 15:05:06.000000000 -0700 ++++ ./lib/gtls.c 2013-12-18 15:00:22.000000000 -0800 +@@ -5,7 +5,7 @@ + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * +- * Copyright (C) 1998 - 2012, Daniel Stenberg, , et al. ++ * Copyright (C) 1998 - 2013, Daniel Stenberg, , et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms +@@ -633,10 +633,8 @@ + else + infof(data, "\t server certificate verification OK\n"); + } +- else { ++ else + infof(data, "\t server certificate verification SKIPPED\n"); +- goto after_server_cert_verification; +- } + + /* initialize an X.509 certificate structure. */ + gnutls_x509_crt_init(&x509_cert); +@@ -766,8 +764,6 @@ + + gnutls_x509_crt_deinit(x509_cert); + +-after_server_cert_verification: +- + /* compression algorithm (if any) */ + ptr = gnutls_compression_get_name(gnutls_compression_get(session)); + /* the *_get_name() says "NULL" if GNUTLS_COMP_NULL is returned */ Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Thu Dec 19 13:45:58 2013 (r336904) +++ branches/2014Q1/security/vuxml/vuln.xml Thu Dec 19 13:48:55 2013 (r336905) @@ -51,6 +51,49 @@ Note: Please add new entries to the beg --> + + cURL library -- cert name check ignore with GnuTLS + + + curl + 7.21.47.33.0_2 + + + + +

cURL project reports:

+
+

libcurl is vulnerable to a case of missing out the checking + of the certificate CN or SAN name field when the digital + signature verification is turned off.

+

libcurl offers two separate and independent options for + verifying a server's TLS certificate. CURLOPT_SSL_VERIFYPEER + and CURLOPT_SSL_VERIFYHOST. The first one tells libcurl to + verify the trust chain using a CA cert bundle, while the + second tells libcurl to make sure that the name fields in + the server certificate meets the criteria. Both options are + enabled by default.

+

This flaw had the effect that when an application disabled + CURLOPT_SSL_VERIFYPEER, libcurl mistakenly also skipped the + CURLOPT_SSL_VERIFYHOST check. Applications can disable + CURLOPT_SSL_VERIFYPEER and still achieve security by doing + the check on its own using other means.

+

The curl command line tool is not affected by this problem + as it either enables both options or disables both at the + same time.

+
+ + + + http://curl.haxx.se/docs/adv_20131217.html + CVE-2013-6422 + + + 2013-12-17 + 2013-12-18 + + + gnupg -- RSA Key Extraction via Low-Bandwidth Acoustic Cryptanalysis attack From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 19 13:51:37 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 78C235D3; Thu, 19 Dec 2013 13:51:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 649421295; Thu, 19 Dec 2013 13:51:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJDpbeK042895; Thu, 19 Dec 2013 13:51:37 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJDpbsN042894; Thu, 19 Dec 2013 13:51:37 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312191351.rBJDpbsN042894@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 19 Dec 2013 13:51:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336906 - branches/2014Q1/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 13:51:37 -0000 Author: bapt Date: Thu Dec 19 13:51:36 2013 New Revision: 336906 URL: http://svnweb.freebsd.org/changeset/ports/336906 Log: MFH: r336878 Cover gnupg1 ports/packages as well. Modified: branches/2014Q1/security/vuxml/vuln.xml Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Thu Dec 19 13:48:55 2013 (r336905) +++ branches/2014Q1/security/vuxml/vuln.xml Thu Dec 19 13:51:36 2013 (r336906) @@ -99,6 +99,7 @@ Note: Please add new entries to the beg gnupg + gnupg1 1.4.16 @@ -136,6 +137,7 @@ within an hour.

2013-12-18 2013-12-18 + 2013-12-18 From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 19 13:53:32 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5B0BB6CA; Thu, 19 Dec 2013 13:53:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4531912A7; Thu, 19 Dec 2013 13:53:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJDrWek043311; Thu, 19 Dec 2013 13:53:32 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJDrVNK043305; Thu, 19 Dec 2013 13:53:31 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312191353.rBJDrVNK043305@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 19 Dec 2013 13:53:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336907 - in branches/2014Q1/science/InsightToolkit: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 13:53:32 -0000 Author: bapt Date: Thu Dec 19 13:53:30 2013 New Revision: 336907 URL: http://svnweb.freebsd.org/changeset/ports/336907 Log: MFH: r336885 - Support staging - Fix build on 10.x Added: branches/2014Q1/science/InsightToolkit/files/patch-Code-Common-itkArray.h - copied unchanged from r336885, head/science/InsightToolkit/files/patch-Code-Common-itkArray.h branches/2014Q1/science/InsightToolkit/files/patch-Code-Common-itkArray2D.h - copied unchanged from r336885, head/science/InsightToolkit/files/patch-Code-Common-itkArray2D.h branches/2014Q1/science/InsightToolkit/files/patch-Code-Common-itkKLMSegmentationBorder.h - copied unchanged from r336885, head/science/InsightToolkit/files/patch-Code-Common-itkKLMSegmentationBorder.h branches/2014Q1/science/InsightToolkit/files/patch-Code-Common-itkParametricPath.txx - copied unchanged from r336885, head/science/InsightToolkit/files/patch-Code-Common-itkParametricPath.txx branches/2014Q1/science/InsightToolkit/files/patch-Utilities-vxl-core-vnl-vnl__matrix__fixed__ref.h - copied unchanged from r336885, head/science/InsightToolkit/files/patch-Utilities-vxl-core-vnl-vnl__matrix__fixed__ref.h Modified: branches/2014Q1/science/InsightToolkit/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/science/InsightToolkit/Makefile ============================================================================== --- branches/2014Q1/science/InsightToolkit/Makefile Thu Dec 19 13:51:36 2013 (r336906) +++ branches/2014Q1/science/InsightToolkit/Makefile Thu Dec 19 13:53:30 2013 (r336907) @@ -10,35 +10,24 @@ MASTER_SITES= SF/itk/itk/2.8 MAINTAINER= amdmi3@FreeBSD.org COMMENT= Insight Toolkit -OPTIONS_DEFINE= EXAMPLES TESTING -EXAMPLES_DESC= Build examples (very time consuming) -TESTING_DESC= Build testing programs (very time consuming) - -USE_LDCONFIG= ${PREFIX}/lib/InsightToolkit NO_PACKAGE= License does not allow redistribution of binaries USES= cmake CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON +USE_LDCONFIG= ${PREFIX}/lib/InsightToolkit SUB_FILES= pkg-message -NO_STAGE= yes -.include +OPTIONS_DEFINE= EXAMPLES TESTING +EXAMPLES_DESC= Build examples (very time consuming) +TESTING_DESC= Build testing programs (very time consuming) -.if ! ${PORT_OPTIONS:MEXAMPLES} -CMAKE_ARGS+= "-DBUILD_EXAMPLES:BOOL=OFF" -.endif - -.if ! ${PORT_OPTIONS:MTESTING} -CMAKE_ARGS+= "-DBUILD_TESTING:BOOL=OFF" -.endif +EXAMPLES_CMAKE_OFF= -DBUILD_EXAMPLES:BOOL=OFF +TESTING_CMAKE_OFF= -DBUILD_TESTING:BOOL=OFF post-install: - @for lib in ${PREFIX}/lib/InsightToolkit/*.so ; do \ + @cd ${STAGEDIR}${PREFIX}/lib/InsightToolkit && for lib in *.so; do \ ${LN} -s $$lib.2.8.0 $$lib.2 ; \ done - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} -.include +.include Copied: branches/2014Q1/science/InsightToolkit/files/patch-Code-Common-itkArray.h (from r336885, head/science/InsightToolkit/files/patch-Code-Common-itkArray.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/science/InsightToolkit/files/patch-Code-Common-itkArray.h Thu Dec 19 13:53:30 2013 (r336907, copy of r336885, head/science/InsightToolkit/files/patch-Code-Common-itkArray.h) @@ -0,0 +1,11 @@ +--- Code/Common/itkArray.h.orig 2006-03-16 14:43:26.000000000 +0300 ++++ Code/Common/itkArray.h 2013-12-18 22:35:26.050168890 +0400 +@@ -78,7 +78,7 @@ + + + /** Set the all the elements of the array to the specified value */ +- void Fill (TValueType const& v) { fill(v); } ++ void Fill (TValueType const& v) { this->fill(v); } + + /** Copy opertor */ + const Self & operator=( const Self &rhs ); Copied: branches/2014Q1/science/InsightToolkit/files/patch-Code-Common-itkArray2D.h (from r336885, head/science/InsightToolkit/files/patch-Code-Common-itkArray2D.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/science/InsightToolkit/files/patch-Code-Common-itkArray2D.h Thu Dec 19 13:53:30 2013 (r336907, copy of r336885, head/science/InsightToolkit/files/patch-Code-Common-itkArray2D.h) @@ -0,0 +1,11 @@ +--- Code/Common/itkArray2D.h.orig 2003-12-15 17:13:19.000000000 +0300 ++++ Code/Common/itkArray2D.h 2013-12-18 22:35:49.297942916 +0400 +@@ -60,7 +60,7 @@ + const Self & operator=( const Self & array ); + const Self & operator=( const VnlMatrixType & matrix ); + +- void Fill (TValueType const& v) { fill(v); } ++ void Fill (TValueType const& v) { this->fill(v); } + + /** Destructively set the size to that given. Will lose data. */ + void SetSize(unsigned int m, unsigned int n); Copied: branches/2014Q1/science/InsightToolkit/files/patch-Code-Common-itkKLMSegmentationBorder.h (from r336885, head/science/InsightToolkit/files/patch-Code-Common-itkKLMSegmentationBorder.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/science/InsightToolkit/files/patch-Code-Common-itkKLMSegmentationBorder.h Thu Dec 19 13:53:30 2013 (r336907, copy of r336885, head/science/InsightToolkit/files/patch-Code-Common-itkKLMSegmentationBorder.h) @@ -0,0 +1,33 @@ +--- Code/Common/itkKLMSegmentationBorder.h.orig 2006-02-07 01:01:56.000000000 +0300 ++++ Code/Common/itkKLMSegmentationBorder.h 2013-12-17 17:28:09.961367612 +0400 +@@ -80,11 +80,11 @@ + + bool operator> (const KLMDynamicBorderArray* rhs) const + { +- if( m_Pointer->GetLambda() == rhs.m_Pointer->GetLambda() ) ++ if( m_Pointer->GetLambda() == rhs->m_Pointer->GetLambda() ) + { + if( m_Pointer->GetLambda() < 0 ) + { +- return ( m_Pointer > rhs.m_Pointer ); ++ return ( m_Pointer > rhs->m_Pointer ); + } + else + { +@@ -99,13 +99,13 @@ + m_Pointer->GetRegion2()->GetRegionBorderSize() ); + + unsigned int v2 = vnl_math_max( +- rhs.m_Pointer->GetRegion1()->GetRegionBorderSize(), +- rhs.m_Pointer->GetRegion2()->GetRegionBorderSize() ); ++ rhs->m_Pointer->GetRegion1()->GetRegionBorderSize(), ++ rhs->m_Pointer->GetRegion2()->GetRegionBorderSize() ); + + return ( v1 > v2 ); + } + } +- return(m_Pointer->GetLambda() > rhs.m_Pointer->GetLambda() ); ++ return(m_Pointer->GetLambda() > rhs->m_Pointer->GetLambda() ); + } + + TBorder *m_Pointer; Copied: branches/2014Q1/science/InsightToolkit/files/patch-Code-Common-itkParametricPath.txx (from r336885, head/science/InsightToolkit/files/patch-Code-Common-itkParametricPath.txx) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/science/InsightToolkit/files/patch-Code-Common-itkParametricPath.txx Thu Dec 19 13:53:30 2013 (r336907, copy of r336885, head/science/InsightToolkit/files/patch-Code-Common-itkParametricPath.txx) @@ -0,0 +1,20 @@ +--- Code/Common/itkParametricPath.txx.orig 2004-12-04 16:22:44.000000000 +0300 ++++ Code/Common/itkParametricPath.txx 2013-12-18 22:34:31.538947309 +0400 +@@ -43,7 +43,7 @@ + ContinuousIndexType continuousIndex; + IndexType index; + +- continuousIndex = Evaluate( input ); ++ continuousIndex = this->Evaluate( input ); + + // Round each coordinate to the nearest integer value + for( unsigned int i=0; iEndOfInput() - input; + } + +- return ( Evaluate(input + inputStepSize) - Evaluate(input) ) / inputStepSize; ++ return ( this->Evaluate(input + inputStepSize) - this->Evaluate(input) ) / inputStepSize; + } + + template Copied: branches/2014Q1/science/InsightToolkit/files/patch-Utilities-vxl-core-vnl-vnl__matrix__fixed__ref.h (from r336885, head/science/InsightToolkit/files/patch-Utilities-vxl-core-vnl-vnl__matrix__fixed__ref.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/science/InsightToolkit/files/patch-Utilities-vxl-core-vnl-vnl__matrix__fixed__ref.h Thu Dec 19 13:53:30 2013 (r336907, copy of r336885, head/science/InsightToolkit/files/patch-Utilities-vxl-core-vnl-vnl__matrix__fixed__ref.h) @@ -0,0 +1,11 @@ +--- Utilities/vxl/core/vnl/vnl_matrix_fixed_ref.h.orig 2006-03-22 01:25:06.000000000 +0300 ++++ Utilities/vxl/core/vnl/vnl_matrix_fixed_ref.h 2013-12-17 17:21:57.529194289 +0400 +@@ -653,7 +653,7 @@ + //: Return true if *this == rhs + bool operator_eq (vnl_matrix_fixed_ref_const const & rhs) const + { +- return equal( this->data_block(), rhs.data_block() ); ++ return this->equal( this->data_block(), rhs.data_block() ); + } + + //: Equality operator From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 19 14:03:31 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D2C74B3A; Thu, 19 Dec 2013 14:03:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BB8AA1361; Thu, 19 Dec 2013 14:03:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJE3VMU048073; Thu, 19 Dec 2013 14:03:31 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJE3MsL048008; Thu, 19 Dec 2013 14:03:22 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312191403.rBJE3MsL048008@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 19 Dec 2013 14:03:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336909 - in branches/2014Q1: Keywords Mk x11-fonts/encodings x11-fonts/font-adobe-100dpi x11-fonts/font-adobe-75dpi x11-fonts/font-adobe-utopia-100dpi x11-fonts/font-adobe-utopia-75dpi... X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 14:03:32 -0000 Author: bapt Date: Thu Dec 19 14:03:22 2013 New Revision: 336909 URL: http://svnweb.freebsd.org/changeset/ports/336909 Log: MFH: r336886 Try to fix font handling for xorg fonts when using staging and pkgng. This should silence all QAT messages about leftover font files. Bump portrevision for all affected ports. Original idea: bapt Added: branches/2014Q1/Keywords/fc.yaml - copied unchanged from r336886, head/Keywords/fc.yaml branches/2014Q1/Keywords/fcfontsdir.yaml - copied unchanged from r336886, head/Keywords/fcfontsdir.yaml branches/2014Q1/Keywords/fontsdir.yaml - copied unchanged from r336886, head/Keywords/fontsdir.yaml Modified: branches/2014Q1/Mk/bsd.xorg.mk branches/2014Q1/x11-fonts/encodings/Makefile branches/2014Q1/x11-fonts/font-adobe-100dpi/Makefile branches/2014Q1/x11-fonts/font-adobe-75dpi/Makefile branches/2014Q1/x11-fonts/font-adobe-utopia-100dpi/Makefile branches/2014Q1/x11-fonts/font-adobe-utopia-75dpi/Makefile branches/2014Q1/x11-fonts/font-adobe-utopia-type1/Makefile branches/2014Q1/x11-fonts/font-alias/Makefile branches/2014Q1/x11-fonts/font-arabic-misc/Makefile branches/2014Q1/x11-fonts/font-bh-100dpi/Makefile branches/2014Q1/x11-fonts/font-bh-75dpi/Makefile branches/2014Q1/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile branches/2014Q1/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile branches/2014Q1/x11-fonts/font-bh-ttf/Makefile branches/2014Q1/x11-fonts/font-bh-type1/Makefile branches/2014Q1/x11-fonts/font-bitstream-100dpi/Makefile branches/2014Q1/x11-fonts/font-bitstream-75dpi/Makefile branches/2014Q1/x11-fonts/font-bitstream-speedo/Makefile branches/2014Q1/x11-fonts/font-bitstream-type1/Makefile branches/2014Q1/x11-fonts/font-cronyx-cyrillic/Makefile branches/2014Q1/x11-fonts/font-cursor-misc/Makefile branches/2014Q1/x11-fonts/font-daewoo-misc/Makefile branches/2014Q1/x11-fonts/font-dec-misc/Makefile branches/2014Q1/x11-fonts/font-ibm-type1/Makefile branches/2014Q1/x11-fonts/font-isas-misc/Makefile branches/2014Q1/x11-fonts/font-jis-misc/Makefile branches/2014Q1/x11-fonts/font-micro-misc/Makefile branches/2014Q1/x11-fonts/font-misc-cyrillic/Makefile branches/2014Q1/x11-fonts/font-misc-ethiopic/Makefile branches/2014Q1/x11-fonts/font-misc-meltho/Makefile branches/2014Q1/x11-fonts/font-misc-misc/Makefile branches/2014Q1/x11-fonts/font-mutt-misc/Makefile branches/2014Q1/x11-fonts/font-schumacher-misc/Makefile branches/2014Q1/x11-fonts/font-screen-cyrillic/Makefile branches/2014Q1/x11-fonts/font-sony-misc/Makefile branches/2014Q1/x11-fonts/font-sun-misc/Makefile branches/2014Q1/x11-fonts/font-util/Makefile branches/2014Q1/x11-fonts/font-winitzki-cyrillic/Makefile branches/2014Q1/x11-fonts/font-xfree86-type1/Makefile Directory Properties: branches/2014Q1/ (props changed) Copied: branches/2014Q1/Keywords/fc.yaml (from r336886, head/Keywords/fc.yaml) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/Keywords/fc.yaml Thu Dec 19 14:03:22 2013 (r336909, copy of r336886, head/Keywords/fc.yaml) @@ -0,0 +1,9 @@ +# $FreeBSD$ +# +# MAINTAINER: x11@FreeBSD.org + +actions: [dirrmtry] +post-install: | + fc-cache -s %D/%@ 2>/dev/null || true +post-deinstall: | + fc-cache -s %D/%@ 2>/dev/null || true Copied: branches/2014Q1/Keywords/fcfontsdir.yaml (from r336886, head/Keywords/fcfontsdir.yaml) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/Keywords/fcfontsdir.yaml Thu Dec 19 14:03:22 2013 (r336909, copy of r336886, head/Keywords/fcfontsdir.yaml) @@ -0,0 +1,19 @@ +# $FreeBSD$ +# +# MAINTAINER: x11@FreeBSD.org + +actions: [dirrmtry] +post-install: | + fc-cache -s %D/%@ 2>/dev/null || true + mkfontscale %D/%@ 2>/dev/null || true + mkfontdir %D/%@ 2>/dev/null || true +post-deinstall: | + fc-cache -s %D/%@ 2>/dev/null || true + mkfontscale %D/%@ 2>/dev/null || true + if [ -e %D/%@/fonts.scale -a "`stat -f '%%z' %D/%@/fonts.scale 2>/dev/null`" = '2' ]; then + rm %D/%@/fonts.scale + fi + mkfontdir %D/%@ 2>/dev/null || true + if [ -e %D/%@/fonts.dir -a "`stat -f '%%z' %D/%@/fonts.dir 2>/dev/null`" = '2' ]; then + rm %D/%@/fonts.dir + fi Copied: branches/2014Q1/Keywords/fontsdir.yaml (from r336886, head/Keywords/fontsdir.yaml) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/Keywords/fontsdir.yaml Thu Dec 19 14:03:22 2013 (r336909, copy of r336886, head/Keywords/fontsdir.yaml) @@ -0,0 +1,17 @@ +# $FreeBSD$ +# +# MAINTAINER: x11@FreeBSD.org + +actions: [dirrmtry] +post-install: | + mkfontscale %D/%@ 2>/dev/null || true + mkfontsdir %D/%@ 2>/dev/null || true +post-deinstall: | + mkfontscale %@ 2>/dev/null || true + if [ -e %D/%@/fonts.scale -a "`stat -f '%%z' %D/%@/fonts.scale 2>/dev/null`" = '2' ]; then + rm %D/%@/fonts.scale + fi + mkfontdir %@ 2>/dev/null || true + if [ -e %D/%@/fonts.dir -a "`stat -f '%%z' %D/%@§fonts.dir 2>/dev/null`" = '2' ]; then + rm %D/%@/fonts.dir + fi Modified: branches/2014Q1/Mk/bsd.xorg.mk ============================================================================== --- branches/2014Q1/Mk/bsd.xorg.mk Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/Mk/bsd.xorg.mk Thu Dec 19 14:03:22 2013 (r336909) @@ -110,6 +110,19 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/mkfontdir . endif post-install: +.if defined(WITH_PKGNG) +. for _fontdir in ${FONTDIR} +. if ${INSTALLS_TTF} == yes && ${NEED_MKFONTFOO} == yes + @${ECHO_CMD} "@fcfontsdir lib/X11/fonts/${_fontdir}" >> ${TMPPLIST} +. elif ${INSTALLS_TTF} == yes && ${NEED_MKFONTFOO} == no + @${ECHO_CMD} "@fc lib/X11/fonts/${_fontdir}" >> ${TMPPLIST} +. elif ${NEED_MKFONTFOO} == yes + @${ECHO_CMD} "@fontsdir lib/X11/fonts/${_fontdir}" >> ${TMPPLIST} +. else + @${ECHO_CMD} "@dirrmtry lib/X11/fonts/${_fontdir}" >> ${TMPPLIST} +. endif +. endfor +.else . if ${INSTALLS_TTF} == "yes" . for _fontdir in ${FONTDIR} @${ECHO_CMD} "@exec fc-cache -s %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST} @@ -129,6 +142,7 @@ post-install: @${ECHO_CMD} "@unexec rmdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST} . endfor . endif +.endif . if ${XORG_CAT} == "lib" USES+= pathfix Modified: branches/2014Q1/x11-fonts/encodings/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/encodings/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/encodings/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -2,6 +2,7 @@ PORTNAME= encodings PORTVERSION= 1.0.4 +PORTREVISION= PORTEPOCH= 1 CATEGORIES= x11-fonts Modified: branches/2014Q1/x11-fonts/font-adobe-100dpi/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-adobe-100dpi/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-adobe-100dpi/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-adobe-100dpi PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-adobe-75dpi/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-adobe-75dpi/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-adobe-75dpi/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-adobe-75dpi PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-adobe-utopia-100dpi/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-adobe-utopia-100dpi/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-adobe-utopia-100dpi/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-adobe-utopia-100dpi PORTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-adobe-utopia-75dpi/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-adobe-utopia-75dpi/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-adobe-utopia-75dpi/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-adobe-utopia-75dpi PORTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-adobe-utopia-type1/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-adobe-utopia-type1/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-adobe-utopia-type1/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-adobe-utopia-type1 PORTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-alias/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-alias/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-alias/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-alias PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-arabic-misc/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-arabic-misc/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-arabic-misc/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-arabic-misc PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-bh-100dpi/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-bh-100dpi/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-bh-100dpi/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-bh-100dpi PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-bh-75dpi/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-bh-75dpi/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-bh-75dpi/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-bh-75dpi PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-bh-lucidatypewriter-100dpi PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-bh-lucidatypewriter-75dpi PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-bh-ttf/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-bh-ttf/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-bh-ttf/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-bh-ttf PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-bh-type1/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-bh-type1/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-bh-type1/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-bh-type1 PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-bitstream-100dpi/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-bitstream-100dpi/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-bitstream-100dpi/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-bitstream-100dpi PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-bitstream-75dpi/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-bitstream-75dpi/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-bitstream-75dpi/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-bitstream-75dpi PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-bitstream-speedo/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-bitstream-speedo/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-bitstream-speedo/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -2,6 +2,7 @@ PORTNAME= font-bitstream-speedo PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-bitstream-type1/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-bitstream-type1/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-bitstream-type1/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-bitstream-type1 PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-cronyx-cyrillic/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-cronyx-cyrillic/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-cronyx-cyrillic/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-cronyx-cyrillic PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-cursor-misc/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-cursor-misc/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-cursor-misc/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-cursor-misc PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-daewoo-misc/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-daewoo-misc/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-daewoo-misc/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-daewoo-misc PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-dec-misc/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-dec-misc/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-dec-misc/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-dec-misc PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-ibm-type1/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-ibm-type1/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-ibm-type1/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-ibm-type1 PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-isas-misc/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-isas-misc/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-isas-misc/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-isas-misc PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-jis-misc/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-jis-misc/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-jis-misc/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-jis-misc PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-micro-misc/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-micro-misc/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-micro-misc/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-micro-misc PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-misc-cyrillic/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-misc-cyrillic/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-misc-cyrillic/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-misc-cyrillic PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-misc-ethiopic/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-misc-ethiopic/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-misc-ethiopic/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -2,6 +2,7 @@ PORTNAME= font-misc-ethiopic PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-misc-meltho/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-misc-meltho/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-misc-meltho/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -2,6 +2,7 @@ PORTNAME= font-misc-meltho PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-misc-misc/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-misc-misc/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-misc-misc/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-misc-misc PORTVERSION= 1.1.2 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-mutt-misc/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-mutt-misc/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-mutt-misc/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-mutt-misc PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-schumacher-misc/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-schumacher-misc/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-schumacher-misc/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-schumacher-misc PORTVERSION= 1.1.2 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-screen-cyrillic/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-screen-cyrillic/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-screen-cyrillic/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-screen-cyrillic PORTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-sony-misc/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-sony-misc/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-sony-misc/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-sony-misc PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-sun-misc/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-sun-misc/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-sun-misc/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-sun-misc PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-util/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-util/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-util/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-util PORTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-winitzki-cyrillic/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-winitzki-cyrillic/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-winitzki-cyrillic/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-winitzki-cyrillic PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org Modified: branches/2014Q1/x11-fonts/font-xfree86-type1/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/font-xfree86-type1/Makefile Thu Dec 19 14:02:50 2013 (r336908) +++ branches/2014Q1/x11-fonts/font-xfree86-type1/Makefile Thu Dec 19 14:03:22 2013 (r336909) @@ -3,6 +3,7 @@ PORTNAME= font-xfree86-type1 PORTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 19 14:04:46 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6B72AC3C; Thu, 19 Dec 2013 14:04:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 56E5A1372; Thu, 19 Dec 2013 14:04:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJE4kOw048344; Thu, 19 Dec 2013 14:04:46 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJE4kY9048343; Thu, 19 Dec 2013 14:04:46 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312191404.rBJE4kY9048343@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 19 Dec 2013 14:04:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336910 - branches/2014Q1/x11-fonts/encodings X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 14:04:46 -0000 Author: bapt Date: Thu Dec 19 14:04:45 2013 New Revision: 336910 URL: http://svnweb.freebsd.org/changeset/ports/336910 Log: MFH: r336887 Really bump portrevision. Noticed by: kwm Modified: branches/2014Q1/x11-fonts/encodings/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/x11-fonts/encodings/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/encodings/Makefile Thu Dec 19 14:03:22 2013 (r336909) +++ branches/2014Q1/x11-fonts/encodings/Makefile Thu Dec 19 14:04:45 2013 (r336910) @@ -2,7 +2,7 @@ PORTNAME= encodings PORTVERSION= 1.0.4 -PORTREVISION= +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-fonts From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 19 14:05:44 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D01C1D77; Thu, 19 Dec 2013 14:05:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BB64C1389; Thu, 19 Dec 2013 14:05:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJE5iXa048606; Thu, 19 Dec 2013 14:05:44 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJE5imM048605; Thu, 19 Dec 2013 14:05:44 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312191405.rBJE5imM048605@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 19 Dec 2013 14:05:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336911 - branches/2014Q1/graphics/squish X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 14:05:44 -0000 Author: bapt Date: Thu Dec 19 14:05:44 2013 New Revision: 336911 URL: http://svnweb.freebsd.org/changeset/ports/336911 Log: MFH: r336891 - Fix build with clang [1] - Update maintainer email [1] - Use option helpers PR: ports/184683 [1] Submitted by: maintainer Modified: branches/2014Q1/graphics/squish/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/squish/Makefile ============================================================================== --- branches/2014Q1/graphics/squish/Makefile Thu Dec 19 14:04:45 2013 (r336910) +++ branches/2014Q1/graphics/squish/Makefile Thu Dec 19 14:05:44 2013 (r336911) @@ -1,4 +1,4 @@ -# Created by: Reinier de Blois +# Created by: Reinier de Blois # $FreeBSD$ PORTNAME= squish @@ -6,7 +6,7 @@ PORTVERSION= 1.10 CATEGORIES= graphics MASTER_SITES= http://libsquish.googlecode.com/files/ -MAINTAINER= me@rdb.name +MAINTAINER= rddeblois@gmail.com COMMENT= Open source DXT compression library LICENSE= MIT @@ -15,21 +15,14 @@ USES= gmake MAKE_ENV= INSTALL_DIR=${STAGEDIR}${PREFIX} PLIST_FILES= include/squish.h \ lib/libsquish.a -CXXFLAGS+= -fPIC +CXXFLAGS+= -fPIC -include limits.h OPTIONS_RADIO= RG1 OPTIONS_RADIO_RG1= ALTIVEC SSE ALTIVEC_DESC= Use Altivec instructions RG1_DESC= Optimizations Selection -.include - -.if ${PORT_OPTIONS:MALTIVEC} -CXXFLAGS+= -DSQUISH_USE_ALTIVEC=1 -maltivec -.endif - -.if ${PORT_OPTIONS:MSSE} -CXXFLAGS+= -DSQUISH_USE_SSE=2 -msse -.endif +ALTIVEC_CXXFLAGS= -DSQUISH_USE_ALTIVEC=1 -maltivec +SSE_CXXFLAGS= -DSQUISH_USE_SSE=2 -msse .include From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 19 14:08:52 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1C0CAEB5; Thu, 19 Dec 2013 14:08:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 069F113A0; Thu, 19 Dec 2013 14:08:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJE8pBX049353; Thu, 19 Dec 2013 14:08:51 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJE8oBN049343; Thu, 19 Dec 2013 14:08:50 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312191408.rBJE8oBN049343@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 19 Dec 2013 14:08:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336912 - in branches/2014Q1/www/swish++: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 14:08:52 -0000 Author: bapt Date: Thu Dec 19 14:08:49 2013 New Revision: 336912 URL: http://svnweb.freebsd.org/changeset/ports/336912 Log: MFH: r336899 Fix build with clang PR: ports/184811 Submitted by: KATO Tsuguru Added: branches/2014Q1/www/swish++/files/patch-classic_formatter.c - copied unchanged from r336899, head/www/swish++/files/patch-classic_formatter.c branches/2014Q1/www/swish++/files/patch-index.c - copied unchanged from r336899, head/www/swish++/files/patch-index.c branches/2014Q1/www/swish++/files/patch-my_set.h - copied unchanged from r336899, head/www/swish++/files/patch-my_set.h branches/2014Q1/www/swish++/files/patch-search.c - copied unchanged from r336899, head/www/swish++/files/patch-search.c branches/2014Q1/www/swish++/files/patch-stem_word.c - copied unchanged from r336899, head/www/swish++/files/patch-stem_word.c branches/2014Q1/www/swish++/files/patch-xml_formatter.c - copied unchanged from r336899, head/www/swish++/files/patch-xml_formatter.c Modified: branches/2014Q1/www/swish++/Makefile branches/2014Q1/www/swish++/files/patch-config::config.mk branches/2014Q1/www/swish++/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/swish++/Makefile ============================================================================== --- branches/2014Q1/www/swish++/Makefile Thu Dec 19 14:05:44 2013 (r336911) +++ branches/2014Q1/www/swish++/Makefile Thu Dec 19 14:08:49 2013 (r336912) @@ -12,27 +12,25 @@ COMMENT= Simple Web Indexing System for RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget -USES= perl5 -USE_GMAKE= yes +USES= gmake perl5 MAKEFILE= GNUmakefile -MAKE_ENV= PERL=${PERL} PERL_VER=${PERL_VERSION} +MAKE_ENV= PERL="${PERL}" PERL_VER="${PERL_VER}" -MAN1= extract.1 httpindex.1 index.1 search.1 splitmail.1 -MAN3= WWW.3 -MAN4= swish++.conf.4 swish++.index.4 -MAN8= searchd.8 searchmonitor.8 - -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e '/^#error/d' ${WRKSRC}/config.h -.for file in scripts/searchd scripts/searchmonitor - @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/${file}.in +.for i in scripts/searchd scripts/searchmonitor + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/${i}.in .endfor +do-configure: + @(cd ${WRKSRC}/config && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ + ${MAKE_FLAGS} ${MAKEFILE}) + pre-install: - @${MKDIR} ${SITE_PERL} + @${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL} post-install: - ${INSTALL_SCRIPT} ${FILESDIR}/swish++.sh ${PREFIX}/etc/rc.d/swish++.sh.sample + (cd ${FILESDIR} && ${INSTALL_SCRIPT} swish++.sh \ + ${STAGEDIR}${PREFIX}/etc/rc.d/swish++.sh.sample) .include Copied: branches/2014Q1/www/swish++/files/patch-classic_formatter.c (from r336899, head/www/swish++/files/patch-classic_formatter.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/www/swish++/files/patch-classic_formatter.c Thu Dec 19 14:08:49 2013 (r336912, copy of r336899, head/www/swish++/files/patch-classic_formatter.c) @@ -0,0 +1,27 @@ +--- classic_formatter.c.orig ++++ classic_formatter.c +@@ -79,7 +79,7 @@ + // + // SYNOPSIS + // +- void classic_formatter::result( int rank, file_info const &fi ) const ++ void classic_formatter::result( int my_rank, file_info const &fi ) const + // + // DESCRIPTION + // +@@ -88,13 +88,13 @@ + // + // PARAMETERS + // +-// rank The rank (1-100) of the result. ++// my_rank The rank (1-100) of the result. + // + // fi The search result's file information. + // + //***************************************************************************** + { +- out_ << rank << result_separator ++ out_ << my_rank << result_separator + << directories[ fi.dir_index() ] << '/' << fi.file_name() + << result_separator << fi.size() + << result_separator << fi.title() << '\n'; Modified: branches/2014Q1/www/swish++/files/patch-config::config.mk ============================================================================== --- branches/2014Q1/www/swish++/files/patch-config::config.mk Thu Dec 19 14:05:44 2013 (r336911) +++ branches/2014Q1/www/swish++/files/patch-config::config.mk Thu Dec 19 14:08:49 2013 (r336912) @@ -42,7 +42,7 @@ # Install command; usually "$(ROOT)/install-sh". -I_ROOT:= /usr/local -+I_ROOT:= ${PREFIX} ++I_ROOT:= ${DESTDIR}${PREFIX} # The top-level directory of where SWISH++ will be installed. I_BIN:= $(I_ROOT)/bin Copied: branches/2014Q1/www/swish++/files/patch-index.c (from r336899, head/www/swish++/files/patch-index.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/www/swish++/files/patch-index.c Thu Dec 19 14:08:49 2013 (r336912, copy of r336899, head/www/swish++/files/patch-index.c) @@ -0,0 +1,38 @@ +--- index.c.orig ++++ index.c +@@ -673,7 +673,7 @@ + // + // SYNOPSIS + // +- inline int rank( int file_index, int occurences_in_file, double factor ) ++ inline int my_rank( int file_index, int occurences_in_file, double factor ) + // + // DESCRIPTION + // +@@ -883,7 +883,7 @@ + continues = true; + o << enc_int( file->index_ ) + << enc_int( file->occurrences_ ) +- << enc_int( rank(file->index_, file->occurrences_, factor) ); ++ << enc_int( my_rank(file->index_, file->occurrences_, factor) ); + if ( !file->meta_ids_.empty() ) + file->write_meta_ids( o ); + #ifdef FEATURE_word_pos +@@ -930,7 +930,7 @@ + continues = true; + o << enc_int( file->index_ ) + << enc_int( file->occurrences_ ) +- << enc_int( rank(file->index_, file->occurrences_, factor) ); ++ << enc_int( my_rank(file->index_, file->occurrences_, factor) ); + if ( !file->meta_ids_.empty() ) + file->write_meta_ids( o ); + #ifdef FEATURE_word_pos +@@ -995,7 +995,7 @@ + // + double const factor = (double)Rank_Factor / info.occurrences_; + TRANSFORM_EACH( word_info::file_list, info.files_, file ) +- file->rank_ = rank( file->index_, file->occurrences_, factor ); ++ file->rank_ = my_rank( file->index_, file->occurrences_, factor ); + } + + if ( verbosity > 1 ) Copied: branches/2014Q1/www/swish++/files/patch-my_set.h (from r336899, head/www/swish++/files/patch-my_set.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/www/swish++/files/patch-my_set.h Thu Dec 19 14:08:49 2013 (r336912, copy of r336899, head/www/swish++/files/patch-my_set.h) @@ -0,0 +1,11 @@ +--- my_set.h.orig ++++ my_set.h +@@ -47,7 +47,7 @@ + //***************************************************************************** + { + public: +- bool contains( T const &s ) const { return find( s ) != this->end(); } ++ bool contains( T const &s ) const { return this->find( s ) != this->end(); } + }; + + //***************************************************************************** Copied: branches/2014Q1/www/swish++/files/patch-search.c (from r336899, head/www/swish++/files/patch-search.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/www/swish++/files/patch-search.c Thu Dec 19 14:08:49 2013 (r336912, copy of r336899, head/www/swish++/files/patch-search.c) @@ -0,0 +1,18 @@ +--- search.c.orig ++++ search.c +@@ -520,11 +520,11 @@ + r != sorted.end() && max_results-- > 0 && out; ++r + ) { + // cast gets rid of warning +- int rank = static_cast( r->second * normalize ); +- if ( !rank ) +- rank = 1; ++ int my_rank = static_cast( r->second * normalize ); ++ if ( !my_rank ) ++ my_rank = 1; + format->result( +- rank, ++ my_rank, + file_info( + reinterpret_cast( files[ r->first ] ) + ) Copied: branches/2014Q1/www/swish++/files/patch-stem_word.c (from r336899, head/www/swish++/files/patch-stem_word.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/www/swish++/files/patch-stem_word.c Thu Dec 19 14:08:49 2013 (r336912, copy of r336899, head/www/swish++/files/patch-stem_word.c) @@ -0,0 +1,51 @@ +--- stem_word.c.orig ++++ stem_word.c +@@ -48,7 +48,7 @@ + bool (*condition)( char const *word ); + }; + +-static char *end; // iterator at end of word being stemmed ++static char *my_end; // iterator at end of word being stemmed + // Acess to this global variable is protected by the cache_lock mutex in + // stem_word(). + +@@ -112,10 +112,10 @@ + // + //***************************************************************************** + { +- if ( end - word < 3 ) ++ if ( my_end - word < 3 ) + return false; + +- register char const *c = end; ++ register char const *c = my_end; + return !(is_vowel( *--c ) || *c == 'w' || *c == 'x' || *c == 'y' ) && + (is_vowel( *--c ) || *c == 'y') && !is_vowel( *--c ); + } +@@ -206,7 +206,7 @@ + # endif + + for ( ; rule->id; ++rule ) { +- register char *const suffix = end - rule->old_suffix_len; ++ register char *const suffix = my_end - rule->old_suffix_len; + if ( suffix < word ) + continue; + +@@ -226,7 +226,7 @@ + # ifdef DEBUG_stem_word + cerr << "---> replaced word=" << word << "\n"; + # endif +- end = suffix + rule->new_suffix_len; ++ my_end = suffix + rule->new_suffix_len; + break; + } + *suffix = ch; // no match: put back +@@ -397,7 +397,7 @@ + + char word_buf[ Word_Hard_Max_Size ]; + ::strcpy( word_buf, word ); +- end = word_buf + len; ++ my_end = word_buf + len; + + replace_suffix( word_buf, rules_1a ); + int const rule = replace_suffix( word_buf, rules_1b ); Copied: branches/2014Q1/www/swish++/files/patch-xml_formatter.c (from r336899, head/www/swish++/files/patch-xml_formatter.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/www/swish++/files/patch-xml_formatter.c Thu Dec 19 14:08:49 2013 (r336912, copy of r336899, head/www/swish++/files/patch-xml_formatter.c) @@ -0,0 +1,28 @@ +--- xml_formatter.c.orig ++++ xml_formatter.c +@@ -144,7 +144,7 @@ + // + // SYNOPSIS + // +- void xml_formatter::result( int rank, file_info const &fi ) const ++ void xml_formatter::result( int my_rank, file_info const &fi ) const + // + // DESCRIPTION + // +@@ -153,14 +153,14 @@ + // + // PARAMETERS + // +-// rank The rank (1-100) of the result. ++// my_rank The rank (1-100) of the result. + // + // fi The search result's file information. + // + //***************************************************************************** + { + out_ << " \n" +- " " << rank << "\n" ++ " " << my_rank << "\n" + " " + << directories[ fi.dir_index() ] << '/' << fi.file_name() + << "\n" Modified: branches/2014Q1/www/swish++/pkg-plist ============================================================================== --- branches/2014Q1/www/swish++/pkg-plist Thu Dec 19 14:05:44 2013 (r336911) +++ branches/2014Q1/www/swish++/pkg-plist Thu Dec 19 14:08:49 2013 (r336912) @@ -9,3 +9,13 @@ bin/splitmail etc/rc.d/swish++.sh.sample etc/swish++.conf %%SITE_PERL%%/WWW.pm +man/man1/extract.1.gz +man/man1/httpindex.1.gz +man/man1/index.1.gz +man/man1/search.1.gz +man/man1/splitmail.1.gz +man/man3/WWW.3.gz +man/man4/swish++.conf.4.gz +man/man4/swish++.index.4.gz +man/man8/searchd.8.gz +man/man8/searchmonitor.8.gz From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 19 14:10:16 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6FE11117; Thu, 19 Dec 2013 14:10:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5B69A13BE; Thu, 19 Dec 2013 14:10:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJEAGuh051633; Thu, 19 Dec 2013 14:10:16 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJEAFNh051630; Thu, 19 Dec 2013 14:10:15 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312191410.rBJEAFNh051630@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 19 Dec 2013 14:10:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336913 - in branches/2014Q1/japanese/kpcal: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 14:10:16 -0000 Author: bapt Date: Thu Dec 19 14:10:15 2013 New Revision: 336913 URL: http://svnweb.freebsd.org/changeset/ports/336913 Log: MFH: r336902 - Fix build with clang - Support staging PR: ports/184812 Submitted by: KATO Tsuguru Added: branches/2014Q1/japanese/kpcal/files/patch-conv.c - copied unchanged from r336902, head/japanese/kpcal/files/patch-conv.c branches/2014Q1/japanese/kpcal/files/patch-kpcal.c - copied unchanged from r336902, head/japanese/kpcal/files/patch-kpcal.c Modified: branches/2014Q1/japanese/kpcal/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/japanese/kpcal/Makefile ============================================================================== --- branches/2014Q1/japanese/kpcal/Makefile Thu Dec 19 14:08:49 2013 (r336912) +++ branches/2014Q1/japanese/kpcal/Makefile Thu Dec 19 14:10:15 2013 (r336913) @@ -5,8 +5,7 @@ PORTNAME= kpcal PORTVERSION= 2.0 PORTREVISION= 2 CATEGORIES= japanese -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= yoichi +MASTER_SITES= LOCAL/yoichi PATCH_SITES= http://www.tamaru.kuee.kyoto-u.ac.jp/~tsuchiya/misc/kpcal/ PATCHFILES= ${PORTNAME}-${PORTVERSION}-20040518.patch @@ -16,14 +15,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Make Calendar in Postscript format ALL_TARGET= kpcal -MAN1= kpcal.1 -PLIST_FILES= bin/kpcal -NO_STAGE= yes -post-patch: - ${REINPLACE_CMD} -e 's/long/time_t/' ${WRKSRC}/kpcal.c +PLIST_FILES= bin/kpcal man/man1/kpcal.1.gz + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/kpcal ${LOCALBASE}/bin - ${INSTALL_MAN} ${WRKSRC}/kpcal.1 ${LOCALBASE}/man/man1 + (cd ${WRKSRC} && ${INSTALL_PROGRAM} kpcal \ + ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC} && ${INSTALL_MAN} kpcal.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1) .include Copied: branches/2014Q1/japanese/kpcal/files/patch-conv.c (from r336902, head/japanese/kpcal/files/patch-conv.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/japanese/kpcal/files/patch-conv.c Thu Dec 19 14:10:15 2013 (r336913, copy of r336902, head/japanese/kpcal/files/patch-conv.c) @@ -0,0 +1,8 @@ +--- conv.c.orig ++++ conv.c +@@ -1,4 +1,5 @@ + #include ++#include + + #define TRUE (1) + #define FALSE (0) Copied: branches/2014Q1/japanese/kpcal/files/patch-kpcal.c (from r336902, head/japanese/kpcal/files/patch-kpcal.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/japanese/kpcal/files/patch-kpcal.c Thu Dec 19 14:10:15 2013 (r336913, copy of r336902, head/japanese/kpcal/files/patch-kpcal.c) @@ -0,0 +1,55 @@ +--- kpcal.c.orig ++++ kpcal.c +@@ -5,6 +5,8 @@ + */ + + #include ++#include ++#include + #include + #include + #include +@@ -28,6 +30,7 @@ + static char daynum_font[64] = DAYNUM_DEFAULT_FONT; + + extern void ConvertString(); ++extern void pmonth(); + + FILE *cfp = NULL; + int year; +@@ -35,7 +38,7 @@ + + char *getenv(); + +-main(argc, argv) ++int main(argc, argv) + int argc; + char **argv; + { +@@ -46,7 +49,7 @@ + register char *cp; + char *cfile = NULL; + char cbuf[80]; +- long t, time(); ++ time_t t, time(); + int errflg = 0; + int nocal = 0; + int m; +@@ -86,7 +89,7 @@ + exit(1); + } + +- t = time((long *)0); ++ t = time((time_t *)0); + lt = localtime(&t); + + /* +@@ -150,7 +153,7 @@ + /* + * pmonth - do calendar for month "m" + */ +-pmonth(m) ++void pmonth(m) + int m; + { + register char **s; From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 19 14:11:31 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 764C5257; Thu, 19 Dec 2013 14:11:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 483441469; Thu, 19 Dec 2013 14:11:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJEBVrh052448; Thu, 19 Dec 2013 14:11:31 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJEBVSH052447; Thu, 19 Dec 2013 14:11:31 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312191411.rBJEBVSH052447@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 19 Dec 2013 14:11:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336914 - in branches/2014Q1/ftp/multiget: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 14:11:31 -0000 Author: bapt Date: Thu Dec 19 14:11:30 2013 New Revision: 336914 URL: http://svnweb.freebsd.org/changeset/ports/336914 Log: MFH: r336908 - Fix build with clang - Add desktop entry file - Support staging PR: ports/184814 Submitted by: KATO Tsuguru Added: branches/2014Q1/ftp/multiget/files/ - copied from r336908, head/ftp/multiget/files/ Modified: branches/2014Q1/ftp/multiget/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/ftp/multiget/Makefile ============================================================================== --- branches/2014Q1/ftp/multiget/Makefile Thu Dec 19 14:10:15 2013 (r336913) +++ branches/2014Q1/ftp/multiget/Makefile Thu Dec 19 14:11:30 2013 (r336914) @@ -3,29 +3,40 @@ PORTNAME= multiget PORTVERSION= 1.1.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= ftp www MASTER_SITES= SF/${PORTNAME}/OldFiles MAINTAINER= ports@FreeBSD.org -COMMENT= An http/ftp downloader with a nice GUI +COMMENT= HTTP/FTP downloader with a nice GUI +WRKSRC_SUBDIR= src + +USES= dos2unix USE_WX= 2.6+ MAKEFILE= makefile ALL_TARGET= MultiGet -WRKSRC= ${WRKDIR}/${DISTNAME}/src -PLIST_FILES= bin/${PORTNAME} +PLIST_FILES= bin/${PORTNAME} share/pixmaps/MultiGet.png + +DESKTOP_ENTRIES="MultiGet" "" "${PREFIX}/share/pixmaps/MultiGet.png" \ + "${PORTNAME}" "" "" -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e \ - 's|g++|${CXX}|; \ - s|\(CFLAGS\) =|\1 +=|; \ - s|wx-config|${WX_CONFIG}|' \ + 's|$$(CC)|$$(CXX)| ; \ + s|$$(CFLAGS)|$$(CXXFLAGS)| ; \ + s|^CC =|CXX ?=| ; \ + s|^CFLAGS =|CXXFLAGS +=| ; \ + s| -O2 | | ; \ + s| -s | | ; \ + s|wx-config|$${WX_CONFIG}|' \ ${WRKSRC}/${MAKEFILE} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/MultiGet ${PREFIX}/bin/${PORTNAME} + (cd ${WRKSRC} && ${INSTALL_PROGRAM} MultiGet \ + ${STAGEDIR}${PREFIX}/bin/${PORTNAME}) + (cd ${WRKSRC}/.. && ${INSTALL_DATA} MultiGet.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps) .include From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 19 14:36:14 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EC29A8BE; Thu, 19 Dec 2013 14:36:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D68CE1627; Thu, 19 Dec 2013 14:36:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJEaE8n060558; Thu, 19 Dec 2013 14:36:14 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJEaDX6060549; Thu, 19 Dec 2013 14:36:13 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312191436.rBJEaDX6060549@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 19 Dec 2013 14:36:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336917 - in branches/2014Q1/graphics/graphopt: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 14:36:15 -0000 Author: bapt Date: Thu Dec 19 14:36:13 2013 New Revision: 336917 URL: http://svnweb.freebsd.org/changeset/ports/336917 Log: MFH: r336915 - Fix build with clang - Add LICENSE - Add desktop entry file - Support staging PR: pors/184815 Submitted by: KATO Tsuguru Added: branches/2014Q1/graphics/graphopt/files/patch-src__classes__dotImporter.cc - copied unchanged from r336915, head/graphics/graphopt/files/patch-src__classes__dotImporter.cc branches/2014Q1/graphics/graphopt/files/patch-src__classes__nodes.cc - copied unchanged from r336915, head/graphics/graphopt/files/patch-src__classes__nodes.cc branches/2014Q1/graphics/graphopt/files/patch-src__classes__optFileReader.cc - copied unchanged from r336915, head/graphics/graphopt/files/patch-src__classes__optFileReader.cc branches/2014Q1/graphics/graphopt/files/patch-src__classes__optFileWriter.cc - copied unchanged from r336915, head/graphics/graphopt/files/patch-src__classes__optFileWriter.cc branches/2014Q1/graphics/graphopt/files/patch-src__classes__visioExporter.cc - copied unchanged from r336915, head/graphics/graphopt/files/patch-src__classes__visioExporter.cc Modified: branches/2014Q1/graphics/graphopt/Makefile (contents, props changed) branches/2014Q1/graphics/graphopt/files/patch-src:classes:psExporter.cc (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/graphopt/Makefile ============================================================================== --- branches/2014Q1/graphics/graphopt/Makefile Thu Dec 19 14:32:47 2013 (r336916) +++ branches/2014Q1/graphics/graphopt/Makefile Thu Dec 19 14:36:13 2013 (r336917) @@ -3,16 +3,19 @@ PORTNAME= graphopt PORTVERSION= 0.4.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION} EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -COMMENT= Graph Layout Optimizer +COMMENT= Graph layout optimizer + +LICENSE= GPLv2 # (or later) USE_GNOME= gtk12 GNU_CONFIGURE= yes -NO_STAGE= yes +DESKTOP_ENTRIES="GraphOpt" "" "" "${PORTNAME}" "Graphics;GTK;" "" + .include Modified: branches/2014Q1/graphics/graphopt/files/patch-src:classes:psExporter.cc ============================================================================== --- branches/2014Q1/graphics/graphopt/files/patch-src:classes:psExporter.cc Thu Dec 19 14:32:47 2013 (r336916) +++ branches/2014Q1/graphics/graphopt/files/patch-src:classes:psExporter.cc Thu Dec 19 14:36:13 2013 (r336917) @@ -1,10 +1,13 @@ --- src/classes/psExporter.cc.orig Mon Aug 9 09:31:11 2004 +++ src/classes/psExporter.cc Mon Aug 9 09:31:38 2004 -@@ -23,13 +23,13 @@ void psExporter::do_export() { - fclose(outfile); - } +@@ -1,4 +1,5 @@ + #include "psExporter.h" ++#include + psExporter::psExporter(char *what_file, nodes *what_nodes) { +@@ -26,7 +27,7 @@ + void psExporter::write_headers(FILE *outfile) { char *line = new char[200]; - sprintf(line, "\%!PS-Adobe-1.0\n%%%%BoundingBox: 0 0 %d %d\n%%%%DocumentFonts: Helvetica\n%%%%Pages: 1\n", @@ -12,6 +15,3 @@ translatexcoord((double) biggest_x) + 2 * margin, translateycoord((double) biggest_y) + 2 * margin); fwrite(line, strlen(line), 1, outfile); - delete line; - } - Copied: branches/2014Q1/graphics/graphopt/files/patch-src__classes__dotImporter.cc (from r336915, head/graphics/graphopt/files/patch-src__classes__dotImporter.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/graphopt/files/patch-src__classes__dotImporter.cc Thu Dec 19 14:36:13 2013 (r336917, copy of r336915, head/graphics/graphopt/files/patch-src__classes__dotImporter.cc) @@ -0,0 +1,10 @@ +--- src/classes/dotImporter.cc.orig ++++ src/classes/dotImporter.cc +@@ -1,5 +1,6 @@ + #include "dotImporter.h" +-#include ++#include ++#include + #include + #include "../interface.h" + Copied: branches/2014Q1/graphics/graphopt/files/patch-src__classes__nodes.cc (from r336915, head/graphics/graphopt/files/patch-src__classes__nodes.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/graphopt/files/patch-src__classes__nodes.cc Thu Dec 19 14:36:13 2013 (r336917, copy of r336915, head/graphics/graphopt/files/patch-src__classes__nodes.cc) @@ -0,0 +1,9 @@ +--- src/classes/nodes.cc.orig 2013-12-10 00:22:15.000000000 +0900 ++++ src/classes/nodes.cc 2013-12-10 00:22:39.000000000 +0900 +@@ -1,4 +1,5 @@ +-#include ++#include ++#include + #include "nodes.h" + + Copied: branches/2014Q1/graphics/graphopt/files/patch-src__classes__optFileReader.cc (from r336915, head/graphics/graphopt/files/patch-src__classes__optFileReader.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/graphopt/files/patch-src__classes__optFileReader.cc Thu Dec 19 14:36:13 2013 (r336917, copy of r336915, head/graphics/graphopt/files/patch-src__classes__optFileReader.cc) @@ -0,0 +1,10 @@ +--- src/classes/optFileReader.cc.orig ++++ src/classes/optFileReader.cc +@@ -1,5 +1,6 @@ + #include "optFileReader.h" +-#include ++#include ++#include + #include + #include "../interface.h" + Copied: branches/2014Q1/graphics/graphopt/files/patch-src__classes__optFileWriter.cc (from r336915, head/graphics/graphopt/files/patch-src__classes__optFileWriter.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/graphopt/files/patch-src__classes__optFileWriter.cc Thu Dec 19 14:36:13 2013 (r336917, copy of r336915, head/graphics/graphopt/files/patch-src__classes__optFileWriter.cc) @@ -0,0 +1,8 @@ +--- src/classes/optFileWriter.cc.orig ++++ src/classes/optFileWriter.cc +@@ -1,4 +1,5 @@ + #include "optFileWriter.h" ++#include + + + optFileWriter::optFileWriter(char *what_file, nodes *what_nodes) { Copied: branches/2014Q1/graphics/graphopt/files/patch-src__classes__visioExporter.cc (from r336915, head/graphics/graphopt/files/patch-src__classes__visioExporter.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/graphopt/files/patch-src__classes__visioExporter.cc Thu Dec 19 14:36:13 2013 (r336917, copy of r336915, head/graphics/graphopt/files/patch-src__classes__visioExporter.cc) @@ -0,0 +1,8 @@ +--- src/classes/visioExporter.cc.orig ++++ src/classes/visioExporter.cc +@@ -1,4 +1,5 @@ + #include "visioExporter.h" ++#include + + + visioExporter::visioExporter(char *what_file, nodes *what_nodes) { From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 07:53:54 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6D8E0BF4; Fri, 20 Dec 2013 07:53:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 57F3017D1; Fri, 20 Dec 2013 07:53:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK7rsMF042052; Fri, 20 Dec 2013 07:53:54 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK7rqFg042040; Fri, 20 Dec 2013 07:53:52 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312200753.rBK7rqFg042040@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 20 Dec 2013 07:53:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336972 - in branches/2014Q1/irc/minbif: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 07:53:54 -0000 Author: bapt Date: Fri Dec 20 07:53:52 2013 New Revision: 336972 URL: http://svnweb.freebsd.org/changeset/ports/336972 Log: MFH: r336927 - Fix build with clang - Remove leading article from COMMENT - Convert to new LIB_DEPENDS format - Support staging While I'm here use option helpers where possible. PR: ports/184816 Submitted by: KATO Tsuguru Added: branches/2014Q1/irc/minbif/files/patch-src__core__minbif.cpp - copied unchanged from r336927, head/irc/minbif/files/patch-src__core__minbif.cpp branches/2014Q1/irc/minbif/files/patch-src__im__account.cpp - copied unchanged from r336927, head/irc/minbif/files/patch-src__im__account.cpp branches/2014Q1/irc/minbif/files/patch-src__im__auth_pam.cpp - copied unchanged from r336927, head/irc/minbif/files/patch-src__im__auth_pam.cpp branches/2014Q1/irc/minbif/files/patch-src__im__request.cpp - copied unchanged from r336927, head/irc/minbif/files/patch-src__im__request.cpp branches/2014Q1/irc/minbif/files/patch-src__irc__dcc.cpp - copied unchanged from r336927, head/irc/minbif/files/patch-src__irc__dcc.cpp branches/2014Q1/irc/minbif/files/patch-src__server_poll__daemon_fork.cpp - copied unchanged from r336927, head/irc/minbif/files/patch-src__server_poll__daemon_fork.cpp branches/2014Q1/irc/minbif/files/patch-src__server_poll__inetd.cpp - copied unchanged from r336927, head/irc/minbif/files/patch-src__server_poll__inetd.cpp branches/2014Q1/irc/minbif/files/patch-src__sockwrap__sockwrap.cpp - copied unchanged from r336927, head/irc/minbif/files/patch-src__sockwrap__sockwrap.cpp Modified: branches/2014Q1/irc/minbif/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/irc/minbif/Makefile ============================================================================== --- branches/2014Q1/irc/minbif/Makefile Fri Dec 20 06:23:20 2013 (r336971) +++ branches/2014Q1/irc/minbif/Makefile Fri Dec 20 07:53:52 2013 (r336972) @@ -8,11 +8,11 @@ CATEGORIES= irc net-im MASTER_SITES= https://symlink.me/attachments/download/148/ MAINTAINER= ports@FreeBSD.org -COMMENT= An IRC to instant messaging gateway +COMMENT= IRC to instant messaging gateway LICENSE= GPLv2 -LIB_DEPENDS= purple:${PORTSDIR}/net-im/libpurple +LIB_DEPENDS= libpurple.so:${PORTSDIR}/net-im/libpurple # right now PLUGINS installs prpl-coincoin and prpl-gayattitude OPTIONS_DEFINE= CACA GNUTLS VIDEO PLUGINS DOCS @@ -22,13 +22,14 @@ VIDEO_DESC= Webcam display using libcaca PLUGINS_DESC= Compile additional libpurple-plugins USE_RC_SUBR= minbif + +USES= cmake pkgconfig USE_GNOME= glib20 USE_EFL= imlib2 -USES= cmake pkgconfig CMAKE_ARGS= -DENABLE_IMLIB:BOOL=ON -CFLAGS+= ${PTHREAD_CFLAGS} -DX_DISPLAY_MISSING -LDFLAGS+= ${PTHREAD_LIBS} +CFLAGS+= -DX_DISPLAY_MISSING +LDFLAGS+= -pthread USERS= minbif GROUPS= minbif @@ -36,25 +37,30 @@ GROUPS= minbif SUB_FILES= pkg-message SUB_LIST= USERS="${USERS}" -MAN8= minbif.8 PORTDOCS= * PLIST_FILES= bin/minbif %%ETCDIR%%/minbif.conf-dist \ - %%ETCDIR%%/minbif.motd-dist + %%ETCDIR%%/minbif.motd-dist man/man8/minbif.8.gz PLIST_DIRS= %%ETCDIR%% -NO_STAGE= yes -.include +CACA_LIB_DEPENDS= libcaca.so:${PORTSDIR}/graphics/libcaca +CACA_CMAKE_ON= -DENABLE_CACA:BOOL=ON +CACA_CMAKE_OFF= -DENABLE_CACA:BOOL=OFF + +GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls +GNUTLS_CMAKE_ON= -DENABLE_TLS:BOOL=ON +GNUTLS_CMAKE_OFF= -DENABLE_TLS:BOOL=OFF + +PLUGINS_USE= GNOME=libxml2 +PLUGINS_CMAKE_ON= -DENABLE_PLUGIN:BOOL=ON +PLUGINS_CMAKE_OFF= -DENABLE_PLUGIN:BOOL=OFF +PLUGINS_PLIST_FILES= lib/purple-2/libcoincoin.so \ + lib/purple-2/libgayattitude.so -.if ${PORT_OPTIONS:MCACA} -LIB_DEPENDS+= caca:${PORTSDIR}/graphics/libcaca -CMAKE_ARGS+= -DENABLE_CACA:BOOL=ON -.else -CMAKE_ARGS+= -DENABLE_CACA:BOOL=OFF -.endif +.include .if ${PORT_OPTIONS:MVIDEO} && !empty(PORT_OPTIONS:MCACA) USE_GSTREAMER+= core good -LIB_DEPENDS+= gstfarsight-0.10:${PORTSDIR}/net-im/farsight2 +LIB_DEPENDS+= libgstfarsight-0.10.so:${PORTSDIR}/net-im/farsight2 CMAKE_ARGS+= -DENABLE_VIDEO:BOOL=ON .else CMAKE_ARGS+= -DENABLE_VIDEO:BOOL=OFF @@ -65,46 +71,37 @@ IGNORE= if you want to enable webcam su also enable CACA. .endif -.if ${PORT_OPTIONS:MPLUGINS} -USE_GNOME+= libxml2 -CMAKE_ARGS+= -DENABLE_PLUGIN:BOOL=ON -PLIST_FILES+= lib/purple-2/libcoincoin.so \ - lib/purple-2/libgayattitude.so -.else -CMAKE_ARGS+= -DENABLE_PLUGIN:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MGNUTLS} -LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls -CMAKE_ARGS+= -DENABLE_TLS:BOOL=ON -.else -CMAKE_ARGS+= -DENABLE_TLS:BOOL=OFF -.endif - post-patch: @${REINPLACE_CMD} -e \ 's|"-lpthread -lstdc++"||' ${WRKSRC}/src/CMakeLists.txt @${REINPLACE_CMD} -e \ '/pam_misc.h/d' ${WRKSRC}/src/im/auth_pam.h - @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ - ${WRKSRC}/src/server_poll/daemon_fork.cpp \ - ${WRKSRC}/src/server_poll/inetd.cpp + +post-build: + @${LN} -sf minbif.conf ${WRKSRC}/minbif.conf-dist + @${LN} -sf minbif.motd ${WRKSRC}/minbif.motd-dist do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/minbif.8 ${MAN8PREFIX}/man/man8 - ${MKDIR} ${ETCDIR} - ${INSTALL_DATA} ${WRKSRC}/minbif.conf ${ETCDIR}/minbif.conf-dist - ${INSTALL_DATA} ${WRKSRC}/minbif.motd ${ETCDIR}/minbif.motd-dist + (cd ${WRKSRC}/src && ${INSTALL_PROGRAM} ${PORTNAME} \ + ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC}/man && ${INSTALL_MAN} minbif.8 \ + ${STAGEDIR}${MAN8PREFIX}/man/man8) + @${MKDIR} ${STAGEDIR}${ETCDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} minbif.conf-dist \ + ${STAGEDIR}${ETCDIR}) + (cd ${WRKSRC} && ${INSTALL_DATA} minbif.motd-dist \ + ${STAGEDIR}${ETCDIR}) .if ${PORT_OPTIONS:MPLUGINS} - ${INSTALL_PROGRAM} ${WRKSRC}/plugins/coincoin/libcoincoin.so ${PREFIX}/lib/purple-2 - ${INSTALL_PROGRAM} ${WRKSRC}/plugins/gayattitude/libgayattitude.so ${PREFIX}/lib/purple-2 -.endif -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/minbif.xinetd ${DOCSDIR} -.endif - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/purple-2 + (cd ${WRKSRC}/plugins/coincoin && ${INSTALL_LIB} libcoincoin.so \ + ${STAGEDIR}${PREFIX}/lib/purple-2) + (cd ${WRKSRC}/plugins/gayattitude && ${INSTALL_LIB} libgayattitude.so \ + ${STAGEDIR}${PREFIX}/lib/purple-2) +.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} README \ + ${STAGEDIR}${DOCSDIR}) + (cd ${WRKSRC}/doc && ${INSTALL_DATA} minbif.xinetd \ + ${STAGEDIR}${DOCSDIR}) .include Copied: branches/2014Q1/irc/minbif/files/patch-src__core__minbif.cpp (from r336927, head/irc/minbif/files/patch-src__core__minbif.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/irc/minbif/files/patch-src__core__minbif.cpp Fri Dec 20 07:53:52 2013 (r336972, copy of r336927, head/irc/minbif/files/patch-src__core__minbif.cpp) @@ -0,0 +1,21 @@ +--- src/core/minbif.cpp.orig ++++ src/core/minbif.cpp +@@ -17,7 +17,7 @@ + */ + + #include +-#include ++#include + #include + #include + #include +@@ -239,7 +239,9 @@ + } + sighandler.setApplication(this); + ++#if ! GLIB_CHECK_VERSION(2, 32, 0) + g_thread_init(NULL); ++#endif + loop = g_main_new(FALSE); + g_main_run(loop); + Copied: branches/2014Q1/irc/minbif/files/patch-src__im__account.cpp (from r336927, head/irc/minbif/files/patch-src__im__account.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/irc/minbif/files/patch-src__im__account.cpp Fri Dec 20 07:53:52 2013 (r336972, copy of r336927, head/irc/minbif/files/patch-src__im__account.cpp) @@ -0,0 +1,10 @@ +--- src/im/account.cpp.orig ++++ src/im/account.cpp +@@ -18,6 +18,7 @@ + + #include + #include ++#include + #ifdef HAVE_IMLIB + #include + #endif /* HAVE_IMLIB */ Copied: branches/2014Q1/irc/minbif/files/patch-src__im__auth_pam.cpp (from r336927, head/irc/minbif/files/patch-src__im__auth_pam.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/irc/minbif/files/patch-src__im__auth_pam.cpp Fri Dec 20 07:53:52 2013 (r336972, copy of r336927, head/irc/minbif/files/patch-src__im__auth_pam.cpp) @@ -0,0 +1,10 @@ +--- src/im/auth_pam.cpp.orig ++++ src/im/auth_pam.cpp +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + + #include "auth.h" Copied: branches/2014Q1/irc/minbif/files/patch-src__im__request.cpp (from r336927, head/irc/minbif/files/patch-src__im__request.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/irc/minbif/files/patch-src__im__request.cpp Fri Dec 20 07:53:52 2013 (r336972, copy of r336927, head/irc/minbif/files/patch-src__im__request.cpp) @@ -0,0 +1,14 @@ +--- src/im/request.cpp.orig ++++ src/im/request.cpp +@@ -16,8 +16,9 @@ + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +-#include +-#include ++#include ++#include ++#include + + #include "request.h" + #include "buddy.h" Copied: branches/2014Q1/irc/minbif/files/patch-src__irc__dcc.cpp (from r336927, head/irc/minbif/files/patch-src__irc__dcc.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/irc/minbif/files/patch-src__irc__dcc.cpp Fri Dec 20 07:53:52 2013 (r336972, copy of r336927, head/irc/minbif/files/patch-src__irc__dcc.cpp) @@ -0,0 +1,19 @@ +--- src/irc/dcc.cpp.orig ++++ src/irc/dcc.cpp +@@ -17,12 +17,13 @@ + + #include + #include ++#include + #include + #include +-#include +-#include ++#include ++#include + #include +-#include ++#include + + #include "dcc.h" + #include "nick.h" Copied: branches/2014Q1/irc/minbif/files/patch-src__server_poll__daemon_fork.cpp (from r336927, head/irc/minbif/files/patch-src__server_poll__daemon_fork.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/irc/minbif/files/patch-src__server_poll__daemon_fork.cpp Fri Dec 20 07:53:52 2013 (r336972, copy of r336927, head/irc/minbif/files/patch-src__server_poll__daemon_fork.cpp) @@ -0,0 +1,17 @@ +--- src/server_poll/daemon_fork.cpp.orig ++++ src/server_poll/daemon_fork.cpp +@@ -20,10 +20,12 @@ + #include + #include + #include +-#include ++#include ++#include + #include +-#include ++#include + #include ++#include + + #include "daemon_fork.h" + #include "irc/irc.h" Copied: branches/2014Q1/irc/minbif/files/patch-src__server_poll__inetd.cpp (from r336927, head/irc/minbif/files/patch-src__server_poll__inetd.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/irc/minbif/files/patch-src__server_poll__inetd.cpp Fri Dec 20 07:53:52 2013 (r336972, copy of r336927, head/irc/minbif/files/patch-src__server_poll__inetd.cpp) @@ -0,0 +1,12 @@ +--- src/server_poll/inetd.cpp.orig ++++ src/server_poll/inetd.cpp +@@ -17,7 +17,8 @@ + */ + + #include +-#include ++#include ++#include + + #include "inetd.h" + #include "irc/irc.h" Copied: branches/2014Q1/irc/minbif/files/patch-src__sockwrap__sockwrap.cpp (from r336927, head/irc/minbif/files/patch-src__sockwrap__sockwrap.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/irc/minbif/files/patch-src__sockwrap__sockwrap.cpp Fri Dec 20 07:53:52 2013 (r336972, copy of r336927, head/irc/minbif/files/patch-src__sockwrap__sockwrap.cpp) @@ -0,0 +1,11 @@ +--- src/sockwrap/sockwrap.cpp.orig ++++ src/sockwrap/sockwrap.cpp +@@ -16,6 +16,8 @@ + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + ++#include ++ + #include "sockwrap.h" + #include "sockwrap_plain.h" + #ifdef HAVE_TLS From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 07:54:38 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D5937CDF; Fri, 20 Dec 2013 07:54:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C093717E2; Fri, 20 Dec 2013 07:54:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK7scH9042239; Fri, 20 Dec 2013 07:54:38 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK7scM7042238; Fri, 20 Dec 2013 07:54:38 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312200754.rBK7scM7042238@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 20 Dec 2013 07:54:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336973 - branches/2014Q1/graphics/qcread X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 07:54:38 -0000 Author: bapt Date: Fri Dec 20 07:54:38 2013 New Revision: 336973 URL: http://svnweb.freebsd.org/changeset/ports/336973 Log: MFH: r336931 - Fix build with clang - Add amd64 to ONLY_FOR_ARCHS - Add LICENSE - Support staging PR: ports/184817 Submitted by: KATO Tsuguru Modified: branches/2014Q1/graphics/qcread/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/qcread/Makefile ============================================================================== --- branches/2014Q1/graphics/qcread/Makefile Fri Dec 20 07:53:52 2013 (r336972) +++ branches/2014Q1/graphics/qcread/Makefile Fri Dec 20 07:54:38 2013 (r336973) @@ -10,18 +10,21 @@ MASTER_SITES= http://www.fhttpd.org/pub/ MAINTAINER= ports@FreeBSD.org COMMENT= Supports both color and B&W parallel-port Connectix QuickCam for PC -ONLY_FOR_ARCHS= i386 +LICENSE= BSD + +USE_CSTD= gnu89 + +ONLY_FOR_ARCHS= amd64 i386 -NO_STAGE= yes do-build: - cd ${WRKSRC} && ${CC} ${CFLAGS} -I. -DFreeBSD ${CPPFLAGS} \ - -o qcread qcread.c cqc.c -lm ${LDFLAGS} + (cd ${WRKSRC} && ${CC} ${CFLAGS} -I. -DFreeBSD ${CPPFLAGS} \ + -o qcread qcread.c cqc.c -lm ${LDFLAGS}) + @${LN} -sf qcam.conf ${WRKSRC}/qcam.conf.dist do-install: - ${INSTALL} ${COPY} -o root -g wheel -m 644 ${WRKSRC}/qcam.conf ${PREFIX}/etc/qcam.conf.dist - if [ ! -e ${PREFIX}/etc/qcam.conf ]; then \ - ${CP} ${PREFIX}/etc/qcam.conf.dist ${PREFIX}/etc/qcam.conf; \ - fi - ${INSTALL_PROGRAM} ${WRKSRC}/qcread ${PREFIX}/bin + (cd ${WRKSRC} && ${INSTALL_PROGRAM} qcread \ + ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC} && ${INSTALL_DATA} qcam.conf.dist \ + ${STAGEDIR}${PREFIX}/etc) .include From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 07:55:27 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 70E1BDD2; Fri, 20 Dec 2013 07:55:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5CF7F17FA; Fri, 20 Dec 2013 07:55:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK7tRNK042506; Fri, 20 Dec 2013 07:55:27 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK7tRqw042505; Fri, 20 Dec 2013 07:55:27 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312200755.rBK7tRqw042505@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 20 Dec 2013 07:55:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336974 - in branches/2014Q1/textproc/diffmark: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 07:55:27 -0000 Author: bapt Date: Fri Dec 20 07:55:26 2013 New Revision: 336974 URL: http://svnweb.freebsd.org/changeset/ports/336974 Log: MFH: r336933 - Fix build with clang - Update MASTER_SITES - Support staging PR: ports/184819 Submitted by: KATO Tsuguru Added: branches/2014Q1/textproc/diffmark/files/ - copied from r336933, head/textproc/diffmark/files/ Modified: branches/2014Q1/textproc/diffmark/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/textproc/diffmark/Makefile ============================================================================== --- branches/2014Q1/textproc/diffmark/Makefile Fri Dec 20 07:54:38 2013 (r336973) +++ branches/2014Q1/textproc/diffmark/Makefile Fri Dec 20 07:55:26 2013 (r336974) @@ -4,20 +4,25 @@ PORTNAME= diffmark PORTVERSION= 0.10 CATEGORIES= textproc -MASTER_SITES= http://www.mangrove.cz/diffmark/ +MASTER_SITES= http://www.mangrove.cz/diffmark/ \ + http://penguin.cz/~vbarta/diffmark/ MAINTAINER= ports@FreeBSD.org COMMENT= XML diff and merge package -LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 - USES= pkgconfig -USE_LDCONFIG= YES -GNU_CONFIGURE= YES -CONFIGURE_ARGS= --with-libxml2-incldir=${LOCALBASE}/include/libxml2 +USE_GNOME= libxml2 +GNU_CONFIGURE= yes +USE_LDCONFIG= yes -CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes +post-patch: + @${REINPLACE_CMD} -e \ + 's|-lstdc++||' ${WRKSRC}/lib/Makefile.in + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libdiffmark.so.2 + .include From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 07:56:30 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9346CEEC; Fri, 20 Dec 2013 07:56:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7D5631819; Fri, 20 Dec 2013 07:56:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK7uUuZ042881; Fri, 20 Dec 2013 07:56:30 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK7uSUV042864; Fri, 20 Dec 2013 07:56:28 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312200756.rBK7uSUV042864@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 20 Dec 2013 07:56:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336975 - in branches/2014Q1/lang/p2c: . files scripts X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 07:56:30 -0000 Author: bapt Date: Fri Dec 20 07:56:27 2013 New Revision: 336975 URL: http://svnweb.freebsd.org/changeset/ports/336975 Log: MFH: r336934 - Fix build with clang - Add LICENSE - Support staging PR: ports/184820 Submitted by: KATO Tsuguru Added: branches/2014Q1/lang/p2c/files/patch-Makefile - copied unchanged from r336934, head/lang/p2c/files/patch-Makefile branches/2014Q1/lang/p2c/files/patch-comment.c - copied unchanged from r336934, head/lang/p2c/files/patch-comment.c branches/2014Q1/lang/p2c/files/patch-lex.c - copied unchanged from r336934, head/lang/p2c/files/patch-lex.c branches/2014Q1/lang/p2c/files/patch-loc.p2clib.c - copied unchanged from r336934, head/lang/p2c/files/patch-loc.p2clib.c branches/2014Q1/lang/p2c/files/patch-makeproto.c - copied unchanged from r336934, head/lang/p2c/files/patch-makeproto.c branches/2014Q1/lang/p2c/files/patch-out.c - copied unchanged from r336934, head/lang/p2c/files/patch-out.c branches/2014Q1/lang/p2c/files/patch-p2clib.c - copied unchanged from r336934, head/lang/p2c/files/patch-p2clib.c branches/2014Q1/lang/p2c/files/patch-parse.c - copied unchanged from r336934, head/lang/p2c/files/patch-parse.c branches/2014Q1/lang/p2c/files/patch-trans.c - copied unchanged from r336934, head/lang/p2c/files/patch-trans.c branches/2014Q1/lang/p2c/files/patch-trans.h - copied unchanged from r336934, head/lang/p2c/files/patch-trans.h Deleted: branches/2014Q1/lang/p2c/files/patch-a branches/2014Q1/lang/p2c/files/patch-cc branches/2014Q1/lang/p2c/files/patch-tc branches/2014Q1/lang/p2c/scripts/ Modified: branches/2014Q1/lang/p2c/Makefile (contents, props changed) branches/2014Q1/lang/p2c/pkg-descr (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/lang/p2c/Makefile ============================================================================== --- branches/2014Q1/lang/p2c/Makefile Fri Dec 20 07:55:26 2013 (r336974) +++ branches/2014Q1/lang/p2c/Makefile Fri Dec 20 07:56:27 2013 (r336975) @@ -12,15 +12,31 @@ DISTFILES= p2c-1.21alpha2.tar.gz MAINTAINER= ports@FreeBSD.org COMMENT= Pascal to C translator -WRKSRC= ${WRKDIR}/p2c-1.21alpha-07.Dec.93 -MAN1= p2c.1 p2cc.1 +LICENSE= GPLv2 -pre-install: build - @${MKDIR} ${PREFIX}/bin - @${MKDIR} ${PREFIX}/lib - @${MKDIR} ${PREFIX}/man/man1 - @${MKDIR} ${PREFIX}/include/p2c - @${INSTALL_MAN} ${WRKSRC}/src/p2cc.man ${PREFIX}/man/man1/p2cc.1 +WRKSRC= ${WRKDIR}/p2c-1.21alpha-07.Dec.93/src + +USES= perl5 shebangfix +SHEBANG_FILES= p2cc.perl +perl_OLD_CMD= /bin/perl +ALL_TARGET= all p2cc + +do-install: + (cd ${WRKSRC} && ${INSTALL_PROGRAM} p2c \ + ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC} && ${INSTALL_SCRIPT} p2cc \ + ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC} && ${INSTALL_LIB} libp2c.a \ + ${STAGEDIR}${PREFIX}/lib) + @${MKDIR} ${STAGEDIR}${PREFIX}/include/p2c + (cd ${WRKSRC} && ${INSTALL_DATA} p2c.h \ + ${STAGEDIR}${PREFIX}/include/p2c) + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/p2c + (cd ${WRKSRC} && ${INSTALL_DATA} sys.p2crc \ + ${STAGEDIR}${PREFIX}/lib/p2c/p2crc) +.for i in loc.p2crc system.imp system.m2 turbo.imp string.pas + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} \ + ${STAGEDIR}${PREFIX}/lib/p2c) +.endfor -NO_STAGE= yes .include Copied: branches/2014Q1/lang/p2c/files/patch-Makefile (from r336934, head/lang/p2c/files/patch-Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/lang/p2c/files/patch-Makefile Fri Dec 20 07:56:27 2013 (r336975, copy of r336934, head/lang/p2c/files/patch-Makefile) @@ -0,0 +1,68 @@ +--- Makefile.orig ++++ Makefile +@@ -19,29 +19,30 @@ + SHELL = /bin/sh + + # Directories (private version) +-HOMEDIR = ../home +-INCDIR = ../home/p2c +-BINDIR = .. +-LIBDIR = ../home +-MANDIR = ../home +-MANFILE = p2c.cat # human-readable manual (for cat.1) ++#HOMEDIR = ../home ++#INCDIR = ../home/p2c ++#BINDIR = .. ++#LIBDIR = ../home ++#MANDIR = ../home ++#MANFILE = p2c.cat # human-readable manual (for cat.1) + #MANFILE = p2c.man.inst # uncompressed nroff source (for man.1) + #MANFILE = p2c.man.Z # compressed nroff source (for man.1.Z) + + # Directories (public version) +-#HOMEDIR = /usr/lib/p2c +-#INCDIR = /usr/include/p2c +-#BINDIR = /usr/bin +-#LIBDIR = /usr/lib +-#MANDIR = /usr/man/man1 +-#MANFILE = p2c.man.inst ++PREFIX ?= /usr/local ++HOMEDIR = $(PREFIX)/lib/p2c ++INCDIR = $(PREFIX)/include/p2c ++BINDIR = $(PREFIX)/bin ++LIBDIR = $(PREFIX)/lib ++MANDIR = $(PREFIX)/man/man1 ++MANFILE = p2c.man.inst + + # Compiler options +-CC = cc # you may wish to use gcc here instead ++CC ?= cc # you may wish to use gcc here instead + OPT = # -O # uncomment this for optimization + DEB = # -g # uncomment this for debugging + DEFS = # place other -D types of things here +-CFLAGS = $(OPT) $(DEB) $(DEFS) ++CFLAGS += $(OPT) $(DEB) $(DEFS) + LFLAGS = + + +@@ -64,9 +65,9 @@ + LIBOBJS = p2clib.o loc.p2clib.o + OTHERLIBOBJS = + +-ABSHOMEDIR = `cd $(HOMEDIR); pwd` +-ABSINCDIR = `cd $(INCDIR); pwd` +-ABSLIBDIR = `cd $(LIBDIR); pwd` ++ABSHOMEDIR = $(HOMEDIR) ++ABSINCDIR = $(INCDIR) ++ABSLIBDIR = $(LIBDIR) + + MISCSRCS = makeproto.c + PROTOS = p2c.proto p2c.hdrs +@@ -128,7 +129,6 @@ + sed -e "s;--HOMEDIR--;$(ABSHOMEDIR);" \ + -e "s;--INCDIR--;$(ABSINCDIR);" \ + -e "s;--LIBDIR--;$(ABSLIBDIR);" \ +- -e "s;/bin/perl;`which perl`;" \ + p2cc.perl >p2cc + chmod a+x p2cc + Copied: branches/2014Q1/lang/p2c/files/patch-comment.c (from r336934, head/lang/p2c/files/patch-comment.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/lang/p2c/files/patch-comment.c Fri Dec 20 07:56:27 2013 (r336975, copy of r336934, head/lang/p2c/files/patch-comment.c) @@ -0,0 +1,11 @@ +--- comment.c.orig ++++ comment.c +@@ -299,7 +299,7 @@ + printf("\"%s\", line %d,%d: %s\n", infname, inf_lnum, outf_lnum, msg); + } + if (verbose) +- fprintf(logf, "%s:%d:%d: %s\n", infname, inf_lnum, outf_lnum, msg); ++ fprintf(p2c_logf, "%s:%d:%d: %s\n", infname, inf_lnum, outf_lnum, msg); + if (notephase == 2 || regression) + prefix = format_s("\004 p2c: %s:", infname); + else Copied: branches/2014Q1/lang/p2c/files/patch-lex.c (from r336934, head/lang/p2c/files/patch-lex.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/lang/p2c/files/patch-lex.c Fri Dec 20 07:56:27 2013 (r336975, copy of r336934, head/lang/p2c/files/patch-lex.c) @@ -0,0 +1,74 @@ +--- lex.c.orig ++++ lex.c +@@ -520,7 +520,7 @@ + if (outf != stdout) + printf("Translation aborted: Too many errors.\n"); + if (verbose) +- fprintf(logf, "Translation aborted: Too many errors.\n"); ++ fprintf(p2c_logf, "Translation aborted: Too many errors.\n"); + closelogfile(); + exit_failure(); + } +@@ -541,9 +541,9 @@ + printf("Translation aborted.\n"); + } + if (verbose) { +- fprintf(logf, "%s:%d:%d: %s\n", ++ fprintf(p2c_logf, "%s:%d:%d: %s\n", + infname, inf_lnum, outf_lnum, msg); +- fprintf(logf, "Translation aborted.\n"); ++ fprintf(p2c_logf, "Translation aborted.\n"); + } + closelogfile(); + exit_failure(); +@@ -562,7 +562,7 @@ + { + if (checkeatnote(msg)) { + if (verbose) +- fprintf(logf, "%s:%d:%d: Omitted warning: %s\n", ++ fprintf(p2c_logf, "%s:%d:%d: Omitted warning: %s\n", + infname, inf_lnum, outf_lnum, msg); + return; + } +@@ -577,7 +577,7 @@ + { + if (checkeatnote(msg)) { + if (verbose) +- fprintf(logf, "%s:%d:%d: Omitted internal error in %s: %s\n", ++ fprintf(p2c_logf, "%s:%d:%d: Omitted internal error in %s: %s\n", + infname, inf_lnum, outf_lnum, proc, msg); + return; + } +@@ -596,7 +596,7 @@ + { + if (blockkind == TOK_IMPORT || checkeatnote(msg)) { + if (verbose) +- fprintf(logf, "%s:%d:%d: Omitted note: %s\n", ++ fprintf(p2c_logf, "%s:%d:%d: Omitted note: %s\n", + infname, inf_lnum, outf_lnum, msg); + return; + } +@@ -612,12 +612,12 @@ + { + if (blockkind == TOK_IMPORT || checkeatnote(msg)) { + if (verbose) +- fprintf(logf, "%s:%d:%d: Omitted end-note: %s\n", ++ fprintf(p2c_logf, "%s:%d:%d: Omitted end-note: %s\n", + infname, inf_lnum, outf_lnum, msg); + return; + } + if (verbose) +- fprintf(logf, "%s:%d:%d: Recorded end-note: %s\n", ++ fprintf(p2c_logf, "%s:%d:%d: Recorded end-note: %s\n", + infname, inf_lnum, outf_lnum, msg); + (void) strlist_add(&endnotelist, msg); + } +@@ -1327,7 +1327,7 @@ + else + printf("Reading include file \"%s\"\n", fn); + if (verbose) +- fprintf(logf, "Reading include file \"%s\"\n", fn); ++ fprintf(p2c_logf, "Reading include file \"%s\"\n", fn); + if (expandincludes == 0) { + push_input_file(fp, fn, 2); + curtok = TOK_INCLUDE; Copied: branches/2014Q1/lang/p2c/files/patch-loc.p2clib.c (from r336934, head/lang/p2c/files/patch-loc.p2clib.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/lang/p2c/files/patch-loc.p2clib.c Fri Dec 20 07:56:27 2013 (r336975, copy of r336934, head/lang/p2c/files/patch-loc.p2clib.c) @@ -0,0 +1,45 @@ +--- loc.p2clib.c.orig ++++ loc.p2clib.c +@@ -4,3 +4,42 @@ + * the symbol LOCAL_INIT when you compile p2clib.c. + */ + ++/* Some Turbo "unit crt" functions. */ ++ ++#include ++#include ++ ++static int terminfo_initialized; ++static char *cl, *ce; ++ ++static void initcurs() ++{ ++ if (terminfo_initialized) ++ return; ++ setupterm(0, fileno(stdout), 0); ++ ce = tgetstr("ce", 0); ++ cl = tgetstr("cl", 0); ++ terminfo_initialized = 1; ++} ++ ++void clreol() ++{ ++ initcurs(); ++ if (ce) ++ tputs(ce, 1, putchar); ++} ++ ++void clrscr() ++{ ++ initcurs(); ++ if (cl) ++ tputs(cl, 1, putchar); ++} ++ ++void delay(ms) ++int ms; ++{ ++ usleep(1000 * ms); ++} ++ ++ Copied: branches/2014Q1/lang/p2c/files/patch-makeproto.c (from r336934, head/lang/p2c/files/patch-makeproto.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/lang/p2c/files/patch-makeproto.c Fri Dec 20 07:56:27 2013 (r336975, copy of r336934, head/lang/p2c/files/patch-makeproto.c) @@ -0,0 +1,19 @@ +--- makeproto.c.orig ++++ makeproto.c +@@ -7,6 +7,7 @@ + + + #include ++#include + #include + #include + +@@ -157,7 +158,7 @@ + char argdecls[MAXARGS][256], argnames[MAXARGS][80]; + char *cp, *cp2, *cp3; + int i, j, pos, len, thistab, numstars, whichf, nargs, incomment, errors = 0; +- long li; ++ time_t li; + int typetab = 15, argtab = 30, width = 80, usenames = 0, usemacros = 0; + int useextern = 0, staticness = -1, hasheader = 0, useifdefs = 0; + int stupid = 1, firstdecl; Copied: branches/2014Q1/lang/p2c/files/patch-out.c (from r336934, head/lang/p2c/files/patch-out.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/lang/p2c/files/patch-out.c Fri Dec 20 07:56:27 2013 (r336975, copy of r336934, head/lang/p2c/files/patch-out.c) @@ -0,0 +1,11 @@ +--- out.c.orig ++++ out.c +@@ -1194,7 +1194,7 @@ + " seconds, %ld tries on line %d [251]", alts, outf_lnum); + note(outbuf); + } else if (verbose) { +- fprintf(logf, "%s, %d/%d: Line breaker spent %ld tries\n", ++ fprintf(p2c_logf, "%s, %d/%d: Line breaker spent %ld tries\n", + infname, inf_lnum, outf_lnum, alts); + } + if (testinglinebreaker) Copied: branches/2014Q1/lang/p2c/files/patch-p2clib.c (from r336934, head/lang/p2c/files/patch-p2clib.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/lang/p2c/files/patch-p2clib.c Fri Dec 20 07:56:27 2013 (r336975, copy of r336934, head/lang/p2c/files/patch-p2clib.c) @@ -0,0 +1,29 @@ +--- p2clib.c.orig ++++ p2clib.c +@@ -890,7 +890,7 @@ + { + #ifndef NO_TIME + struct tm *tm; +- long clock; ++ time_t clock; + + time(&clock); + tm = localtime(&clock); +@@ -908,7 +908,7 @@ + Void VAXdate(s) + char *s; + { +- long clock; ++ time_t clock; + char *c; + int i; + static int where[] = {8, 9, 0, 4, 5, 6, 0, 20, 21, 22, 23}; +@@ -924,7 +924,7 @@ + Void VAXtime(s) + char *s; + { +- long clock; ++ time_t clock; + char *c; + int i; + Copied: branches/2014Q1/lang/p2c/files/patch-parse.c (from r336934, head/lang/p2c/files/patch-parse.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/lang/p2c/files/patch-parse.c Fri Dec 20 07:56:27 2013 (r336975, copy of r336934, head/lang/p2c/files/patch-parse.c) @@ -0,0 +1,31 @@ +--- parse.c.orig ++++ parse.c +@@ -4392,7 +4392,7 @@ + long saveserial; + + if (verbose) +- fprintf(logf, "%s, %d/%d: Translating %s (in %s)\n", ++ fprintf(p2c_logf, "%s, %d/%d: Translating %s (in %s)\n", + infname, inf_lnum, outf_lnum, + curctx->name, curctx->ctx->name); + notephase = 1; +@@ -5477,8 +5477,8 @@ + if (!fp) { + if (need) + perror(infnbuf); +- if (logf) +- fprintf(logf, "(Unable to open search file \"%s\")\n", infnbuf); ++ if (p2c_logf) ++ fprintf(p2c_logf, "(Unable to open search file \"%s\")\n", infnbuf); + return 0; + } + flushcomments(NULL, -1, -1); +@@ -5515,7 +5515,7 @@ + else + printf("Reading import text for \"%s\"\n", mod->name); + if (verbose) +- fprintf(logf, "%s, %d/%d: Reading import text for \"%s\"\n", ++ fprintf(p2c_logf, "%s, %d/%d: Reading import text for \"%s\"\n", + infname, inf_lnum, outf_lnum, mod->name); + pushctx(mod); + gettok(); Copied: branches/2014Q1/lang/p2c/files/patch-trans.c (from r336934, head/lang/p2c/files/patch-trans.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/lang/p2c/files/patch-trans.c Fri Dec 20 07:56:27 2013 (r336975, copy of r336934, head/lang/p2c/files/patch-trans.c) @@ -0,0 +1,82 @@ +--- trans.c.orig ++++ trans.c +@@ -23,6 +23,8 @@ + #include "trans.h" + + #include ++#include ++#include + + + +@@ -575,7 +577,7 @@ + # endif + #endif + +-Static long starting_time; ++Static time_t starting_time; + + Static void openlogfile() + { +@@ -588,17 +590,17 @@ + if (!name) + name = format_s("%s.log", codefname); + saveoldfile(name); +- logf = fopen(name, "w"); +- if (logf) { +- fprintf(logf, "\nTranslation of %s to %s by p2c %s\n", ++ p2c_logf = fopen(name, "w"); ++ if (p2c_logf) { ++ fprintf(p2c_logf, "\nTranslation of %s to %s by p2c %s\n", + infname, codefname, P2C_VERSION); +- fprintf(logf, "Translated"); ++ fprintf(p2c_logf, "Translated"); + uname = getenv("USER"); + if (uname) +- fprintf(logf, " by %s", uname); ++ fprintf(p2c_logf, " by %s", uname); + time(&starting_time); +- fprintf(logf, " on %s", ctime(&starting_time)); +- fprintf(logf, "\n\n"); ++ fprintf(p2c_logf, " on %s", ctime(&starting_time)); ++ fprintf(p2c_logf, "\n\n"); + } else { + perror(name); + verbose = 0; +@@ -608,20 +610,20 @@ + + void closelogfile() + { +- long ending_time; ++ time_t ending_time; + +- if (logf) { +- fprintf(logf, "\n\n"); ++ if (p2c_logf) { ++ fprintf(p2c_logf, "\n\n"); + #if defined(unix) || defined(__unix) +- fprintf(logf, "Total memory used: %ld bytes.\n", (long)sbrk(0)); ++ fprintf(p2c_logf, "Total memory used: %ld bytes.\n", (long)sbrk(0)); + #endif + time(&ending_time); +- fprintf(logf, "Processed %d source lines in %ld:%ld seconds.\n", ++ fprintf(p2c_logf, "Processed %d source lines in %ld:%ld seconds.\n", + inf_ltotal, + (ending_time - starting_time) / 60, + (ending_time - starting_time) % 60); +- fprintf(logf, "\n\nTranslation completed on %s", ctime(&ending_time)); +- fclose(logf); ++ fprintf(p2c_logf, "\n\nTranslation completed on %s", ctime(&ending_time)); ++ fclose(p2c_logf); + } + } + +@@ -949,7 +951,7 @@ + setbuf(codef, NULL); /* for debugging */ + outf = codef; + outf_lnum = 1; +- logf = NULL; ++ p2c_logf = NULL; + if (verbose) + openlogfile(); + setup_complete = 0; Copied: branches/2014Q1/lang/p2c/files/patch-trans.h (from r336934, head/lang/p2c/files/patch-trans.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/lang/p2c/files/patch-trans.h Fri Dec 20 07:56:27 2013 (r336975, copy of r336934, head/lang/p2c/files/patch-trans.h) @@ -0,0 +1,22 @@ +--- trans.h.orig ++++ trans.h +@@ -1773,7 +1773,7 @@ + + extern char *infname, *outfname, *codefname, *hdrfname; + extern char *requested_module; +-extern FILE *inf, *outf, *codef, *hdrf, *logf; ++extern FILE *inf, *outf, *codef, *hdrf, *p2c_logf; + extern short setup_complete, found_module; + extern short regression, verbose, conserve_mem; + extern int inf_lnum, inf_ltotal; +@@ -1861,8 +1861,10 @@ + + /* Our library omits declarations for these functions! */ + ++#ifndef __FreeBSD__ + int link PP( (char *, char *) ); + int unlink PP( (char *) ); ++#endif + + + Modified: branches/2014Q1/lang/p2c/pkg-descr ============================================================================== --- branches/2014Q1/lang/p2c/pkg-descr Fri Dec 20 07:55:26 2013 (r336974) +++ branches/2014Q1/lang/p2c/pkg-descr Fri Dec 20 07:56:27 2013 (r336975) @@ -5,7 +5,7 @@ Software Pascal/2, Macintosh Programmer' Sun/Berkeley Pascal, Texas Instruments Pascal, Apollo Domain Pascal. Modula-2 syntax is also supported. Output is a set of .c and .h files that comprise an equivalent program in any of several dialects of -C. Output code may be kept machine- and dialectindependent, or it may +C. Output code may be kept machine- and dialect independent, or it may be targeted to a specific machine and compiler. Most reasonable Pascal programs are converted into fully functional C which will compile and run with no further modifications, although p2c sometimes chooses to From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 07:57:15 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E3AABFD5; Fri, 20 Dec 2013 07:57:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C1B1F1825; Fri, 20 Dec 2013 07:57:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK7vE8t043068; Fri, 20 Dec 2013 07:57:14 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK7vEI5043066; Fri, 20 Dec 2013 07:57:14 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312200757.rBK7vEI5043066@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 20 Dec 2013 07:57:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336976 - branches/2014Q1/games/cheech X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 07:57:15 -0000 Author: bapt Date: Fri Dec 20 07:57:14 2013 New Revision: 336976 URL: http://svnweb.freebsd.org/changeset/ports/336976 Log: MFH: r336937 - Fix build with clang - Add LICENSE PR: ports/184821 Submitted by: KATO Tsuguru Modified: branches/2014Q1/games/cheech/Makefile branches/2014Q1/games/cheech/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/cheech/Makefile ============================================================================== --- branches/2014Q1/games/cheech/Makefile Fri Dec 20 07:56:27 2013 (r336975) +++ branches/2014Q1/games/cheech/Makefile Fri Dec 20 07:57:14 2013 (r336976) @@ -11,15 +11,17 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Multiplayer Chinese Checkers game -LIB_DEPENDS= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \ - libgnet-2.0.so:${PORTSDIR}/net/gnet2 +LICENSE= GPLv2 # (or later) -USES= gmake pkgconfig -GNU_CONFIGURE= yes -USE_AUTOTOOLS= automake:env +LIB_DEPENDS= libgnet-2.0.so:${PORTSDIR}/net/gnet2 OPTIONS_DEFINE= DOCS +USES= gmake pkgconfig +USE_GNOME= gtkmm24 +USE_AUTOTOOLS= automake:env +GNU_CONFIGURE= yes + DESKTOP_ENTRIES= "cheech" \ "${COMMENT}" \ "${PREFIX}/share/pixmaps/${PORTNAME}.png" \ @@ -27,15 +29,17 @@ DESKTOP_ENTRIES= "cheech" \ "Game;BoardGame;" \ "false" -INSTALL_TARGET= install install-cheechdocDATA - post-patch: - @${REINPLACE_CMD} -e "s|doc/cheech|share/doc/cheech|g" \ - -e "s|: install-cheechdocDATA|:|g" \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|connect(SigC::slot|connect(sigc::mem_fun|g ; \ - s|#include ||g' \ - ${WRKSRC}/src/*.cc + @${REINPLACE_CMD} -e \ + 's|$${prefix}/doc|$$(datadir)/doc| ; \ + /^cheechdoc_DATA/s|COPYING||' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e \ + '/^AM_CXXFLAGS/s|[[:blank:]]-g||' ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -e \ + 's|\([[:blank:]]\)usleep|\1Glib::usleep|' ${WRKSRC}/src/utility.cc + @${REINPLACE_CMD} -e \ + 's|connect(SigC::slot|connect(sigc::mem_fun|g ; \ + s|#include ||g' ${WRKSRC}/src/*.cc pre-configure: @${LN} -sf ${AUTOMAKE_DIR}/install-sh ${WRKSRC} Modified: branches/2014Q1/games/cheech/pkg-plist ============================================================================== --- branches/2014Q1/games/cheech/pkg-plist Fri Dec 20 07:56:27 2013 (r336975) +++ branches/2014Q1/games/cheech/pkg-plist Fri Dec 20 07:57:14 2013 (r336976) @@ -39,7 +39,6 @@ bin/cheechwebd %%DATADIR%%/cheechweb/images/peg-yellow.png %%DATADIR%%/cheechweb/index.html %%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS @@ -50,8 +49,8 @@ share/pixmaps/cheech/cheech.png share/pixmaps/cheech/highlight.png share/pixmaps/cheech/pegs.png share/pixmaps/cheech/smiley.png -@dirrmtry share/pixmaps/cheech -%%PORTDOCS%%@dirrmtry %%DOCSDIR%% -@dirrmtry %%DATADIR%%/cheechweb/images -@dirrmtry %%DATADIR%%/cheechweb -@dirrmtry %%DATADIR%% +@dirrm share/pixmaps/cheech +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm %%DATADIR%%/cheechweb/images +@dirrm %%DATADIR%%/cheechweb +@dirrm %%DATADIR%% From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 07:58:23 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 46466168; Fri, 20 Dec 2013 07:58:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 26C5D1837; Fri, 20 Dec 2013 07:58:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK7wNks043330; Fri, 20 Dec 2013 07:58:23 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK7wMHL043324; Fri, 20 Dec 2013 07:58:22 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312200758.rBK7wMHL043324@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 20 Dec 2013 07:58:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336977 - in branches/2014Q1/audio/sidplay: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 07:58:23 -0000 Author: bapt Date: Fri Dec 20 07:58:21 2013 New Revision: 336977 URL: http://svnweb.freebsd.org/changeset/ports/336977 Log: MFH: r336941 - Fix build with clang - Update MASTER_SITES - Add LICENSE - Switch to PLIST_FILES PR: ports/184823 Submitted by: KATO Tsuguru Added: branches/2014Q1/audio/sidplay/files/patch-sid2wav.cpp - copied unchanged from r336941, head/audio/sidplay/files/patch-sid2wav.cpp branches/2014Q1/audio/sidplay/files/patch-sidcon.cpp - copied unchanged from r336941, head/audio/sidplay/files/patch-sidcon.cpp branches/2014Q1/audio/sidplay/files/patch-sidplay.cpp - copied unchanged from r336941, head/audio/sidplay/files/patch-sidplay.cpp Deleted: branches/2014Q1/audio/sidplay/pkg-plist Modified: branches/2014Q1/audio/sidplay/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/sidplay/Makefile ============================================================================== --- branches/2014Q1/audio/sidplay/Makefile Fri Dec 20 07:57:14 2013 (r336976) +++ branches/2014Q1/audio/sidplay/Makefile Fri Dec 20 07:58:21 2013 (r336977) @@ -3,25 +3,27 @@ PORTNAME= sidplay PORTVERSION= 1.0.9 +DISTVERSIONPREFIX= base- CATEGORIES= audio emulators -MASTER_SITES= http://bsd-geek.de/FreeBSD/distfiles/ -DISTNAME= ${PORTNAME}-base-${PORTVERSION} +MASTER_SITES= http://bsd-geek.de/FreeBSD/distfiles/ \ + http://www.sourcefiles.org/Multimedia/Module_Players/ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Commodore SID-chip emulator that plays SID music files +LICENSE= GPLv2 # (or later) + LIB_DEPENDS= libsidplay.so:${PORTSDIR}/audio/libsidplay +GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-sidplay-includes=${LOCALBASE}/include \ --with-sidplay-library=${LOCALBASE}/lib - -WRKSRC= ${WRKDIR}/${PORTNAME}-base-${PORTVERSION} -GNU_CONFIGURE= yes -NO_STAGE= yes +PLIST_FILES= bin/sid2wav bin/sidcon bin/sidplay post-install: - ${STRIP_CMD} ${PREFIX}/bin/sidplay ${PREFIX}/bin/sid2wav \ - ${PREFIX}/bin/sidcon + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sidplay \ + ${STAGEDIR}${PREFIX}/bin/sid2wav \ + ${STAGEDIR}${PREFIX}/bin/sidcon .include Copied: branches/2014Q1/audio/sidplay/files/patch-sid2wav.cpp (from r336941, head/audio/sidplay/files/patch-sid2wav.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/sidplay/files/patch-sid2wav.cpp Fri Dec 20 07:58:21 2013 (r336977, copy of r336941, head/audio/sidplay/files/patch-sid2wav.cpp) @@ -0,0 +1,32 @@ +--- sid2wav.cpp.orig ++++ sid2wav.cpp +@@ -18,9 +18,9 @@ + // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + // + +-#include +-#include +-#include ++#include ++#include ++#include + #include + + #include +@@ -39,6 +39,16 @@ + #include + #include + ++using std::cerr; ++using std::cout; ++using std::endl; ++using std::dec; ++using std::flush; ++using std::hex; ++using std::ios; ++using std::setfill; ++using std::setw; ++ + const char s2w_version[] = "1.8"; + + struct wav_hdr // little endian Copied: branches/2014Q1/audio/sidplay/files/patch-sidcon.cpp (from r336941, head/audio/sidplay/files/patch-sidcon.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/sidplay/files/patch-sidcon.cpp Fri Dec 20 07:58:21 2013 (r336977, copy of r336941, head/audio/sidplay/files/patch-sidcon.cpp) @@ -0,0 +1,23 @@ +--- sidcon.cpp.orig ++++ sidcon.cpp +@@ -25,12 +25,18 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + + #include + #include + ++using std::cerr; ++using std::cin; ++using std::cout; ++using std::endl; ++using std::flush; ++ + static bool toPSID = true, + toSIDPLAY = false, + checkOnly = false, Copied: branches/2014Q1/audio/sidplay/files/patch-sidplay.cpp (from r336941, head/audio/sidplay/files/patch-sidplay.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/sidplay/files/patch-sidplay.cpp Fri Dec 20 07:58:21 2013 (r336977, copy of r336941, head/audio/sidplay/files/patch-sidplay.cpp) @@ -0,0 +1,28 @@ +--- sidplay.cpp.orig ++++ sidplay.cpp +@@ -18,8 +18,8 @@ + // + + #include +-#include +-#include ++#include ++#include + #include + #include + #include +@@ -41,6 +41,14 @@ + #define DISALLOW_STEREO_SOUND + #endif + ++using std::cerr; ++using std::cout; ++using std::dec; ++using std::endl; ++using std::hex; ++using std::setfill; ++using std::setw; ++ + // Error and status message numbers. + enum + { From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 07:59:10 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 54344265; Fri, 20 Dec 2013 07:59:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3F7E01842; Fri, 20 Dec 2013 07:59:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK7xAjq043551; Fri, 20 Dec 2013 07:59:10 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK7x9UY043548; Fri, 20 Dec 2013 07:59:09 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312200759.rBK7x9UY043548@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 20 Dec 2013 07:59:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336978 - in branches/2014Q1/x11-wm/wmii-devel: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 07:59:10 -0000 Author: bapt Date: Fri Dec 20 07:59:09 2013 New Revision: 336978 URL: http://svnweb.freebsd.org/changeset/ports/336978 Log: MFH: r336942 - Update MASTER_SITES and WWW: line - Fix build on -current - Add LICENSE - Support staging PR: ports/184824 Submitted by: KATO Tsuguru Added: branches/2014Q1/x11-wm/wmii-devel/files/ - copied from r336942, head/x11-wm/wmii-devel/files/ Modified: branches/2014Q1/x11-wm/wmii-devel/Makefile (contents, props changed) branches/2014Q1/x11-wm/wmii-devel/pkg-descr (contents, props changed) branches/2014Q1/x11-wm/wmii-devel/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/x11-wm/wmii-devel/Makefile ============================================================================== --- branches/2014Q1/x11-wm/wmii-devel/Makefile Fri Dec 20 07:58:21 2013 (r336977) +++ branches/2014Q1/x11-wm/wmii-devel/Makefile Fri Dec 20 07:59:09 2013 (r336978) @@ -4,42 +4,101 @@ PORTNAME= wmii DISTVERSION= 3.9.2 CATEGORIES= x11-wm -MASTER_SITES= http://dl.suckless.org/wmii/ +MASTER_SITES= GOOGLE_CODE +PKGNAMESUFFIX= -devel DISTNAME= wmii+ixp-${DISTVERSION} EXTRACT_SUFX= .tbz -PKGNAMESUFFIX= -devel MAINTAINER= ports@FreeBSD.org COMMENT= Dynamic, minimalist window manager for X11 -LIB_DEPENDS= ixp:${PORTSDIR}/devel/libixp +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +LIB_DEPENDS= libixp.so:${PORTSDIR}/devel/libixp + +OPTIONS_DEFINE= DOCS -USES= pkgconfig CONFLICTS= wmii-3.6* USE_BZIP2= yes +USES= pkgconfig USE_XORG= x11 xext xrandr xrender xinerama xft - -MAKE_ARGS= PREFIX="${PREFIX}" INCLUDE="${LOCALBASE}/include" \ - CC="${CC} -c" LD="${CC}" LIBIXP="-lixp" STATIC="" \ - MAN="${MANPREFIX}/man" DOC="${DOCSDIR}" +USE_LDCONFIG= yes MAKE_ENV= noisycc=1 # unmute build commands, useful for logs +MAKE_ARGS= PREFIX="${PREFIX}" INCLUDE="${LOCALBASE}/include" \ + CC="${CC} -c" LD="${CC}" LIBIXP="-lixp" \ + STATIC="" MAN="${MANPREFIX}/man" DOC="${DOCSDIR}" -MAN1= wimenu.1 wmii9menu.1 wmii.1 wmiir.1 - -OPTIONS_DEFINE= DOCS - -NO_STAGE= yes .include -post-patch: .SILENT +post-patch: # Link against `devel/libixp' from ports and drop extraneous build options - ${REINPLACE_CMD} -e '/libixp/d' ${WRKSRC}/Makefile - ${REINPLACE_CMD} -e 's,/usr/lib,${LOCALBASE}/lib, ; /^CFLAGS +=/d' \ + @${REINPLACE_CMD} -e '/libixp/d' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's,/usr/lib,${LOCALBASE}/lib, ; /^CFLAGS +=/d' \ ${WRKSRC}/config.mk -.if ! ${PORT_OPTIONS:MDOCS} - ${REINPLACE_CMD} -e '/doc/d' ${WRKSRC}/Makefile - ${REINPLACE_CMD} -e '/DOCDIR/s,$$(INSTALL),:,' ${WRKSRC}/mk/common.mk -.endif + +do-install: +.for i in wmii9menu wmiir + (cd ${WRKSRC}/cmd && ${INSTALL_PROGRAM} ${i}.out \ + ${STAGEDIR}${PREFIX}/bin/${i}) +.endfor +.for i in wmii.rc wmii.sh + (cd ${WRKSRC}/cmd && ${INSTALL_DATA} ${i}.out \ + ${STAGEDIR}${PREFIX}/bin/${i}) +.endfor + (cd ${WRKSRC}/cmd && ${INSTALL_SCRIPT} wihack.out \ + ${STAGEDIR}${PREFIX}/bin/wihack) + (cd ${WRKSRC}/cmd/menu && ${INSTALL_PROGRAM} wimenu.out \ + ${STAGEDIR}${PREFIX}/bin/wimenu) + (cd ${WRKSRC}/cmd/wmii && ${INSTALL_PROGRAM} wmii.out \ + ${STAGEDIR}${PREFIX}/bin/wmii) + (cd ${WRKSRC}/lib && ${INSTALL_LIB} libwmii_hack.so \ + ${STAGEDIR}${PREFIX}/lib) + (cd ${WRKSRC}/man && ${INSTALL_MAN} *.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1) + @${MKDIR} ${STAGEDIR}${ETCDIR} +.for i in welcome wmiirc + (cd ${WRKSRC}/rc && ${INSTALL_DATA} ${i}.out \ + ${STAGEDIR}${ETCDIR}/${i}) +.endfor + @${MKDIR} ${STAGEDIR}${ETCDIR}/plan9port + (cd ${WRKSRC}/alternative_wmiircs/plan9port && ${INSTALL_DATA} wmiirc \ + ${STAGEDIR}${ETCDIR}/plan9port) + @${MKDIR} ${STAGEDIR}${ETCDIR}/python +.for i in wmiirc wmiirc.py + (cd ${WRKSRC}/alternative_wmiircs/python && ${INSTALL_DATA} ${i} \ + ${STAGEDIR}${ETCDIR}/python) +.endfor + @${MKDIR} ${STAGEDIR}${ETCDIR}/python/pygmi + (cd ${WRKSRC}/alternative_wmiircs/python/pygmi && ${INSTALL_DATA} *.py \ + ${STAGEDIR}${ETCDIR}/python/pygmi) + @${MKDIR} ${STAGEDIR}${ETCDIR}/python/pyxp + (cd ${WRKSRC}/alternative_wmiircs/python/pyxp && ${INSTALL_DATA} *.py \ + ${STAGEDIR}${ETCDIR}/python/pyxp) + @${MKDIR} ${STAGEDIR}${ETCDIR}/ruby +.for i in config.rb config.yaml wmiirc + (cd ${WRKSRC}/alternative_wmiircs/ruby && ${INSTALL_DATA} ${i} \ + ${STAGEDIR}${ETCDIR}/ruby) +.endfor + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for i in LICENSE README + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) +.endfor + (cd ${WRKSRC}/doc && ${INSTALL_DATA} wmii.pdf ${STAGEDIR}${DOCSDIR}) + @${MKDIR} ${STAGEDIR}${DOCSDIR}/alternative_wmiircs + (cd ${WRKSRC}/alternative_wmiircs && ${INSTALL_DATA} README \ + ${STAGEDIR}${DOCSDIR}/alternative_wmiircs) + @${MKDIR} ${STAGEDIR}${DOCSDIR}/alternative_wmiircs/plan9port + (cd ${WRKSRC}/alternative_wmiircs/plan9port && ${INSTALL_DATA} README \ + ${STAGEDIR}${DOCSDIR}/alternative_wmiircs/plan9port) + @${MKDIR} ${STAGEDIR}${DOCSDIR}/alternative_wmiircs/python + (cd ${WRKSRC}/alternative_wmiircs/python && ${INSTALL_DATA} README \ + ${STAGEDIR}${DOCSDIR}/alternative_wmiircs/python) + @${MKDIR} ${STAGEDIR}${DOCSDIR}/alternative_wmiircs/ruby +.for i in HISTORY LICENSE README + (cd ${WRKSRC}/alternative_wmiircs/ruby && ${INSTALL_DATA} ${i} \ + ${STAGEDIR}${DOCSDIR}/alternative_wmiircs/ruby) +.endfor .include Modified: branches/2014Q1/x11-wm/wmii-devel/pkg-descr ============================================================================== --- branches/2014Q1/x11-wm/wmii-devel/pkg-descr Fri Dec 20 07:58:21 2013 (r336977) +++ branches/2014Q1/x11-wm/wmii-devel/pkg-descr Fri Dec 20 07:59:09 2013 (r336978) @@ -1,11 +1,11 @@ -WMII is a small, dynamic window manager for X11. It supports both classic -and tiling (acme-like) window management with extended keyboard, mouse, and -9p filesystem based remote control. It replaces the workspace paradigm with -a new tagging approach and is highly scriptable (with plain shell or Python -and even Chicken). +WMII is a small, dynamic window manager for X11. It supports both +classic and tiling (acme-like) window management with extended keyboard, +mouse, and 9p filesystem based remote control. It replaces the workspace +paradigm with a new tagging approach and is highly scriptable (with +plain shell or Python and even Chicken). Its minimalist philosophy attempts to not exceed 10.000 lines of code -(including all shipped utilities and libraries), to enforce simplicity and -clarity (read: it is hackable and beautiful). +(including all shipped utilities and libraries), to enforce simplicity +and clarity (read: it is hackable and beautiful). -WWW: http://wmii.suckless.org/ +WWW: https://code.google.com/p/wmii/ Modified: branches/2014Q1/x11-wm/wmii-devel/pkg-plist ============================================================================== --- branches/2014Q1/x11-wm/wmii-devel/pkg-plist Fri Dec 20 07:58:21 2013 (r336977) +++ branches/2014Q1/x11-wm/wmii-devel/pkg-plist Fri Dec 20 07:59:09 2013 (r336978) @@ -5,36 +5,34 @@ bin/wmii.rc bin/wmii.sh bin/wmii9menu bin/wmiir -etc/wmii/plan9port/wmiirc -etc/wmii/python/pygmi/__init__.py -etc/wmii/python/pygmi/event.py -etc/wmii/python/pygmi/fs.py -etc/wmii/python/pygmi/menu.py -etc/wmii/python/pygmi/monitor.py -etc/wmii/python/pygmi/util.py -etc/wmii/python/pyxp/__init__.py -etc/wmii/python/pyxp/asyncclient.py -etc/wmii/python/pyxp/client.py -etc/wmii/python/pyxp/dial.py -etc/wmii/python/pyxp/fcall.py -etc/wmii/python/pyxp/fields.py -etc/wmii/python/pyxp/messages.py -etc/wmii/python/pyxp/mux.py -etc/wmii/python/pyxp/types.py -etc/wmii/python/wmiirc -etc/wmii/python/wmiirc.py -etc/wmii/ruby/config.rb -etc/wmii/ruby/config.yaml -etc/wmii/ruby/wmiirc -etc/wmii/welcome -etc/wmii/wmiirc -@dirrm etc/wmii/ruby -@dirrm etc/wmii/python/pyxp -@dirrm etc/wmii/python/pygmi -@dirrm etc/wmii/python -@dirrm etc/wmii/plan9port -@dirrm etc/wmii +%%ETCDIR%%/plan9port/wmiirc +%%ETCDIR%%/python/pygmi/__init__.py +%%ETCDIR%%/python/pygmi/event.py +%%ETCDIR%%/python/pygmi/fs.py +%%ETCDIR%%/python/pygmi/menu.py +%%ETCDIR%%/python/pygmi/monitor.py +%%ETCDIR%%/python/pygmi/util.py +%%ETCDIR%%/python/pyxp/__init__.py +%%ETCDIR%%/python/pyxp/asyncclient.py +%%ETCDIR%%/python/pyxp/client.py +%%ETCDIR%%/python/pyxp/dial.py +%%ETCDIR%%/python/pyxp/fcall.py +%%ETCDIR%%/python/pyxp/fields.py +%%ETCDIR%%/python/pyxp/messages.py +%%ETCDIR%%/python/pyxp/mux.py +%%ETCDIR%%/python/pyxp/types.py +%%ETCDIR%%/python/wmiirc +%%ETCDIR%%/python/wmiirc.py +%%ETCDIR%%/ruby/config.rb +%%ETCDIR%%/ruby/config.yaml +%%ETCDIR%%/ruby/wmiirc +%%ETCDIR%%/welcome +%%ETCDIR%%/wmiirc lib/libwmii_hack.so +man/man1/wimenu.1.gz +man/man1/wmii.1.gz +man/man1/wmii9menu.1.gz +man/man1/wmiir.1.gz %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/alternative_wmiircs/README @@ -49,3 +47,9 @@ lib/libwmii_hack.so %%PORTDOCS%%@dirrm %%DOCSDIR%%/alternative_wmiircs/plan9port %%PORTDOCS%%@dirrm %%DOCSDIR%%/alternative_wmiircs %%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm %%ETCDIR%%/ruby +@dirrm %%ETCDIR%%/python/pyxp +@dirrm %%ETCDIR%%/python/pygmi +@dirrm %%ETCDIR%%/python +@dirrm %%ETCDIR%%/plan9port +@dirrm %%ETCDIR%% From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 07:59:58 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0A4C7346; Fri, 20 Dec 2013 07:59:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CFBAC184B; Fri, 20 Dec 2013 07:59:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK7xvFU043829; Fri, 20 Dec 2013 07:59:57 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK7xtsG043819; Fri, 20 Dec 2013 07:59:55 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312200759.rBK7xtsG043819@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 20 Dec 2013 07:59:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336979 - in branches/2014Q1/games/rtb: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 07:59:58 -0000 Author: bapt Date: Fri Dec 20 07:59:55 2013 New Revision: 336979 URL: http://svnweb.freebsd.org/changeset/ports/336979 Log: MFH: r336943 - Fix build on -current - Update MASTER_SITES - Add LICENSE - Add DESKTOP_ENTRIES - Support staging PR: ports/184825 Submitted by: KATO Tsuguru Added: branches/2014Q1/games/rtb/files/patch-team-framework__io__unixclientcommunicator.cpp - copied unchanged from r336943, head/games/rtb/files/patch-team-framework__io__unixclientcommunicator.cpp branches/2014Q1/games/rtb/files/patch-team-framework__io__unixinstreambuf.cpp - copied unchanged from r336943, head/games/rtb/files/patch-team-framework__io__unixinstreambuf.cpp branches/2014Q1/games/rtb/files/patch-team-framework__io__unixoutstreambuf.cpp - copied unchanged from r336943, head/games/rtb/files/patch-team-framework__io__unixoutstreambuf.cpp branches/2014Q1/games/rtb/files/patch-team-framework__io__unixremoteclientconnection.cpp - copied unchanged from r336943, head/games/rtb/files/patch-team-framework__io__unixremoteclientconnection.cpp branches/2014Q1/games/rtb/files/patch-team-framework__io__unixrtbconnection.cpp - copied unchanged from r336943, head/games/rtb/files/patch-team-framework__io__unixrtbconnection.cpp branches/2014Q1/games/rtb/files/patch-team-framework__io__unixservercommunicator.cpp - copied unchanged from r336943, head/games/rtb/files/patch-team-framework__io__unixservercommunicator.cpp branches/2014Q1/games/rtb/files/patch-team-framework__io__unixserverconnection.cpp - copied unchanged from r336943, head/games/rtb/files/patch-team-framework__io__unixserverconnection.cpp branches/2014Q1/games/rtb/files/patch-team-framework__stdnamespace.h - copied unchanged from r336943, head/games/rtb/files/patch-team-framework__stdnamespace.h Modified: branches/2014Q1/games/rtb/Makefile branches/2014Q1/games/rtb/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/rtb/Makefile ============================================================================== --- branches/2014Q1/games/rtb/Makefile Fri Dec 20 07:59:09 2013 (r336978) +++ branches/2014Q1/games/rtb/Makefile Fri Dec 20 07:59:55 2013 (r336979) @@ -3,60 +3,45 @@ PORTNAME= RealTimeBattle PORTVERSION= 1.0.8 -PORTREVISION= 9 +DISTVERSIONSUFFIX= -Ext +PORTREVISION= 10 CATEGORIES= games -MASTER_SITES= SF${PORTNAME:} -DISTNAME= ${PORTNAME}-${PORTVERSION}-Ext +MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}-1.0.x/${PORTNAME}%20${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Robot programming game for UNIX +LICENSE= GPLv2 # (or later) + BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed -USES= perl5 gmake pkgconfig +OPTIONS_DEFINE= DOCS + USE_BZIP2= yes +USES= gettext gmake perl5 pkgconfig USE_GNOME= gtk20 USE_PYTHON= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-rtb-dir=${PREFIX}/lib/${PORTNAME} -CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes +DESKTOP_ENTRIES="${PORTNAME}" "" "" "${PORTNAME:L}" "" "" + post-patch: -.for file in configure - @${REINPLACE_CMD} -e '/test/s| == | = |g ; \ - s|INCLUDED_LIBINTL=yes|INCLUDED_LIBINTL=no|g ; \ - s|\\$${top_builddir}/intl/libintl.a|-lintl|g' ${WRKSRC}/${file} +.for i in configure + @${REINPLACE_CMD} -e 's|INCLUDED_LIBINTL=yes|INCLUDED_LIBINTL=no|g ; \ + s|\\$${top_builddir}/intl/libintl.a|-lintl|g ; \ + /^DOCS_DIR/s|=.*|=$${prefix}/share/doc/${PORTNAME}| ; \ + /test/s| == | = |g' ${WRKSRC}/${i} .endfor -.for file in Makefile.in - @${REINPLACE_CMD} -e '/^SUBDIRS/s|Documentation||g' ${WRKSRC}/${file} +.for i in Documentation/Makefile.in + @${REINPLACE_CMD} -e '/COPYING/d' ${WRKSRC}/${i} .endfor -.for file in team-framework/createrobot.sh \ +.for i in team-framework/createrobot.sh \ team-framework/createrobotconf.sh - @${REINPLACE_CMD} -e 's| sed| gsed|g' ${WRKSRC}/${file} -.endfor - -post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for file in AUTHORS ChangeLog EXTRAROBOTS.README NEWS README TODO \ - Documentation/RealTimeBattle-1.html \ - Documentation/RealTimeBattle-2.html \ - Documentation/RealTimeBattle-3.html \ - Documentation/RealTimeBattle-4.html \ - Documentation/RealTimeBattle-5.html \ - Documentation/RealTimeBattle-6.html \ - Documentation/RealTimeBattle.html \ - Documentation/next.gif Documentation/prev.gif Documentation/toc.gif \ - Documentation/next.png Documentation/prev.png Documentation/toc.png \ - Documentation/RealTimeBattle.dvi \ - Documentation/RealTimeBattle.sgml \ - Documentation/RealTimeBattle.txt \ - Documentation/RTB-Team-Framework-Tutorial.tar.gz - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} + @${REINPLACE_CMD} -e 's| sed| gsed|g' ${WRKSRC}/${i} .endfor -.endif .include Copied: branches/2014Q1/games/rtb/files/patch-team-framework__io__unixclientcommunicator.cpp (from r336943, head/games/rtb/files/patch-team-framework__io__unixclientcommunicator.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/rtb/files/patch-team-framework__io__unixclientcommunicator.cpp Fri Dec 20 07:59:55 2013 (r336979, copy of r336943, head/games/rtb/files/patch-team-framework__io__unixclientcommunicator.cpp) @@ -0,0 +1,10 @@ +--- team-framework/io/unixclientcommunicator.cpp.orig ++++ team-framework/io/unixclientcommunicator.cpp +@@ -46,6 +46,7 @@ + #include + #include + #include ++#include + + /** + * Namespace Copied: branches/2014Q1/games/rtb/files/patch-team-framework__io__unixinstreambuf.cpp (from r336943, head/games/rtb/files/patch-team-framework__io__unixinstreambuf.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/rtb/files/patch-team-framework__io__unixinstreambuf.cpp Fri Dec 20 07:59:55 2013 (r336979, copy of r336943, head/games/rtb/files/patch-team-framework__io__unixinstreambuf.cpp) @@ -0,0 +1,11 @@ +--- team-framework/io/unixinstreambuf.cpp.orig ++++ team-framework/io/unixinstreambuf.cpp +@@ -33,6 +33,8 @@ + #include "../exceptions/confignotloadedexception.h" + #include + #include ++#include ++#include + + /** + * Namespace Copied: branches/2014Q1/games/rtb/files/patch-team-framework__io__unixoutstreambuf.cpp (from r336943, head/games/rtb/files/patch-team-framework__io__unixoutstreambuf.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/rtb/files/patch-team-framework__io__unixoutstreambuf.cpp Fri Dec 20 07:59:55 2013 (r336979, copy of r336943, head/games/rtb/files/patch-team-framework__io__unixoutstreambuf.cpp) @@ -0,0 +1,11 @@ +--- team-framework/io/unixoutstreambuf.cpp.orig ++++ team-framework/io/unixoutstreambuf.cpp +@@ -30,6 +30,8 @@ + #include "unixoutstreambuf.h" + #include + #include ++#include ++#include + /** + * Namespace + */ Copied: branches/2014Q1/games/rtb/files/patch-team-framework__io__unixremoteclientconnection.cpp (from r336943, head/games/rtb/files/patch-team-framework__io__unixremoteclientconnection.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/rtb/files/patch-team-framework__io__unixremoteclientconnection.cpp Fri Dec 20 07:59:55 2013 (r336979, copy of r336943, head/games/rtb/files/patch-team-framework__io__unixremoteclientconnection.cpp) @@ -0,0 +1,10 @@ +--- team-framework/io/unixremoteclientconnection.cpp.orig ++++ team-framework/io/unixremoteclientconnection.cpp +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + /** + * Namespace Copied: branches/2014Q1/games/rtb/files/patch-team-framework__io__unixrtbconnection.cpp (from r336943, head/games/rtb/files/patch-team-framework__io__unixrtbconnection.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/rtb/files/patch-team-framework__io__unixrtbconnection.cpp Fri Dec 20 07:59:55 2013 (r336979, copy of r336943, head/games/rtb/files/patch-team-framework__io__unixrtbconnection.cpp) @@ -0,0 +1,11 @@ +--- team-framework/io/unixrtbconnection.cpp.orig ++++ team-framework/io/unixrtbconnection.cpp +@@ -33,6 +33,8 @@ + #include + #include + #include ++#include ++#include + + /** + * Namespace Copied: branches/2014Q1/games/rtb/files/patch-team-framework__io__unixservercommunicator.cpp (from r336943, head/games/rtb/files/patch-team-framework__io__unixservercommunicator.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/rtb/files/patch-team-framework__io__unixservercommunicator.cpp Fri Dec 20 07:59:55 2013 (r336979, copy of r336943, head/games/rtb/files/patch-team-framework__io__unixservercommunicator.cpp) @@ -0,0 +1,10 @@ +--- team-framework/io/unixservercommunicator.cpp.orig ++++ team-framework/io/unixservercommunicator.cpp +@@ -50,6 +50,7 @@ + #include + #include + #include ++#include + + /** + * Namespace Copied: branches/2014Q1/games/rtb/files/patch-team-framework__io__unixserverconnection.cpp (from r336943, head/games/rtb/files/patch-team-framework__io__unixserverconnection.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/rtb/files/patch-team-framework__io__unixserverconnection.cpp Fri Dec 20 07:59:55 2013 (r336979, copy of r336943, head/games/rtb/files/patch-team-framework__io__unixserverconnection.cpp) @@ -0,0 +1,12 @@ +--- team-framework/io/unixserverconnection.cpp.orig ++++ team-framework/io/unixserverconnection.cpp +@@ -41,6 +41,9 @@ + //IPC + #include + ++#include ++#include ++ + /** + * Namespace + */ Copied: branches/2014Q1/games/rtb/files/patch-team-framework__stdnamespace.h (from r336943, head/games/rtb/files/patch-team-framework__stdnamespace.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/rtb/files/patch-team-framework__stdnamespace.h Fri Dec 20 07:59:55 2013 (r336979, copy of r336943, head/games/rtb/files/patch-team-framework__stdnamespace.h) @@ -0,0 +1,16 @@ +--- team-framework/stdnamespace.h.orig ++++ team-framework/stdnamespace.h +@@ -25,9 +25,13 @@ + + **************************************************************************/ + ++#if !defined(_LIBCPP_VERSION) + #include // This file contains the forward declaration in particular of std::string + + namespace std + { + template class auto_ptr; // Origin: The header file + } ++#else ++#include ++#endif Modified: branches/2014Q1/games/rtb/pkg-plist ============================================================================== --- branches/2014Q1/games/rtb/pkg-plist Fri Dec 20 07:59:09 2013 (r336978) +++ branches/2014Q1/games/rtb/pkg-plist Fri Dec 20 07:59:55 2013 (r336979) @@ -1,5 +1,6 @@ bin/realtimebattle include/RealTimeBattle/Messagetypes.h +info/RealTimeBattle.info lib/RealTimeBattle/Arenas/Circle.arena lib/RealTimeBattle/Arenas/Circles.arena lib/RealTimeBattle/Arenas/Cross.arena @@ -121,9 +122,38 @@ lib/RealTimeBattle/rtb_logo.jpg lib/RealTimeBattle/rtblogo1024.jpg lib/RealTimeBattle/rtblogo1600.jpg lib/RealTimeBattle/tournament.txt +%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/EXTRAROBOTS.README +%%PORTDOCS%%%%DOCSDIR%%/French/RealTimeBattle-1.html +%%PORTDOCS%%%%DOCSDIR%%/French/RealTimeBattle-2.html +%%PORTDOCS%%%%DOCSDIR%%/French/RealTimeBattle-3.html +%%PORTDOCS%%%%DOCSDIR%%/French/RealTimeBattle-4.html +%%PORTDOCS%%%%DOCSDIR%%/French/RealTimeBattle-5.html +%%PORTDOCS%%%%DOCSDIR%%/French/RealTimeBattle-6.html +%%PORTDOCS%%%%DOCSDIR%%/French/RealTimeBattle.html +%%PORTDOCS%%%%DOCSDIR%%/French/next.gif +%%PORTDOCS%%%%DOCSDIR%%/French/prev.gif +%%PORTDOCS%%%%DOCSDIR%%/French/toc.gif +%%PORTDOCS%%%%DOCSDIR%%/German/RealTimeBattle-1.html +%%PORTDOCS%%%%DOCSDIR%%/German/RealTimeBattle-2.html +%%PORTDOCS%%%%DOCSDIR%%/German/RealTimeBattle-3.html +%%PORTDOCS%%%%DOCSDIR%%/German/RealTimeBattle-4.html +%%PORTDOCS%%%%DOCSDIR%%/German/RealTimeBattle-5.html +%%PORTDOCS%%%%DOCSDIR%%/German/RealTimeBattle-6.html +%%PORTDOCS%%%%DOCSDIR%%/German/RealTimeBattle.dvi +%%PORTDOCS%%%%DOCSDIR%%/German/RealTimeBattle.html +%%PORTDOCS%%%%DOCSDIR%%/German/RealTimeBattle.info +%%PORTDOCS%%%%DOCSDIR%%/German/RealTimeBattle.sgml +%%PORTDOCS%%%%DOCSDIR%%/German/RealTimeBattle.txt +%%PORTDOCS%%%%DOCSDIR%%/German/next.gif +%%PORTDOCS%%%%DOCSDIR%%/German/next.png +%%PORTDOCS%%%%DOCSDIR%%/German/prev.gif +%%PORTDOCS%%%%DOCSDIR%%/German/prev.png +%%PORTDOCS%%%%DOCSDIR%%/German/toc.gif +%%PORTDOCS%%%%DOCSDIR%%/German/toc.png +%%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/RTB-Team-Framework-Tutorial.tar.gz @@ -137,6 +167,16 @@ lib/RealTimeBattle/tournament.txt %%PORTDOCS%%%%DOCSDIR%%/RealTimeBattle.html %%PORTDOCS%%%%DOCSDIR%%/RealTimeBattle.sgml %%PORTDOCS%%%%DOCSDIR%%/RealTimeBattle.txt +%%PORTDOCS%%%%DOCSDIR%%/Spanish/next.gif +%%PORTDOCS%%%%DOCSDIR%%/Spanish/prev.gif +%%PORTDOCS%%%%DOCSDIR%%/Spanish/rtb-docs-1.0.5-es-1.html +%%PORTDOCS%%%%DOCSDIR%%/Spanish/rtb-docs-1.0.5-es-2.html +%%PORTDOCS%%%%DOCSDIR%%/Spanish/rtb-docs-1.0.5-es-3.html +%%PORTDOCS%%%%DOCSDIR%%/Spanish/rtb-docs-1.0.5-es-4.html +%%PORTDOCS%%%%DOCSDIR%%/Spanish/rtb-docs-1.0.5-es-5.html +%%PORTDOCS%%%%DOCSDIR%%/Spanish/rtb-docs-1.0.5-es-6.html +%%PORTDOCS%%%%DOCSDIR%%/Spanish/rtb-docs-1.0.5-es.html +%%PORTDOCS%%%%DOCSDIR%%/Spanish/toc.gif %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/next.gif %%PORTDOCS%%%%DOCSDIR%%/next.png @@ -153,10 +193,13 @@ share/locale/ja/LC_MESSAGES/RealTimeBatt share/locale/pl/LC_MESSAGES/RealTimeBattle.mo share/locale/pt/LC_MESSAGES/RealTimeBattle.mo share/locale/sv/LC_MESSAGES/RealTimeBattle.mo -@dirrmtry share/locale/en@boldquot/LC_MESSAGES -@dirrmtry share/locale/en@boldquot @dirrmtry share/locale/en@quot/LC_MESSAGES @dirrmtry share/locale/en@quot +@dirrmtry share/locale/en@boldquot/LC_MESSAGES +@dirrmtry share/locale/en@boldquot +%%PORTDOCS%%@dirrm %%DOCSDIR%%/Spanish +%%PORTDOCS%%@dirrm %%DOCSDIR%%/German +%%PORTDOCS%%@dirrm %%DOCSDIR%%/French %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/RealTimeBattle/Robots/xt-bot @dirrm lib/RealTimeBattle/Robots/thomas2 From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 08:00:47 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 022E9498; Fri, 20 Dec 2013 08:00:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D704318AE; Fri, 20 Dec 2013 08:00:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK80kci045024; Fri, 20 Dec 2013 08:00:46 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK80kFn045022; Fri, 20 Dec 2013 08:00:46 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312200800.rBK80kFn045022@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 20 Dec 2013 08:00:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336980 - in branches/2014Q1/audio/mcplay: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 08:00:47 -0000 Author: bapt Date: Fri Dec 20 08:00:46 2013 New Revision: 336980 URL: http://svnweb.freebsd.org/changeset/ports/336980 Log: MFH: r336946 - Support CC/CFLAGS properly - Update MASTER_SITES - Support ncurses - Convert to staging PR: ports/184826 Submitted by: KATO Tsuguru Modified: branches/2014Q1/audio/mcplay/Makefile (contents, props changed) branches/2014Q1/audio/mcplay/files/patch-Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/mcplay/Makefile ============================================================================== --- branches/2014Q1/audio/mcplay/Makefile Fri Dec 20 07:59:55 2013 (r336979) +++ branches/2014Q1/audio/mcplay/Makefile Fri Dec 20 08:00:46 2013 (r336980) @@ -4,21 +4,29 @@ PORTNAME= mcplay DISTVERSION= 0.3i CATEGORIES= audio -MASTER_SITES= http://www.yahuxo.de/${PORTNAME}/ +MASTER_SITES= http://www.yahuxo.de/${PORTNAME}/ \ + http://www.sourcefiles.org/Multimedia/MP3/Front_End/ MAINTAINER= ports@FreeBSD.org COMMENT= Curses based front-end to various audio players LICENSE= GPLv2 +USES= ncurses USE_GNOME= glib12 -NO_STAGE= yes -MAN1= ${PORTNAME}.1 -PLIST_FILES= bin/${PORTNAME} +PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz + +post-patch: +.for i in mcplay.c screen.c + @${REINPLACE_CMD} -e \ + 's|||' ${WRKSRC}/${i} +.endfor do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1 + (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \ + ${STAGEDIR}${PREFIX}/bin) + (cd ${FILESDIR} && ${INSTALL_MAN} ${PORTNAME}.1 \ + ${STAGEDIR}${MAN1PREFIX}/man/man1) .include Modified: branches/2014Q1/audio/mcplay/files/patch-Makefile ============================================================================== --- branches/2014Q1/audio/mcplay/files/patch-Makefile Fri Dec 20 07:59:55 2013 (r336979) +++ branches/2014Q1/audio/mcplay/files/patch-Makefile Fri Dec 20 08:00:46 2013 (r336980) @@ -18,3 +18,30 @@ BINDIR=$(INSTDIR)/bin ##################################################################### +@@ -33,7 +33,7 @@ + PROGNAME=mcplay + VERSION=0.3i + DISTDIR=$(PROGNAME)-$(VERSION) +-CC=gcc ++CC?=gcc + TARGET=mcplay + OBJECTS=mcplay.o \ + screen.o \ +@@ -48,7 +48,7 @@ + + DATA=Makefile COPYING + +-MY_CFLAGS=-Wall -g -I. -DPROGNAME_S=\"$(PROGNAME)\" -DVERSION_S=\"$(VERSION)\" $(LOG_CFLAGS) ++MY_CFLAGS=-Wall -I. -DPROGNAME_S=\"$(PROGNAME)\" -DVERSION_S=\"$(VERSION)\" $(LOG_CFLAGS) + MY_LFLAGS= + + PLAYER_CFLAGS=$(MPG_CFLAGS) $(OGG_CFLAGS) $(SOX_CFLAGS) $(MID_CFLAGS) +@@ -60,7 +60,7 @@ + NCURSES_CFLAGS= + NCURSES_LFLAGS=-lncurses + +-CFLAGS=$(MY_CFLAGS) $(PLAYER_CFLAGS) $(GLIB_CFLAGS) $(NCURSES_CFLAGS) $(LIRC_CFLAGS) ++CFLAGS+=$(MY_CFLAGS) $(PLAYER_CFLAGS) $(GLIB_CFLAGS) $(NCURSES_CFLAGS) $(LIRC_CFLAGS) + LFLAGS=$(MY_LFLAGS) $(PLAYER_LFLAGS) $(GLIB_LFLAGS) $(NCURSES_LFLAGS) $(LIRC_LFLAGS) + + all: $(TARGET) From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 08:01:46 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2C29C57E; Fri, 20 Dec 2013 08:01:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F1D8018B8; Fri, 20 Dec 2013 08:01:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK81jsJ046841; Fri, 20 Dec 2013 08:01:45 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK81jee046840; Fri, 20 Dec 2013 08:01:45 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312200801.rBK81jee046840@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 20 Dec 2013 08:01:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336981 - in branches/2014Q1/x11/xorg-edit: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 08:01:46 -0000 Author: bapt Date: Fri Dec 20 08:01:45 2013 New Revision: 336981 URL: http://svnweb.freebsd.org/changeset/ports/336981 Log: MFH: r336948 - Fix build with clang - Support staging PR: ports/184828 Submitted by: KATO Tsuguru Added: branches/2014Q1/x11/xorg-edit/files/ - copied from r336948, head/x11/xorg-edit/files/ Modified: branches/2014Q1/x11/xorg-edit/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/x11/xorg-edit/Makefile ============================================================================== --- branches/2014Q1/x11/xorg-edit/Makefile Fri Dec 20 08:00:46 2013 (r336980) +++ branches/2014Q1/x11/xorg-edit/Makefile Fri Dec 20 08:01:45 2013 (r336981) @@ -15,10 +15,10 @@ LICENSE= GPLv3 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_BZIP2= yes +USES= dos2unix gmake DOS2UNIX_GLOB= *.cpp *.h USE_WX= 2.6+ WX_UNICODE= yes -USES= dos2unix gmake PLIST_FILES= bin/xorg-edit \ lib/xorg-edit/de_DE/LC_MESSAGES/xorg-edit.mo \ @@ -34,7 +34,6 @@ PLIST_DIRS= lib/xorg-edit/options/device DESKTOP_ENTRIES="Xorg Edit" "" "" "${PORTNAME}" "Settings;" true -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e \ 's|^CXX =|CXX ?=| ; \ @@ -58,15 +57,15 @@ do-configure: @${ECHO_CMD} ' $$(MAKE) -C xorgedit' >> ${WRKSRC}/Makefile do-install: - (cd ${WRKDIR} && ${INSTALL_SCRIPT} xorg-edit ${PREFIX}/bin) - @${MKDIR} ${PREFIX}/lib/xorg-edit + (cd ${WRKDIR} && ${INSTALL_SCRIPT} xorg-edit ${STAGEDIR}${PREFIX}/bin) + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg-edit (cd ${WRKSRC} && ${INSTALL_PROGRAM} xorg-edit \ - ${PREFIX}/lib/xorg-edit) - @${MKDIR} ${PREFIX}/lib/xorg-edit/de_DE/LC_MESSAGES + ${STAGEDIR}${PREFIX}/lib/xorg-edit) + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg-edit/de_DE/LC_MESSAGES (cd ${WRKSRC}/de_DE/LC_MESSAGES && ${INSTALL_DATA} ${PORTNAME}.mo \ - ${PREFIX}/lib/xorg-edit/de_DE/LC_MESSAGES) - @${MKDIR} ${PREFIX}/lib/xorg-edit/options/devices + ${STAGEDIR}${PREFIX}/lib/xorg-edit/de_DE/LC_MESSAGES) + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg-edit/options/devices (cd ${WRKSRC}/options/devices && ${INSTALL_DATA} *.xml \ - ${PREFIX}/lib/xorg-edit/options/devices) + ${STAGEDIR}${PREFIX}/lib/xorg-edit/options/devices) .include From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 08:02:32 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 119C367F; Fri, 20 Dec 2013 08:02:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E64B918CB; Fri, 20 Dec 2013 08:02:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK82VV7047082; Fri, 20 Dec 2013 08:02:31 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK82VUV047080; Fri, 20 Dec 2013 08:02:31 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312200802.rBK82VUV047080@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 20 Dec 2013 08:02:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336982 - in branches/2014Q1/audio/alienwah: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 08:02:32 -0000 Author: bapt Date: Fri Dec 20 08:02:31 2013 New Revision: 336982 URL: http://svnweb.freebsd.org/changeset/ports/336982 Log: MFH: r336949 - Fix build on -current - Add LICENSE PR: ports/184829 Submitted by: KATO Tsuguru Modified: branches/2014Q1/audio/alienwah/Makefile (contents, props changed) branches/2014Q1/audio/alienwah/files/patch-aw.cpp (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/alienwah/Makefile ============================================================================== --- branches/2014Q1/audio/alienwah/Makefile Fri Dec 20 08:01:45 2013 (r336981) +++ branches/2014Q1/audio/alienwah/Makefile Fri Dec 20 08:02:31 2013 (r336982) @@ -8,15 +8,17 @@ CATEGORIES= audio MASTER_SITES= http://plugin.org.uk/releases/alienwah/ MAINTAINER= ports@FreeBSD.org -COMMENT= Paul Nasca's AlienWah LADSPA Plugin +COMMENT= Paul Nasca's AlienWah LADSPA plugin + +LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa USES= gmake MAKE_ARGS= CPP="${CXX}" CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include -fPIC" -PLIST_DIRSTRY= lib/ladspa PLIST_FILES= lib/ladspa/aw.so +PLIST_DIRSTRY= lib/ladspa do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/ladspa Modified: branches/2014Q1/audio/alienwah/files/patch-aw.cpp ============================================================================== --- branches/2014Q1/audio/alienwah/files/patch-aw.cpp Fri Dec 20 08:01:45 2013 (r336981) +++ branches/2014Q1/audio/alienwah/files/patch-aw.cpp Fri Dec 20 08:02:31 2013 (r336982) @@ -1,5 +1,22 @@ ---- aw.cpp.orig Sat Jan 26 02:51:03 2002 -+++ aw.cpp Sat May 26 22:33:51 2007 +--- aw.cpp.orig 2002-01-26 02:51:03.000000000 +0900 ++++ aw.cpp 2013-12-04 04:50:18.000000000 +0900 +@@ -62,11 +62,11 @@ + + /*****************************************************************************/ + +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + + /*****************************************************************************/ + @@ -85,6 +85,8 @@ #define AW_INPUT2 6 #define AW_OUTPUT2 7 @@ -9,8 +26,29 @@ /*****************************************************************************/ /* Make number of samples represented by 'delay' proportional to * the sample rate, such that delay=1 is 1 sample buffer at -@@ -139,21 +141,57 @@ - c2(float_complex(0,0)) { +@@ -118,10 +120,10 @@ + unsigned long t2; //?? + unsigned long k; // index for delaybuf + unsigned long k2; // index for delaybuf2 +-float_complex * delaybuf; +-float_complex * delaybuf2; +-float_complex c; //?? +-float_complex c2; //?? ++std::complex * delaybuf; ++std::complex * delaybuf2; ++std::complex c; //?? ++std::complex c2; //?? + float freq; + float startphase; + float feedback; +@@ -135,25 +137,61 @@ + samplerate(lSampleRate), + t(0), t2(0), + k(0), k2(0), +- c(float_complex(0,0)), +- c2(float_complex(0,0)) { ++ c(std::complex(0,0)), ++ c2(std::complex(0,0)) { } +friend LADSPA_Handle instantiateAW(const LADSPA_Descriptor *, @@ -40,12 +78,12 @@ +printf("delay %d\n", delay); + if (delay < 1) delay = 1; + if (delay > MAX_DELAY) delay = MAX_DELAY; -+ delaybuf = new float_complex[delay]; ++ delaybuf = new std::complex[delay]; + if (chans == 2) { -+ delaybuf2 = new float_complex[MAX_DELAY+1]; ++ delaybuf2 = new std::complex[MAX_DELAY+1]; + } + for (unsigned int i =0; i(0,0); + } +} @@ -73,7 +111,7 @@ switch (port) { case AW_FREQ: ((AW *)instance)->lfreq = *datalocation; -@@ -182,38 +220,16 @@ +@@ -182,41 +220,19 @@ * connect_port may be called before of after here, so we * cannot rely upon port data for initialization */ @@ -115,8 +153,21 @@ +{ AW * me = (AW *)instance; float lfo; - float_complex outc; -@@ -238,7 +254,8 @@ +- float_complex outc; ++ std::complex outc; + float lfoskip = me->freq * 2 * PI / me->samplerate; + + if (! me->inited) me->initState(1); +@@ -224,7 +240,7 @@ + for(unsigned int i=0; it++ % LFO_SKIPSAMPLES) == 0) { + lfo = 1 + cos(me->t * lfoskip + me->startphase); +- me->c = float_complex(cos(lfo) * me->feedback, ++ me->c = std::complex(cos(lfo) * me->feedback, + sin(lfo) * me->feedback); + } + outc = me->c * me->delaybuf[me->k] + (1 - me->feedback) * +@@ -238,10 +254,11 @@ /* * Stereo effect? */ @@ -125,7 +176,29 @@ +{ AW * me = (AW *)instance; float lfo; - float_complex outc; +- float_complex outc; ++ std::complex outc; + float lfoskip = me->freq * 2 * PI / me->samplerate; + + if (! me->inited) me->initState(2); +@@ -249,7 +266,7 @@ + for(unsigned int i=0; it++ % LFO_SKIPSAMPLES) == 0) { + lfo = 1 + cos(me->t * lfoskip + me->startphase); +- me->c = float_complex(cos(lfo) * me->feedback, ++ me->c = std::complex(cos(lfo) * me->feedback, + sin(lfo) * me->feedback); + } + outc = me->c * me->delaybuf[me->k] + (1 - me->feedback) * +@@ -262,7 +279,7 @@ + for(unsigned int i=0; it2++ % LFO_SKIPSAMPLES) == 0) { + lfo = 1 + cos(me->t2 * lfoskip); +- me->c2 = float_complex(cos(lfo) * me->feedback, ++ me->c2 = std::complex(cos(lfo) * me->feedback, + sin(lfo) * me->feedback); + } + outc = me->c2 * me->delaybuf2[me->k2] + (1 - me->feedback) * @@ -273,13 +290,11 @@ } } From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 08:03:19 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3BEC277C; Fri, 20 Dec 2013 08:03:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0E24218D6; Fri, 20 Dec 2013 08:03:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK83IIx047321; Fri, 20 Dec 2013 08:03:18 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK83Ilw047320; Fri, 20 Dec 2013 08:03:18 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312200803.rBK83Ilw047320@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 20 Dec 2013 08:03:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336983 - in branches/2014Q1/security/fl0p: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 08:03:19 -0000 Author: bapt Date: Fri Dec 20 08:03:18 2013 New Revision: 336983 URL: http://svnweb.freebsd.org/changeset/ports/336983 Log: MFH: r336951 - Support CC/CFLAGS properly - Add LICENSE - Switch to PLIST_FILES - Support staging PR: ports/184830 Submitted by: KATO Tsuguru Deleted: branches/2014Q1/security/fl0p/files/ branches/2014Q1/security/fl0p/pkg-plist Modified: branches/2014Q1/security/fl0p/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/fl0p/Makefile ============================================================================== --- branches/2014Q1/security/fl0p/Makefile Fri Dec 20 08:02:31 2013 (r336982) +++ branches/2014Q1/security/fl0p/Makefile Fri Dec 20 08:03:18 2013 (r336983) @@ -11,22 +11,33 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Passive L7 flow fingerprinting tool -WRKSRC= ${WRKDIR}/fl0p/ +LICENSE= LGPL21 + +WRKSRC= ${WRKDIR}/${PORTNAME} + +PORTDOCS= ChangeLog CREDITS README TODO +PLIST_FILES= bin/fl0p %%DATADIR%%/fl0p.fp +PLIST_DIRS= %%DATADIR%% -NO_STAGE= yes post-patch: - ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/config.h + @${REINPLACE_CMD} -e \ + 's|"/etc/fl0p"|"${DATADIR}"|' ${WRKSRC}/config.h + @${REINPLACE_CMD} -e \ + 's|^GMAKE_OK|#GMAKE_OK|' ${WRKSRC}/Build + @${REINPLACE_CMD} -e \ + '/^CC/s|\([[:blank:]]\)=|\1?=| ; \ + /^CFLAGS/s|\([[:blank:]]\)=|\1+=| ; \ + s|-g -ggdb|| ; \ + s|-I.*|$$(CPPFLAGS)| ; \ + /^all:/s|strip||' ${WRKSRC}/mk/Linux do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/fl0p ${PREFIX}/bin - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/fl0p.fp ${DATADIR}/ -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/doc/README ${DOCSDIR}/ - ${INSTALL_MAN} ${WRKSRC}/doc/ChangeLog ${DOCSDIR}/ - ${INSTALL_MAN} ${WRKSRC}/doc/TODO ${DOCSDIR}/ - ${INSTALL_MAN} ${WRKSRC}/doc/CREDITS ${DOCSDIR}/ -.endif + (cd ${WRKSRC} && ${INSTALL_PROGRAM} fl0p ${STAGEDIR}${PREFIX}/bin) + @${MKDIR} ${STAGEDIR}${DATADIR} + (cd ${WRKSRC} && ${INSTALL_DATA} fl0p.fp ${STAGEDIR}${DATADIR}) + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for i in ${PORTDOCS} + (cd ${WRKSRC}/doc && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) +.endfor .include From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 08:04:03 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 85161887; Fri, 20 Dec 2013 08:04:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 71ACB18E3; Fri, 20 Dec 2013 08:04:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK843RU047528; Fri, 20 Dec 2013 08:04:03 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK843Hn047527; Fri, 20 Dec 2013 08:04:03 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312200804.rBK843Hn047527@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 20 Dec 2013 08:04:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336984 - branches/2014Q1/databases/libgda4 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 08:04:03 -0000 Author: bapt Date: Fri Dec 20 08:04:02 2013 New Revision: 336984 URL: http://svnweb.freebsd.org/changeset/ports/336984 Log: MFH: r336952 Fix LIB_DEPENDS Modified: branches/2014Q1/databases/libgda4/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/databases/libgda4/Makefile ============================================================================== --- branches/2014Q1/databases/libgda4/Makefile Fri Dec 20 08:03:18 2013 (r336983) +++ branches/2014Q1/databases/libgda4/Makefile Fri Dec 20 08:04:02 2013 (r336984) @@ -21,7 +21,7 @@ LIBGDA4_SLAVE?= no .if !defined(REFERENCE_PORT) LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ - libjson-glib-1.so:${PORTSDIR}/devel/json-glib + libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib USE_AUTOTOOLS= libtool USES= pathfix gettext gmake pkgconfig From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 08:04:50 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E5A71964; Fri, 20 Dec 2013 08:04:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D21FF18EA; Fri, 20 Dec 2013 08:04:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK84oMn047747; Fri, 20 Dec 2013 08:04:50 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK84obw047745; Fri, 20 Dec 2013 08:04:50 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312200804.rBK84obw047745@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 20 Dec 2013 08:04:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336985 - branches/2014Q1/audio/epos-devel X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 08:04:51 -0000 Author: bapt Date: Fri Dec 20 08:04:50 2013 New Revision: 336985 URL: http://svnweb.freebsd.org/changeset/ports/336985 Log: MFH: r336953 - Fix build with clang - Port supports staging PR: ports/184831 Submitted by: KATO Tsuguru Modified: branches/2014Q1/audio/epos-devel/Makefile branches/2014Q1/audio/epos-devel/pkg-descr (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/epos-devel/Makefile ============================================================================== --- branches/2014Q1/audio/epos-devel/Makefile Fri Dec 20 08:04:02 2013 (r336984) +++ branches/2014Q1/audio/epos-devel/Makefile Fri Dec 20 08:04:50 2013 (r336985) @@ -13,7 +13,6 @@ LICENSE= GPLv2 LGPL20 LICENSE_COMB= multi USES= bison gmake -NO_STAGE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_lib_stdcpp_main=no @@ -21,5 +20,7 @@ post-patch: @${REINPLACE_CMD} -e 's/^\(SUBDIRS =.*\)doc/\1/' ${WRKSRC}/Makefile.in @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|-ggdb||' + @${REINPLACE_CMD} -e 's|||' \ + ${WRKSRC}/src/nnet/neural.cc .include Modified: branches/2014Q1/audio/epos-devel/pkg-descr ============================================================================== --- branches/2014Q1/audio/epos-devel/pkg-descr Fri Dec 20 08:04:02 2013 (r336984) +++ branches/2014Q1/audio/epos-devel/pkg-descr Fri Dec 20 08:04:50 2013 (r336985) @@ -1,5 +1,3 @@ -From the Epos homepage: - Epos is a language independent rule-driven Text-to-Speech (TTS) system primarily designed to serve as a research tool. Epos is (or tries to be) independent of the language processed, linguistic description method, From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 08:06:29 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3AE2DA6A; Fri, 20 Dec 2013 08:06:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0CBB018FE; Fri, 20 Dec 2013 08:06:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK86S3R048149; Fri, 20 Dec 2013 08:06:28 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK86SmY048146; Fri, 20 Dec 2013 08:06:28 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312200806.rBK86SmY048146@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 20 Dec 2013 08:06:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336986 - in branches/2014Q1/graphics/gimmage: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 08:06:29 -0000 Author: bapt Date: Fri Dec 20 08:06:28 2013 New Revision: 336986 URL: http://svnweb.freebsd.org/changeset/ports/336986 Log: MFH: r336955 - Fix build with clang - Support desktop-file-utils - Port supports staging PR: ports/184832 Submitted by: KATO Tsuguru Modified: branches/2014Q1/graphics/gimmage/Makefile branches/2014Q1/graphics/gimmage/files/patch-src__FileManager.cpp (contents, props changed) branches/2014Q1/graphics/gimmage/pkg-descr (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/gimmage/Makefile ============================================================================== --- branches/2014Q1/graphics/gimmage/Makefile Fri Dec 20 08:04:50 2013 (r336985) +++ branches/2014Q1/graphics/gimmage/Makefile Fri Dec 20 08:06:28 2013 (r336986) @@ -3,19 +3,18 @@ PORTNAME= gimmage PORTVERSION= 0.2.3 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= BERLIOS CENKES MAINTAINER= ports@FreeBSD.org COMMENT= Simple image viewer -LIB_DEPENDS= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \ - libcurl.so:${PORTSDIR}/ftp/curl +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl -USES= gettext pkgconfig +USES= desktop-file-utils gettext pkgconfig +USE_GNOME= gtkmm24 GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-libintl-prefix=${LOCALBASE} +CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE} -NO_STAGE= yes .include Modified: branches/2014Q1/graphics/gimmage/files/patch-src__FileManager.cpp ============================================================================== --- branches/2014Q1/graphics/gimmage/files/patch-src__FileManager.cpp Fri Dec 20 08:04:50 2013 (r336985) +++ branches/2014Q1/graphics/gimmage/files/patch-src__FileManager.cpp Fri Dec 20 08:06:28 2013 (r336986) @@ -1,6 +1,6 @@ --- ./src/FileManager.cpp.orig 2007-07-20 23:42:55.000000000 +0400 +++ ./src/FileManager.cpp 2007-07-20 23:43:03.000000000 +0400 -@@ -23,6 +23,7 @@ +@@ -23,12 +23,13 @@ #include "FileManager.h" #include "defines.h" @@ -8,3 +8,9 @@ #include "../config.h" + extern "C" { + #include +-// #include ++#include + #include + } Modified: branches/2014Q1/graphics/gimmage/pkg-descr ============================================================================== --- branches/2014Q1/graphics/gimmage/pkg-descr Fri Dec 20 08:04:50 2013 (r336985) +++ branches/2014Q1/graphics/gimmage/pkg-descr Fri Dec 20 08:06:28 2013 (r336986) @@ -6,5 +6,4 @@ has an in-application file browser that drag images and directories into the image viewing area in order to have them displayed. -Author: Bartek Kostrzewa WWW: http://gimmage.berlios.de/ From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 08:07:17 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CD9ABB6B; Fri, 20 Dec 2013 08:07:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BA2D4190B; Fri, 20 Dec 2013 08:07:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK87H1g048363; Fri, 20 Dec 2013 08:07:17 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK87H1G048362; Fri, 20 Dec 2013 08:07:17 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312200807.rBK87H1G048362@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 20 Dec 2013 08:07:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336987 - branches/2014Q1/net-im/pidgin-sipe X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 08:07:17 -0000 Author: bapt Date: Fri Dec 20 08:07:17 2013 New Revision: 336987 URL: http://svnweb.freebsd.org/changeset/ports/336987 Log: MFH: r336957 - Fix build on 10.0 and 11-CURRENT PR: ports/181196 Submitted by: myself Approved by: maintainer timeout (john.c.prather@gmail.com, >4 months) Modified: branches/2014Q1/net-im/pidgin-sipe/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net-im/pidgin-sipe/Makefile ============================================================================== --- branches/2014Q1/net-im/pidgin-sipe/Makefile Fri Dec 20 08:06:28 2013 (r336986) +++ branches/2014Q1/net-im/pidgin-sipe/Makefile Fri Dec 20 08:07:17 2013 (r336987) @@ -21,8 +21,8 @@ USE_GNOME= gtk20 USE_LDCONFIG= ${PREFIX}/lib/pidgin PORTDOCS= AUTHORS ChangeLog COPYING HACKING INSTALL NEWS README TODO VERSION -CFLAGS+= "-I/${LOCALBASE}/include" -LIBS+= "-L/${LOCALBASE}/lib" +CFLAGS+= -I/${LOCALBASE}/include +LIBS+= -L/${LOCALBASE}/lib -lgssapi_krb5 OPTIONS_DEFINE= OCS2005 KRB5 DOCS NLS OSC2005_DESC= Message timeout for OCS2005 From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 08:08:19 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A0699C5B; Fri, 20 Dec 2013 08:08:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8C7FF1914; Fri, 20 Dec 2013 08:08:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK88JSZ048615; Fri, 20 Dec 2013 08:08:19 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK88Jsh048614; Fri, 20 Dec 2013 08:08:19 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312200808.rBK88Jsh048614@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 20 Dec 2013 08:08:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336988 - branches/2014Q1/astro/xtide X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 08:08:19 -0000 Author: bapt Date: Fri Dec 20 08:08:19 2013 New Revision: 336988 URL: http://svnweb.freebsd.org/changeset/ports/336988 Log: MFH: r336959 Unbreak xtide, it still requires GCC Modified: branches/2014Q1/astro/xtide/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/astro/xtide/Makefile ============================================================================== --- branches/2014Q1/astro/xtide/Makefile Fri Dec 20 08:07:17 2013 (r336987) +++ branches/2014Q1/astro/xtide/Makefile Fri Dec 20 08:08:19 2013 (r336988) @@ -21,6 +21,7 @@ LIB_DEPENDS= libpng15.so:${PORTSDIR}/gra USE_BZIP2= yes USES= gmake GNU_CONFIGURE= yes +USE_GCC= yes CPPFLAGS+= -I../${TCD_DISTNAME} -I${LOCALBASE}/include/libpng15 -Wno-deprecated-declarations LDFLAGS+= -L../${TCD_DISTNAME}/.libs -L${LOCALBASE}/lib From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 08:10:01 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 970B4D69; Fri, 20 Dec 2013 08:10:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 69C8E1929; Fri, 20 Dec 2013 08:10:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK8A1Gh049004; Fri, 20 Dec 2013 08:10:01 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK8A1Eq048996; Fri, 20 Dec 2013 08:10:01 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312200810.rBK8A1Eq048996@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 20 Dec 2013 08:10:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336989 - branches/2014Q1/www/cssed X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 08:10:01 -0000 Author: bapt Date: Fri Dec 20 08:10:00 2013 New Revision: 336989 URL: http://svnweb.freebsd.org/changeset/ports/336989 Log: MFH: r336963 - Support CC/CXX properly - Remove leading article from COMMENT - Add desktop entry file - Allow staging PR: ports/184837 Submitted by: KATO Tsuguru Modified: branches/2014Q1/www/cssed/Makefile (contents, props changed) branches/2014Q1/www/cssed/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/cssed/Makefile ============================================================================== --- branches/2014Q1/www/cssed/Makefile Fri Dec 20 08:08:19 2013 (r336988) +++ branches/2014Q1/www/cssed/Makefile Fri Dec 20 08:10:00 2013 (r336989) @@ -3,31 +3,31 @@ PORTNAME= cssed PORTVERSION= 0.4.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= www MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org -COMMENT= An application to help CSS style sheets creation and maintenance +COMMENT= Application to help CSS style sheets creation and maintenance -USES= pathfix pkgconfig +USES= dos2unix pathfix pkgconfig +DOS2UNIX_FILES= scintilla/gtk/ScintillaGTK.cxx USE_GNOME= gtk20 libxml2 GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lgmodule-2.0 CONFIGURE_ARGS= --with-plugin-headers -MAN1= cssed.1 +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +DESKTOP_ENTRIES="CSSED" "CSS Editor" "${DATADIR}/pixmaps/cssed-icon.png" \ + "${PORTNAME}" "GTK;Development;WebDevelopment;TextEditor;" "" -NO_STAGE= yes post-patch: -.for file in scintilla/gtk/ScintillaGTK.cxx - @cd ${WRKSRC} && ${MV} ${file} ${file}.pre_tr \ - && ${TR} -d '\r' < ${file}.pre_tr > ${file} -.endfor -.for file in scintilla/gtk/Makefile.in src/Makefile.in + @${REINPLACE_CMD} -e \ + 's|gthread-2.0|gmodule-2.0|' ${WRKSRC}/configure +.for i in scintilla/gtk/Makefile.in src/Makefile.in @${REINPLACE_CMD} -e 's|gcc|@CC@|g ; \ - s|g++|@CXX@|g' ${WRKSRC}/src/Makefile.in + s|g++|@CXX@|g' ${WRKSRC}/${i} .endfor .include Modified: branches/2014Q1/www/cssed/pkg-plist ============================================================================== --- branches/2014Q1/www/cssed/pkg-plist Fri Dec 20 08:08:19 2013 (r336988) +++ branches/2014Q1/www/cssed/pkg-plist Fri Dec 20 08:10:00 2013 (r336989) @@ -1,5 +1,6 @@ bin/cssed libdata/pkgconfig/cssed.pc +man/man1/cssed.1.gz %%DATADIR%%/data/cssed-cfg.xml %%DATADIR%%/data/cssed-def.dtd %%DATADIR%%/data/cssed-def.xml From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 08:10:52 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AA351FB3; Fri, 20 Dec 2013 08:10:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8A7B719BC; Fri, 20 Dec 2013 08:10:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK8AqhE051627; Fri, 20 Dec 2013 08:10:52 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK8Apfl051621; Fri, 20 Dec 2013 08:10:51 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312200810.rBK8Apfl051621@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 20 Dec 2013 08:10:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336990 - in branches/2014Q1/net/wmnet2: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 08:10:52 -0000 Author: bapt Date: Fri Dec 20 08:10:51 2013 New Revision: 336990 URL: http://svnweb.freebsd.org/changeset/ports/336990 Log: MFH: r336964 - Fix build on -current - Update MASTER_SITES PR: ports/184839 Submitted by: KATO Tsuguru Added: branches/2014Q1/net/wmnet2/files/patch-Imakefile - copied unchanged from r336964, head/net/wmnet2/files/patch-Imakefile branches/2014Q1/net/wmnet2/files/patch-config.h - copied unchanged from r336964, head/net/wmnet2/files/patch-config.h Deleted: branches/2014Q1/net/wmnet2/files/patch-aa branches/2014Q1/net/wmnet2/files/patch-ab branches/2014Q1/net/wmnet2/files/patch-getopt.c Modified: branches/2014Q1/net/wmnet2/Makefile (contents, props changed) branches/2014Q1/net/wmnet2/files/patch-drivers.c (contents, props changed) branches/2014Q1/net/wmnet2/pkg-descr (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net/wmnet2/Makefile ============================================================================== --- branches/2014Q1/net/wmnet2/Makefile Fri Dec 20 08:10:00 2013 (r336989) +++ branches/2014Q1/net/wmnet2/Makefile Fri Dec 20 08:10:51 2013 (r336990) @@ -5,8 +5,8 @@ PORTNAME= wmnet2 PORTVERSION= 1.06 PORTREVISION= 5 CATEGORIES= net -MASTER_SITES= http://www.dockapps.org/files/77/115/ \ - http://www.katharineosborne.com/wmnet/ +MASTER_SITES= http://fossies.org/linux/misc/old/ \ + http://linux-bsd-unix.strefa.pl/ DISTNAME= wmnet-${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -15,8 +15,12 @@ COMMENT= Nice network monitor for Window USES= imake USE_XORG= x11 xext -MAN1= wmnet2.1 -PLIST_FILES= bin/wmnet2 +PLIST_FILES= bin/wmnet2 man/man1/wmnet2.1.gz + +post-extract: + @${LN} -sf wmnet.man ${WRKSRC}/wmnet2.man + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/wmnet2 -NO_STAGE= yes .include Copied: branches/2014Q1/net/wmnet2/files/patch-Imakefile (from r336964, head/net/wmnet2/files/patch-Imakefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net/wmnet2/files/patch-Imakefile Fri Dec 20 08:10:51 2013 (r336990, copy of r336964, head/net/wmnet2/files/patch-Imakefile) @@ -0,0 +1,34 @@ +--- Imakefile.orig ++++ Imakefile +@@ -1,5 +1,4 @@ + DEPLIBS = $(DEPXLIB) +-CC = gcc -Wall + + #ifdef LinuxArchitecture + STD_DEFINES = -Dlinux +@@ -10,14 +9,17 @@ + LOCAL_LIBRARIES = $(XLIB) -lm + #endif + +-#if defined (FreeBSDArchitecture) || defined (OpenBSDArchitecture) ++#if defined (OpenBSDArchitecture) + LOCAL_LIBRARIES = $(XLIB) -lm -lkvm + INSTPGMFLAGS = -s -g kmem -m 2755 ++#elif defined (FreeBSDArchitecture) ++LOCAL_LIBRARIES = $(XLIB) -lm ++INSTPGMFLAGS = -m 0755 + #endif + + LINTLIBS = $(LINTXLIB) + +-#if defined (FreeBSDArchitecture) || defined (OpenBSDArchitecture) ++#if defined (OpenBSDArchitecture) + SRCS = wmnet.c drivers.c getopt.c getopt1.c + OBJS = wmnet.o drivers.o getopt.o getopt1.o + #else +@@ -26,4 +28,4 @@ + #endif + + +-ComplexProgramTarget(wmnet) ++ComplexProgramTarget(wmnet2) Copied: branches/2014Q1/net/wmnet2/files/patch-config.h (from r336964, head/net/wmnet2/files/patch-config.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net/wmnet2/files/patch-config.h Fri Dec 20 08:10:51 2013 (r336990, copy of r336964, head/net/wmnet2/files/patch-config.h) @@ -0,0 +1,23 @@ +--- config.h.orig ++++ config.h +@@ -1,6 +1,6 @@ +-#if defined (__FreeBSD__) || defined (__OpenBSD__) ++#if defined (__OpenBSD__) + +-/* Our only FreeBSD driver, this goes straight into kernel memory ++/* Our only OpenBSD driver(old FreeBSD-4.x driver), this goes straight into kernel memory + * and reads the raw structures from right underneath the kernel using the + * kvm library. This made the code a require a little more thought, but + * the end result is a statistics driver thats faster than the linux ones +@@ -12,7 +12,11 @@ + + #endif + ++#if defined (__FreeBSD__) + ++#define USE_SYSCTL ++ ++#endif + + #ifdef linux + Modified: branches/2014Q1/net/wmnet2/files/patch-drivers.c ============================================================================== --- branches/2014Q1/net/wmnet2/files/patch-drivers.c Fri Dec 20 08:10:00 2013 (r336989) +++ branches/2014Q1/net/wmnet2/files/patch-drivers.c Fri Dec 20 08:10:51 2013 (r336990) @@ -1,15 +1,46 @@ --- drivers.c.orig Tue Apr 27 09:22:02 2004 +++ drivers.c Tue Apr 27 09:32:19 2004 -@@ -47,7 +47,7 @@ - #include +@@ -21,7 +21,7 @@ + #include"config.h" - int id = 0; /* interface id */ --int len = 0; /* sizeof libmibdata */ + +-/* For FreeBSD */ ++/* For OpenBSD */ + #ifdef USE_KVM + #include + #include +@@ -37,6 +37,22 @@ + int kvm_updateStats(void); + #endif /* USE_KVM */ + ++#ifdef USE_SYSCTL ++/* system headers */ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++int id = 0; /* interface id */ +size_t len = 0; /* sizeof libmibdata */ - struct ifmibdata *data = NULL; ++struct ifmibdata *data = NULL; ++ ++int sysctl_test(void); ++int sysctl_updateStats(void); ++#endif - int sysctl_test(void); -@@ -128,7 +128,7 @@ + #ifdef USE_LINUX_PPP + #include +@@ -104,12 +120,15 @@ + #ifdef USE_KVM + {"kmem",kvm_updateStats, kvm_test}, + #endif ++#ifdef USE_SYSCTL ++ {"sysctl",sysctl_updateStats, sysctl_test}, ++#endif + {NULL, NULL} + }; char* available_drivers(void) { int ind = 0; @@ -18,13 +49,119 @@ char *string, *ptr; while(drivers[ind].name != NULL) { len += strlen(drivers[ind].name) + 1; -@@ -464,7 +464,8 @@ +@@ -440,6 +459,115 @@ - int sysctl_test(void) { - struct ifmibdata tempndata; -- int numifaces, len2; + #endif /* linux */ + ++/* new FreeBSD driver */ ++#ifdef USE_SYSCTL ++ ++int sysctl_test(void) { ++ struct ifmibdata tempndata; + int numifaces; + size_t len2; - int mib[5], datamib[6]; - int i; - ++ int mib[5], datamib[6]; ++ int i; ++ ++ if(device == NULL) device = "lo0"; ++ ++ mib[0] = CTL_NET; ++ mib[1] = PF_LINK; ++ mib[2] = NETLINK_GENERIC; ++ mib[3] = IFMIB_SYSTEM; ++ mib[4] = IFMIB_IFCOUNT; ++ ++ datamib[0] = CTL_NET; ++ datamib[1] = PF_LINK; ++ datamib[2] = NETLINK_GENERIC; ++ datamib[3] = IFMIB_IFDATA; ++ datamib[4] = 1; ++ datamib[5] = IFDATA_GENERAL; ++ ++ len = sizeof(struct ifmibdata); ++ len2 = sizeof(numifaces); ++ ++ if(sysctl(mib, 5, &numifaces, &len2, NULL, 0) < 0) ++ { ++ fprintf( stderr, "wmnet: failed to perform sysctl" ); ++ return 0; ++ } ++ ++ for(i = 1; i <= numifaces; i++) ++ { ++ datamib[4] = i; ++ if(sysctl(datamib, 6, &tempndata, &len, NULL, 0) < 0) ++ { ++ fprintf( stderr, "wmnet: failed to get device(%d) data", i ); ++ break; ++ } ++ ++ if( strcmp( device, tempndata.ifmd_name ) == 0 ) ++ { ++ id = i; ++ break; ++ } ++ } ++ ++ if ( id == 0 ) { ++ fprintf( stderr, "%s doesn't seem to exist!\n", device ); ++ exit( -1 ); ++ } ++ ++ /* calculate and allocate mem for ifmibdata containing the if stats */ ++ data = malloc(len); ++ ++ fprintf(stderr, "wmnet: using sysctl driver to monitor %s\n", device); ++ return True; ++} ++ ++int sysctl_updateStats(void) { ++ int datamib[6]; ++ ++ datamib[0] = CTL_NET; ++ datamib[1] = PF_LINK; ++ datamib[2] = NETLINK_GENERIC; ++ datamib[3] = IFMIB_IFDATA; ++ datamib[4] = id; ++ datamib[5] = IFDATA_GENERAL; ++ ++ if(sysctl( datamib, 6, data, &len, NULL, 0) < 0 ) { ++ fprintf( stderr, "wmnet: can't monitor %s device\n", device ); ++ exit( -1 ); ++ } ++ ++ // printf( "if name: %s\n", data->ifmd_name ); ++ ++ /* get the stats from the if */ ++ totalpackets_in = data->ifmd_data.ifi_ipackets; ++ totalpackets_out = data->ifmd_data.ifi_opackets; ++ ++ if (totalpackets_in != lastpackets_in) { ++ totalbytes_in = data->ifmd_data.ifi_ibytes; ++ diffpackets_in += totalpackets_in - lastpackets_in; ++ diffbytes_in += totalbytes_in - lastbytes_in; ++ lastpackets_in = totalpackets_in; ++ lastbytes_in = totalbytes_in; ++ rx = True; ++ } else rx = False; ++ ++ if (totalpackets_out != lastpackets_out) { ++ totalbytes_out = data->ifmd_data.ifi_obytes; ++ diffpackets_out += totalpackets_out - lastpackets_out; ++ diffbytes_out += totalbytes_out - lastbytes_out; ++ lastpackets_out = totalpackets_out; ++ lastbytes_out = totalbytes_out; ++ tx = True; ++ } else tx = False; ++ ++ /* return True if no change to tx/rx ++ * return False if display will need to be updated ++ */ ++ return((rx == current_rx) && (tx == current_tx)); ++} ++ ++#endif ++ + #ifdef USE_KVM + int kvm_test(void) { + if (((kvmfd = kvm_open(NULL, NULL, NULL, O_RDONLY, buffer)) == NULL) || Modified: branches/2014Q1/net/wmnet2/pkg-descr ============================================================================== --- branches/2014Q1/net/wmnet2/pkg-descr Fri Dec 20 08:10:00 2013 (r336989) +++ branches/2014Q1/net/wmnet2/pkg-descr Fri Dec 20 08:10:51 2013 (r336990) @@ -1,11 +1,11 @@ -This little program polls network statistics and does a few things with the -data it gets. It has small blinking lights for the rx and tx of IP packets, -a digital speedometer of your polled stat's currentspeed and a bar graph like -xload et. al which has a tx speed graph from bottom-up and rx speed graph -from the top-down. The speedometer keeps track of the current speed per -second and shows it in a color corresponding to which of rx or tx that has -the highest speed at the moment. Also, the graph is drawn in a way that the -highest speed is drawn on top of the other while the other is in the -background. +This little program polls network statistics and does a few things with +the data it gets. It has small blinking lights for the rx and tx of IP +packets, a digital speedometer of your polled stat's current speed and a +bar graph like xload et. al which has a tx speed graph from bottom-up +and rx speed graph from the top-down. The speedometer keeps track of the +current speed per second and shows it in a color corresponding to which +of rx or tx that has the highest speed at the moment. Also, the graph is +drawn in a way that the highest speed is drawn on top of the other while +the other is in the background. -WWW: http://www.dockapps.org/file.php/id/77 +WWW: http://linux-bsd-unix.strefa.pl/ From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 08:11:39 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 476E812A; Fri, 20 Dec 2013 08:11:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 192C119CB; Fri, 20 Dec 2013 08:11:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK8BcTf051940; Fri, 20 Dec 2013 08:11:38 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK8BcX7051937; Fri, 20 Dec 2013 08:11:38 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312200811.rBK8BcX7051937@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 20 Dec 2013 08:11:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336991 - in branches/2014Q1/shells/fish: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 08:11:39 -0000 Author: bapt Date: Fri Dec 20 08:11:38 2013 New Revision: 336991 URL: http://svnweb.freebsd.org/changeset/ports/336991 Log: MFH: r336965 - Fix build on -current - Support staging PR: ports/184844 Submitted by: KATO Tsuguru Added: branches/2014Q1/shells/fish/files/ - copied from r336965, head/shells/fish/files/ Modified: branches/2014Q1/shells/fish/Makefile branches/2014Q1/shells/fish/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/shells/fish/Makefile ============================================================================== --- branches/2014Q1/shells/fish/Makefile Fri Dec 20 08:10:51 2013 (r336990) +++ branches/2014Q1/shells/fish/Makefile Fri Dec 20 08:11:38 2013 (r336991) @@ -11,30 +11,19 @@ MAINTAINER= ports@FreeBSD.org COMMENT= User friendly command line shell OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes WRKSRC= ${WRKDIR}/${PORTNAME} -USES= iconv -USE_GMAKE= yes +USES= gmake iconv USE_AUTOTOOLS= autoconf -CONFIGURE_ARGS= --docdir=${WRKDIR}/tmproot CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -pthread ${ICONV_LIB} -MAN1= fish.1 fish_indent.1 fish_pager.1 fishd.1 mimedb.1 - -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ENV+= ac_cv_func_gettext=yes -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--without-gettext -PLIST_SUB+= NLS="@comment " -.endif +NLS_USES= gettext +NLS_CONFIGURE_ENV= ac_cv_func_gettext=yes +NLS_CONFIGURE_OFF= --without-gettext post-patch: @${REINPLACE_CMD} -e \ @@ -49,17 +38,8 @@ post-patch: s|ncurses.h||' ${WRKSRC}/configure.ac post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @(cd ${WRKDIR}/tmproot && ${COPYTREE_SHARE} . ${DOCSDIR}) -.endif .for i in fish fish_indent fish_pager fishd mimedb - @${STRIP_CMD} ${PREFIX}/bin/${i} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i} .endfor - if ${GREP} -q '${PREFIX}/bin/${PORTNAME}' /etc/shells; then \ - ${TRUE}; \ - else \ - ${ECHO_CMD} '${PREFIX}/bin/${PORTNAME}' >> /etc/shells; \ - fi .include Modified: branches/2014Q1/shells/fish/pkg-plist ============================================================================== --- branches/2014Q1/shells/fish/pkg-plist Fri Dec 20 08:10:51 2013 (r336990) +++ branches/2014Q1/shells/fish/pkg-plist Fri Dec 20 08:11:38 2013 (r336991) @@ -4,6 +4,11 @@ bin/fish_pager bin/fishd bin/mimedb %%ETCDIR%%/config.fish +man/man1/fish.1.gz +man/man1/fish_indent.1.gz +man/man1/fish_pager.1.gz +man/man1/fishd.1.gz +man/man1/mimedb.1.gz %%PORTDOCS%%%%DOCSDIR%%/commands.html %%PORTDOCS%%%%DOCSDIR%%/design.html %%PORTDOCS%%%%DOCSDIR%%/doc_8h_source.html From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 08:12:26 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 46F5A210; Fri, 20 Dec 2013 08:12:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 18F6D19D7; Fri, 20 Dec 2013 08:12:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK8CP7d052237; Fri, 20 Dec 2013 08:12:25 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK8CPMa052236; Fri, 20 Dec 2013 08:12:25 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312200812.rBK8CPMa052236@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 20 Dec 2013 08:12:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336993 - branches/2014Q1/www/webstone-ssl X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 08:12:26 -0000 Author: bapt Date: Fri Dec 20 08:12:25 2013 New Revision: 336993 URL: http://svnweb.freebsd.org/changeset/ports/336993 Log: MFH: r336967 - Fix build with clang - Support staging PR: ports/184850 Submitted by: KATO Tsuguru Modified: branches/2014Q1/www/webstone-ssl/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/webstone-ssl/Makefile ============================================================================== --- branches/2014Q1/www/webstone-ssl/Makefile Fri Dec 20 08:12:23 2013 (r336992) +++ branches/2014Q1/www/webstone-ssl/Makefile Fri Dec 20 08:12:25 2013 (r336993) @@ -12,36 +12,34 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= World wide web server benchmarking with SSL support +WRKSRC= ${WRKDIR}/WebStone${PORTVERSION}/src + USE_OPENSSL= yes USE_AUTOTOOLS= autoconf213 -GNU_CONFIGURE= yes -WRKSRC= ${WRKDIR}/WebStone${PORTVERSION}/src ALL_TARGET= install -NO_INSTALL_MANPAGES= yes MAKE_JOBS_UNSAFE= yes -CONFIGURE_ENV= LIBS=-L${OPENSSLLIB} -CFLAGS+= -I${OPENSSLINC} +CPPFLAGS+= -I${OPENSSLINC} +LDFLAGS+= -L${OPENSSLLIB} + +pre-configure: + @${RM} -f ${WRKSRC}/config.cache -NO_STAGE= yes do-install: @${RMDIR} ${WRKSRC}/../bin/runs - @${MKDIR} ${PREFIX}/webstone-ssl/bin - @${MKDIR} ${PREFIX}/webstone-ssl/conf - @${MKDIR} ${PREFIX}/webstone-ssl/lgm - ${INSTALL_SCRIPT} ${WRKSRC}/../bin/* ${PREFIX}/webstone-ssl/bin - ${INSTALL_SCRIPT} ${WRKSRC}/../lgm/* ${PREFIX}/webstone-ssl/lgm - ${INSTALL_DATA} ${WRKSRC}/../conf/* ${PREFIX}/webstone-ssl/conf - ${INSTALL_SCRIPT} ${WRKSRC}/../webstone ${PREFIX}/webstone-ssl + @${MKDIR} ${STAGEDIR}${PREFIX}/webstone-ssl/bin + @${MKDIR} ${STAGEDIR}${PREFIX}/webstone-ssl/conf + @${MKDIR} ${STAGEDIR}${PREFIX}/webstone-ssl/lgm + ${INSTALL_SCRIPT} ${WRKSRC}/../bin/* ${STAGEDIR}${PREFIX}/webstone-ssl/bin + ${INSTALL_SCRIPT} ${WRKSRC}/../lgm/* ${STAGEDIR}${PREFIX}/webstone-ssl/lgm + ${INSTALL_DATA} ${WRKSRC}/../conf/* ${STAGEDIR}${PREFIX}/webstone-ssl/conf + ${INSTALL_SCRIPT} ${WRKSRC}/../webstone ${STAGEDIR}${PREFIX}/webstone-ssl @${MKDIR} ${WRKSRC}/../bin/runs -.for file in webclient webmaster genrand - ${STRIP_CMD} ${PREFIX}/webstone-ssl/bin/${file} +.for i in webclient webmaster genrand + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/webstone-ssl/bin/${i} .endfor -.for file in ws20_cgi ws25_cgi - ${STRIP_CMD} ${PREFIX}/webstone-ssl/lgm/${file} +.for i in ws20_cgi ws25_cgi + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/webstone-ssl/lgm/${i} .endfor -post-install: - @${CAT} ${PKGMESSAGE} - .include From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 11:10:05 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CBB54BC1; Fri, 20 Dec 2013 11:10:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AD8521842; Fri, 20 Dec 2013 11:10:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKBA5xu014512; Fri, 20 Dec 2013 11:10:05 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKBA5Xx014505; Fri, 20 Dec 2013 11:10:05 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312201110.rBKBA5Xx014505@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 20 Dec 2013 11:10:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336996 - in branches/2014Q1/games/shaaft: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 11:10:06 -0000 Author: mat Date: Fri Dec 20 11:10:04 2013 New Revision: 336996 URL: http://svnweb.freebsd.org/changeset/ports/336996 Log: MFH: r336995 - Fix build with clang - Add DESKTOP_ENTRIES PR: ports/184813 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/games/shaaft/files/patch-ResourceManager.cpp - copied unchanged from r336995, head/games/shaaft/files/patch-ResourceManager.cpp branches/2014Q1/games/shaaft/files/patch-Value.hpp - copied unchanged from r336995, head/games/shaaft/files/patch-Value.hpp Modified: branches/2014Q1/games/shaaft/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/shaaft/Makefile ============================================================================== --- branches/2014Q1/games/shaaft/Makefile Fri Dec 20 10:42:42 2013 (r336995) +++ branches/2014Q1/games/shaaft/Makefile Fri Dec 20 11:10:04 2013 (r336996) @@ -3,7 +3,7 @@ PORTNAME= shaaft PORTVERSION= 0.5.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= games MASTER_SITES= SF/criticalmass/OldFiles DISTNAME= Shaaft-${PORTVERSION} @@ -18,16 +18,21 @@ CONFLICTS= criticalmass-* USE_BZIP2= yes USE_SDL= mixer image sdl USE_GL= yes +USE_GCC= any GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 -LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-optimize + +CPPFLAGS+= $$(libpng-config --I_opts) +LDFLAGS+= $$(libpng-config --L_opts) + DATADIR= ${PREFIX}/share/Shaaft PLIST_FILES= bin/Packer bin/shaaft %%DATADIR%%/resource.dat \ man/man6/shaaft.6.gz PLIST_DIRS= %%DATADIR%% +DESKTOP_ENTRIES="Shaaft" "" "" "${PORTNAME}" "" "" + .include .if ${ARCH} == "sparc64" Copied: branches/2014Q1/games/shaaft/files/patch-ResourceManager.cpp (from r336995, head/games/shaaft/files/patch-ResourceManager.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/shaaft/files/patch-ResourceManager.cpp Fri Dec 20 11:10:04 2013 (r336996, copy of r336995, head/games/shaaft/files/patch-ResourceManager.cpp) @@ -0,0 +1,10 @@ +--- utils/ResourceManager.cpp.orig ++++ utils/ResourceManager.cpp +@@ -13,6 +13,7 @@ + // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details + // + #include ++#include + #include + #include + #include Copied: branches/2014Q1/games/shaaft/files/patch-Value.hpp (from r336995, head/games/shaaft/files/patch-Value.hpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/shaaft/files/patch-Value.hpp Fri Dec 20 11:10:04 2013 (r336996, copy of r336995, head/games/shaaft/files/patch-Value.hpp) @@ -0,0 +1,12 @@ +--- utils/Value.hpp.orig 2013-11-30 21:16:05.000000000 +0900 ++++ utils/Value.hpp 2013-11-30 21:16:35.000000000 +0900 +@@ -15,7 +15,8 @@ + #ifndef _Value_hpp_ + #define _Value_hpp_ + +-#include ++#include ++#include + #include + + #include From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 12:00:54 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DC73FBBC; Fri, 20 Dec 2013 12:00:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C8D1B1D42; Fri, 20 Dec 2013 12:00:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKC0sQt034512; Fri, 20 Dec 2013 12:00:54 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKC0sG9034511; Fri, 20 Dec 2013 12:00:54 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312201200.rBKC0sG9034511@svn.freebsd.org> From: Antoine Brodin Date: Fri, 20 Dec 2013 12:00:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337000 - branches/2014Q1/comms/nokryptia X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 12:00:54 -0000 Author: antoine Date: Fri Dec 20 12:00:54 2013 New Revision: 337000 URL: http://svnweb.freebsd.org/changeset/ports/337000 Log: MFH: r336997 Fix LIB_DEPENDS Approved by: portmgr (implicit) Modified: branches/2014Q1/comms/nokryptia/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/comms/nokryptia/Makefile ============================================================================== --- branches/2014Q1/comms/nokryptia/Makefile Fri Dec 20 11:57:16 2013 (r336999) +++ branches/2014Q1/comms/nokryptia/Makefile Fri Dec 20 12:00:54 2013 (r337000) @@ -10,7 +10,7 @@ MASTER_SITES= http://tuxmobil.org/softwa MAINTAINER= ports@FreeBSD.org COMMENT= Tool for fast loading mp3s into Nokia 5510 -LIB_DEPENDS= libid3-3.so:${PORTSDIR}/audio/id3lib +LIB_DEPENDS= libid3.so:${PORTSDIR}/audio/id3lib GNU_CONFIGURE= yes USE_BZIP2= yes From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 12:03:59 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 42923CF3; Fri, 20 Dec 2013 12:03:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2D13E1DB8; Fri, 20 Dec 2013 12:03:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKC3x6d035413; Fri, 20 Dec 2013 12:03:59 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKC3vbM035406; Fri, 20 Dec 2013 12:03:57 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312201203.rBKC3vbM035406@svn.freebsd.org> From: Antoine Brodin Date: Fri, 20 Dec 2013 12:03:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337001 - in branches/2014Q1/databases: mariadb-server memcached memcachedb memcacheq mysql-proxy sharedance X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 12:03:59 -0000 Author: antoine Date: Fri Dec 20 12:03:57 2013 New Revision: 337001 URL: http://svnweb.freebsd.org/changeset/ports/337001 Log: MFH: r336999 Fix LIB_DEPENDS Approved by: portmgr (implicit) Modified: branches/2014Q1/databases/mariadb-server/Makefile branches/2014Q1/databases/memcached/Makefile branches/2014Q1/databases/memcachedb/Makefile branches/2014Q1/databases/memcacheq/Makefile branches/2014Q1/databases/mysql-proxy/Makefile branches/2014Q1/databases/sharedance/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/databases/mariadb-server/Makefile ============================================================================== --- branches/2014Q1/databases/mariadb-server/Makefile Fri Dec 20 12:00:54 2013 (r337000) +++ branches/2014Q1/databases/mariadb-server/Makefile Fri Dec 20 12:03:57 2013 (r337001) @@ -48,7 +48,7 @@ OPENSSL_DESC= Use OpenSSL instead of bun .if !defined(MARIADB_CLIENT_SLAVE) CONFIGURE_ARGS+= --with-libevent=${LOCALBASE} -LIB_DEPENDS+= libevent-1.so:${PORTSDIR}/devel/libevent +LIB_DEPENDS+= libevent-1.4.so:${PORTSDIR}/devel/libevent MAN1= innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \ myisamlog.1 myisampack.1 mysql.server.1 mysql_client_test_embedded.1 \ Modified: branches/2014Q1/databases/memcached/Makefile ============================================================================== --- branches/2014Q1/databases/memcached/Makefile Fri Dec 20 12:00:54 2013 (r337000) +++ branches/2014Q1/databases/memcached/Makefile Fri Dec 20 12:03:57 2013 (r337001) @@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR= distfiles MAINTAINER= swills@FreeBSD.org COMMENT= High-performance distributed memory object cache system -LIB_DEPENDS= libevent-1.so:${PORTSDIR}/devel/libevent +LIB_DEPENDS= libevent-1.4.so:${PORTSDIR}/devel/libevent TEST_DEPENDS= prove:${PORTSDIR}/lang/${PERL_PORT} \ git:${PORTSDIR}/devel/git Modified: branches/2014Q1/databases/memcachedb/Makefile ============================================================================== --- branches/2014Q1/databases/memcachedb/Makefile Fri Dec 20 12:00:54 2013 (r337000) +++ branches/2014Q1/databases/memcachedb/Makefile Fri Dec 20 12:03:57 2013 (r337001) @@ -10,7 +10,7 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MAINTAINER= meritus@innervision.pl COMMENT= Distributed storage system designed for persistent -LIB_DEPENDS= libevent-1.so:${PORTSDIR}/devel/libevent +LIB_DEPENDS= libevent-1.4.so:${PORTSDIR}/devel/libevent CFLAGS= -I"${BDB_INCLUDE_DIR}" CONFIGURE_ARGS= --enable-threads --with-bdb="${LOCALBASE}" \ Modified: branches/2014Q1/databases/memcacheq/Makefile ============================================================================== --- branches/2014Q1/databases/memcacheq/Makefile Fri Dec 20 12:00:54 2013 (r337000) +++ branches/2014Q1/databases/memcacheq/Makefile Fri Dec 20 12:03:57 2013 (r337001) @@ -14,7 +14,7 @@ COMMENT= Simple queue service over Memca LICENSE= BSD -LIB_DEPENDS= libevent-1.so:${PORTSDIR}/devel/libevent +LIB_DEPENDS= libevent-1.4.so:${PORTSDIR}/devel/libevent USE_CSTD= gnu89 CFLAGS+= -I"${BDB_INCLUDE_DIR}" Modified: branches/2014Q1/databases/mysql-proxy/Makefile ============================================================================== --- branches/2014Q1/databases/mysql-proxy/Makefile Fri Dec 20 12:00:54 2013 (r337000) +++ branches/2014Q1/databases/mysql-proxy/Makefile Fri Dec 20 12:03:57 2013 (r337001) @@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR= MySQL-Proxy MAINTAINER= swills@FreeBSD.org COMMENT= Monitor, analyze, or transform the communication of MySQL -LIB_DEPENDS= libevent-1.so:${PORTSDIR}/devel/libevent \ +LIB_DEPENDS= libevent-1.4.so:${PORTSDIR}/devel/libevent \ libglib.so:${PORTSDIR}/devel/glib20 CONFIGURE_ARGS+= --with-lua=lua-5.1 --with-mysql=${LOCALBASE}/bin/mysql_config --docdir=${DATADIR} --enable-self-contained Modified: branches/2014Q1/databases/sharedance/Makefile ============================================================================== --- branches/2014Q1/databases/sharedance/Makefile Fri Dec 20 12:00:54 2013 (r337000) +++ branches/2014Q1/databases/sharedance/Makefile Fri Dec 20 12:03:57 2013 (r337001) @@ -10,7 +10,7 @@ MASTER_SITES= http://download.pureftpd.o MAINTAINER= gslin@gslin.org COMMENT= A daemon to centralize keys and associated data -LIB_DEPENDS= libevent-1.so:${PORTSDIR}/devel/libevent +LIB_DEPENDS= libevent-1.4.so:${PORTSDIR}/devel/libevent CONFIGURE_ARGS= --with-largefile GNU_CONFIGURE= yes From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 14:43:13 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 38E9BD2A; Fri, 20 Dec 2013 14:43:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 192F91A10; Fri, 20 Dec 2013 14:43:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKEhCae093581; Fri, 20 Dec 2013 14:43:12 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKEhCfr093579; Fri, 20 Dec 2013 14:43:12 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312201443.rBKEhCfr093579@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 20 Dec 2013 14:43:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337015 - in branches/2014Q1/devel/poslib: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 14:43:13 -0000 Author: mat Date: Fri Dec 20 14:43:12 2013 New Revision: 337015 URL: http://svnweb.freebsd.org/changeset/ports/337015 Log: MFH: r337002 - Fix build with clang - Support CXXFLAGS properly - Add LICENSE - Support staging PR: ports/184849 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/devel/poslib/files/ - copied from r337002, head/devel/poslib/files/ Modified: branches/2014Q1/devel/poslib/Makefile branches/2014Q1/devel/poslib/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/poslib/Makefile ============================================================================== --- branches/2014Q1/devel/poslib/Makefile Fri Dec 20 14:18:11 2013 (r337014) +++ branches/2014Q1/devel/poslib/Makefile Fri Dec 20 14:43:12 2013 (r337015) @@ -10,22 +10,30 @@ MASTER_SITES= SF/posadis/${PORTNAME}/${P MAINTAINER= ports@FreeBSD.org COMMENT= Posadis C++ DNS library +LICENSE= GPLv2 # (or later) + +OPTIONS_DEFINE= DOCS EXAMPLES + USE_AUTOTOOLS= libtool -GNU_CONFIGURE= yes USE_LDCONFIG= yes PLIST_SUB= VERSION="${PORTVERSION}" -DOCS= AUTHORS ChangeLog NEWS README TODO -EXAMPLES= examples/*.cpp +post-patch: + @${REINPLACE_CMD} -e \ + '/CXXFLAGS/s|-O0|$$CXXFLAGS| ; \ + /LIBS=/s|-lstdc++||' ${WRKSRC}/configure -NO_STAGE= yes post-install: - @${MKDIR} ${EXAMPLESDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR} -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for i in AUTHORS ChangeLog NEWS README TODO + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} \ + ${STAGEDIR}${DOCSDIR}) +.endfor + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/examples && ${INSTALL_DATA} *.cpp \ + ${STAGEDIR}${EXAMPLESDIR}) + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libposlib.so.0 \ + ${STAGEDIR}${PREFIX}/lib/libposserver.so.0 .include Modified: branches/2014Q1/devel/poslib/pkg-plist ============================================================================== --- branches/2014Q1/devel/poslib/pkg-plist Fri Dec 20 14:18:11 2013 (r337014) +++ branches/2014Q1/devel/poslib/pkg-plist Fri Dec 20 14:43:12 2013 (r337015) @@ -42,13 +42,13 @@ lib/poslib-%%VERSION%%/include/poslib-co %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnstimeago.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/host.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server.cpp +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% -%%EXAMPLESDIR%%/dnstimeago.cpp -%%EXAMPLESDIR%%/host.cpp -%%EXAMPLESDIR%%/server.cpp -@dirrm %%EXAMPLESDIR%% +@dirrm lib/poslib-%%VERSION%%/include +@dirrm lib/poslib-%%VERSION%% @dirrm include/poslib-%%VERSION%%/poslib/server @dirrm include/poslib-%%VERSION%%/poslib @dirrm include/poslib-%%VERSION%% -@dirrm lib/poslib-%%VERSION%%/include -@dirrm lib/poslib-%%VERSION%% From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 14:45:04 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0AE29F7D; Fri, 20 Dec 2013 14:45:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EB2631A25; Fri, 20 Dec 2013 14:45:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKEj3L7093949; Fri, 20 Dec 2013 14:45:03 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKEj3cn093948; Fri, 20 Dec 2013 14:45:03 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312201445.rBKEj3cn093948@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 20 Dec 2013 14:45:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337016 - branches/2014Q1/devel/codeworker X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 14:45:04 -0000 Author: mat Date: Fri Dec 20 14:45:03 2013 New Revision: 337016 URL: http://svnweb.freebsd.org/changeset/ports/337016 Log: MFH: r337003 Fix build with clang PR: ports/184854 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Modified: branches/2014Q1/devel/codeworker/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/codeworker/Makefile ============================================================================== --- branches/2014Q1/devel/codeworker/Makefile Fri Dec 20 14:43:12 2013 (r337015) +++ branches/2014Q1/devel/codeworker/Makefile Fri Dec 20 14:45:03 2013 (r337016) @@ -27,7 +27,7 @@ post-patch: @${FIND} ${WRKSRC} -name "*.cpp" -or -name "*.h" | ${XARGS} \ ${REINPLACE_CMD} -e \ 's||| ; \ - s|__GNUC_PREREQ |__GNUC_PREREQ__|' + s|(__cplusplus) \&\&|(__cplusplus) // \&\&|' do-install: (cd ${WRKSRC} && ${INSTALL_PROGRAM} codeworker ${STAGEDIR}${PREFIX}/bin) From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 14:46:59 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3181E114; Fri, 20 Dec 2013 14:46:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1D60E1A38; Fri, 20 Dec 2013 14:46:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKEkw2F094225; Fri, 20 Dec 2013 14:46:58 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKEkwdS094224; Fri, 20 Dec 2013 14:46:58 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312201446.rBKEkwdS094224@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 20 Dec 2013 14:46:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337017 - branches/2014Q1/russian/xruskb X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 14:46:59 -0000 Author: mat Date: Fri Dec 20 14:46:58 2013 New Revision: 337017 URL: http://svnweb.freebsd.org/changeset/ports/337017 Log: MFH: r337004 Master site does not allow anon ftp access for the reason unknown, add working mirror. Approved by: portmgr (implicit) Modified: branches/2014Q1/russian/xruskb/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/russian/xruskb/Makefile ============================================================================== --- branches/2014Q1/russian/xruskb/Makefile Fri Dec 20 14:45:03 2013 (r337016) +++ branches/2014Q1/russian/xruskb/Makefile Fri Dec 20 14:46:58 2013 (r337017) @@ -5,7 +5,8 @@ PORTNAME= xruskb PORTVERSION= 1.15.4 PORTREVISION= 2 CATEGORIES= russian x11 -MASTER_SITES= ftp://ftp.yars.free.net/pub/source/xruskb/ +MASTER_SITES= ftp://ftp.yars.free.net/pub/source/xruskb/ \ + http://lav.yar.ru/download/xruskb/ MAINTAINER= ports@FreeBSD.org COMMENT= Keyboard layout switcher and indicator From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 14:48:29 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8C3F31F6; Fri, 20 Dec 2013 14:48:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 77EB61A42; Fri, 20 Dec 2013 14:48:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKEmTIM094531; Fri, 20 Dec 2013 14:48:29 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKEmT5v094530; Fri, 20 Dec 2013 14:48:29 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312201448.rBKEmT5v094530@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 20 Dec 2013 14:48:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337018 - branches/2014Q1/print/lilypond-devel X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 14:48:29 -0000 Author: mat Date: Fri Dec 20 14:48:28 2013 New Revision: 337018 URL: http://svnweb.freebsd.org/changeset/ports/337018 Log: MFH: r337005 - Fix depends PR: 185019 Submitted by: Markiyan Kushnir Approved by: portmgr (implicit) Modified: branches/2014Q1/print/lilypond-devel/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/print/lilypond-devel/Makefile ============================================================================== --- branches/2014Q1/print/lilypond-devel/Makefile Fri Dec 20 14:46:58 2013 (r337017) +++ branches/2014Q1/print/lilypond-devel/Makefile Fri Dec 20 14:48:28 2013 (r337018) @@ -14,15 +14,16 @@ BUILD_DEPENDS= pdftexi2dvi:${PORTSDIR}/p t1ascii:${PORTSDIR}/print/t1utils \ bash:${PORTSDIR}/shells/bash \ fontforge:${PORTSDIR}/print/fontforge \ + dblatex:${PORTSDIR}/textproc/dblatex \ + pngtopnm:${PORTSDIR}/graphics/netpbm \ + rsync:${PORTSDIR}/net/rsync \ ${LOCALBASE}/share/ghostscript/fonts/c059033l.pfb:${PORTSDIR}/print/gsfonts LIB_DEPENDS= guile:${PORTSDIR}/lang/guile \ gmp:${PORTSDIR}/math/gmp \ freetype:${PORTSDIR}/print/freetype2 -RUN_DEPENDS= dblatex:${PORTSDIR}/textproc/dblatex \ - mftrace:${PORTSDIR}/print/mftrace \ - pngtopnm:${PORTSDIR}/graphics/netpbm \ +RUN_DEPENDS= mftrace:${PORTSDIR}/print/mftrace \ convert:${PORTSDIR}/graphics/ImageMagick \ ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans-Bold.ttf:${PORTSDIR}/x11-fonts/dejavu From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 14:50:05 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 842CF306; Fri, 20 Dec 2013 14:50:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5643F1A56; Fri, 20 Dec 2013 14:50:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKEo5Jl094873; Fri, 20 Dec 2013 14:50:05 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKEo4Lc094869; Fri, 20 Dec 2013 14:50:04 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312201450.rBKEo4Lc094869@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 20 Dec 2013 14:50:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337019 - in branches/2014Q1/converters/ish: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 14:50:05 -0000 Author: mat Date: Fri Dec 20 14:50:04 2013 New Revision: 337019 URL: http://svnweb.freebsd.org/changeset/ports/337019 Log: MFH: r337009 - Fix build with clang - Support staging PR: ports/184856 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/converters/ish/files/patch-mvol.c - copied unchanged from r337009, head/converters/ish/files/patch-mvol.c Modified: branches/2014Q1/converters/ish/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/converters/ish/Makefile ============================================================================== --- branches/2014Q1/converters/ish/Makefile Fri Dec 20 14:48:28 2013 (r337018) +++ branches/2014Q1/converters/ish/Makefile Fri Dec 20 14:50:04 2013 (r337019) @@ -13,11 +13,11 @@ COMMENT= Binary-to-text file-encoder MAKEFILE= makefile MAKE_ARGS= CFLAGS="${CFLAGS}" DEST=${PREFIX}/bin -PLIST_FILES= bin/ish ALL_TARGET= ish -NO_STAGE= yes +PLIST_FILES= bin/ish + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + (cd ${WRKSRC} && ${INSTALL_PROGRAM} ish ${STAGEDIR}${PREFIX}/bin) .include Copied: branches/2014Q1/converters/ish/files/patch-mvol.c (from r337009, head/converters/ish/files/patch-mvol.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/converters/ish/files/patch-mvol.c Fri Dec 20 14:50:04 2013 (r337019, copy of r337009, head/converters/ish/files/patch-mvol.c) @@ -0,0 +1,27 @@ +--- mvol.c.orig ++++ mvol.c +@@ -4,6 +4,7 @@ + /* 930823 modified (aka) */ + + #include ++#include + #include + #include + #include +@@ -25,6 +26,8 @@ + extern char tname[]; + extern int delvol; + ++void restore_done(char *, char *, long); ++ + #define ID "ID block for multi volume ish file" + + typedef struct { +@@ -208,6 +211,7 @@ + + #define COPY_BUF 1024 + ++void + restore_done(src, dst,sz) + char *src; + char *dst; From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 14:51:31 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A668248B; Fri, 20 Dec 2013 14:51:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 786261AAF; Fri, 20 Dec 2013 14:51:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKEpVk1097433; Fri, 20 Dec 2013 14:51:31 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKEpVYg097432; Fri, 20 Dec 2013 14:51:31 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312201451.rBKEpVYg097432@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 20 Dec 2013 14:51:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337020 - branches/2014Q1/graphics/freeimage X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 14:51:31 -0000 Author: mat Date: Fri Dec 20 14:51:30 2013 New Revision: 337020 URL: http://svnweb.freebsd.org/changeset/ports/337020 Log: MFH: r337007 - Fix installed symlink [1] - STAGE-clean - Convert to USES=dos2unix Reported by: antoine [1] Approved by: portmgr (implicit) Modified: branches/2014Q1/graphics/freeimage/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/freeimage/Makefile ============================================================================== --- branches/2014Q1/graphics/freeimage/Makefile Fri Dec 20 14:50:04 2013 (r337019) +++ branches/2014Q1/graphics/freeimage/Makefile Fri Dec 20 14:51:30 2013 (r337020) @@ -3,7 +3,7 @@ PORTNAME= freeimage PORTVERSION= 3.15.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/Source%20Distribution/${PORTVERSION} DISTNAME= FreeImage${PORTVERSION:S/.//g} @@ -11,9 +11,9 @@ DISTNAME= FreeImage${PORTVERSION:S/.//g} MAINTAINER= gahr@FreeBSD.org COMMENT= Simple C/C++ bitmap graphics library -USES= gmake +USES= gmake dos2unix USE_ZIP= yes -USE_DOS2UNIX= Source/LibOpenJPEG/opj_malloc.h +DOS2UNIX_FILES= Source/LibOpenJPEG/opj_malloc.h USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/FreeImage MAKE_ARGS= CC=${CC} CPP=${CPP} CXX=${CXX} @@ -31,7 +31,6 @@ PLIST_FILES= include/FreeImage.h \ lib/libfreeimageplus.so.3 \ lib/libfreeimageplus.so -NO_STAGE= yes .include .if ${ARCH} == "amd64" @@ -47,7 +46,7 @@ post-build: post-install: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} -f Makefile.fip ${MAKE_ARGS} ${INSTALL_TARGET} - ${LN} -s libfreeimageplus-${PORTVERSION}.so.3 ${PREFIX}/lib/libfreeimageplus.so - ${LN} -s libfreeimageplus-${PORTVERSION}.so ${PREFIX}/lib/libfreeimageplus.so.3 + ${LN} -s libfreeimageplus.so.3 ${STAGEDIR}${PREFIX}/lib/libfreeimageplus.so + ${LN} -s libfreeimageplus-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libfreeimageplus.so.3 .include From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 14:53:27 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 51B1162C; Fri, 20 Dec 2013 14:53:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 318121ACA; Fri, 20 Dec 2013 14:53:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKErRIJ097751; Fri, 20 Dec 2013 14:53:27 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKErQDF097749; Fri, 20 Dec 2013 14:53:26 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312201453.rBKErQDF097749@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 20 Dec 2013 14:53:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337021 - in branches/2014Q1/biology/grappa: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 14:53:27 -0000 Author: mat Date: Fri Dec 20 14:53:26 2013 New Revision: 337021 URL: http://svnweb.freebsd.org/changeset/ports/337021 Log: MFH: r337010 - Respect CC/CFLAGS PR: ports/184857 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Modified: branches/2014Q1/biology/grappa/Makefile (contents, props changed) branches/2014Q1/biology/grappa/files/patch-Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/biology/grappa/Makefile ============================================================================== --- branches/2014Q1/biology/grappa/Makefile Fri Dec 20 14:51:30 2013 (r337020) +++ branches/2014Q1/biology/grappa/Makefile Fri Dec 20 14:53:26 2013 (r337021) @@ -10,14 +10,13 @@ DISTNAME= GRAPPA20 MAINTAINER= ports@FreeBSD.org COMMENT= Genome Rearrangements Analysis and Phylogeny Software -USES= gmake -MAKE_ARGS= CC="${CC}" +USES= gmake PLIST_FILES= bin/grappa bin/invdist bin/distmat do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/grappa ${STAGEDIR}${PREFIX}/bin - ${LN} -sf ${PREFIX}/bin/grappa ${STAGEDIR}${PREFIX}/bin/invdist - ${LN} -sf ${PREFIX}/bin/grappa ${STAGEDIR}${PREFIX}/bin/distmat + (cd ${WRKSRC} && ${INSTALL_PROGRAM} grappa ${STAGEDIR}${PREFIX}/bin) + ${LN} -sf grappa ${STAGEDIR}${PREFIX}/bin/invdist + ${LN} -sf grappa ${STAGEDIR}${PREFIX}/bin/distmat .include Modified: branches/2014Q1/biology/grappa/files/patch-Makefile ============================================================================== --- branches/2014Q1/biology/grappa/files/patch-Makefile Fri Dec 20 14:51:30 2013 (r337020) +++ branches/2014Q1/biology/grappa/files/patch-Makefile Fri Dec 20 14:53:26 2013 (r337021) @@ -1,6 +1,42 @@ --- Makefile.orig 2004-09-22 09:09:18.000000000 -0500 +++ Makefile 2011-03-26 13:49:31.000000000 -0500 -@@ -156,8 +156,2 @@ +@@ -47,7 +47,7 @@ + endif + + # GNU C +-CC = gcc ++CC ?= gcc + + # Microsoft C + # CC = cl +@@ -62,13 +62,13 @@ + #CC = tmcc -DMPBPA + + # Default CFLAGS +-CFLAGS := -D${OS} $(CONCORDE_CFLAGS) $(GMP_CFLAGS) -DINIT ++CFLAGS += -D${OS} $(CONCORDE_CFLAGS) $(GMP_CFLAGS) -DINIT + + # TESTING option for CFLAGS + # CFLAGS := -DTESTING $(CFLAGS) + + ifeq ($(strip $(CC)), gcc) +-CFLAGS := -O3 -Wall -DGCC $(CFLAGS) ++CFLAGS := -Wall -DGCC $(CFLAGS) + endif + ifeq ($(strip $(CC)), pgcc) + CFLAGS := -fast $(CFLAGS) +@@ -115,7 +115,7 @@ + RELBASE = GRAPPA + RELNAME = $(RELBASE)-$(VERS_MAJ).$(VERS_MIN) + +-LIBS := -lm -lc -lpthread ++LIBS := -lm -pthread + # added this part to the end of above "-l mpi" + ifeq ($(OS), SunOS) + LIBS := -liberty -lsocket -lposix4 -lnsl ${LIBS} +@@ -154,12 +154,6 @@ + $(RM) -fr $(RELNAME) + $(LS) -l $(RELNAME).tar.gz -$(RELNAME)/%.c : %.c - -$(CP) $< $(RELNAME)/. @@ -9,3 +45,5 @@ - -$(CP) $< $(RELNAME)/. - clean: + -rm -f *.${OBJ_SUFFIX} *~ ${EXEC} ${EXEC}.${EXE_SUFFIX} ${SYM} \ + core gmon.out From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 14:55:14 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 89A22728; Fri, 20 Dec 2013 14:55:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 75BCF1ADF; Fri, 20 Dec 2013 14:55:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKEtERU098127; Fri, 20 Dec 2013 14:55:14 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKEtEJY098126; Fri, 20 Dec 2013 14:55:14 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312201455.rBKEtEJY098126@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 20 Dec 2013 14:55:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337022 - in branches/2014Q1/emulators/sim6811: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 14:55:14 -0000 Author: mat Date: Fri Dec 20 14:55:13 2013 New Revision: 337022 URL: http://svnweb.freebsd.org/changeset/ports/337022 Log: MFH: r337012 - Respect CC/CFLAGS - Remove leading article from COMMENT - Switch to PLIST_FILES - Support staging PR: ports/184858 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Deleted: branches/2014Q1/emulators/sim6811/files/patch-aa branches/2014Q1/emulators/sim6811/pkg-plist Modified: branches/2014Q1/emulators/sim6811/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/emulators/sim6811/Makefile ============================================================================== --- branches/2014Q1/emulators/sim6811/Makefile Fri Dec 20 14:53:26 2013 (r337021) +++ branches/2014Q1/emulators/sim6811/Makefile Fri Dec 20 14:55:13 2013 (r337022) @@ -10,9 +10,23 @@ DISTNAME= sim EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org -COMMENT= A Motorola 6811 simulator +COMMENT= Motorola 6811 simulator NO_WRKSUBDIR= yes -NO_STAGE= yes +ALL_TARGET= sim + +PLIST_FILES= bin/sim6811 man/man1/sim6811.1.gz + +post-patch: + @${REINPLACE_CMD} -e \ + 's|^CC =|CC ?=| ; \ + s|^CFLAGS =|#CFLAGS =| ; \ + s|-O2|| ; \ + s|-o sim |-o sim6811 |' ${WRKSRC}/Makefile + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/sim6811 ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/sim6811.1 ${STAGEDIR}${MANPREFIX}/man/man1 + .include From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 16:01:39 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 64CB035F; Fri, 20 Dec 2013 16:01:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5093110C1; Fri, 20 Dec 2013 16:01:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKG1dfB023782; Fri, 20 Dec 2013 16:01:39 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKG1dvK023781; Fri, 20 Dec 2013 16:01:39 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312201601.rBKG1dvK023781@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 20 Dec 2013 16:01:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337027 - in branches/2014Q1/biology/clustalw: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 16:01:39 -0000 Author: mat Date: Fri Dec 20 16:01:38 2013 New Revision: 337027 URL: http://svnweb.freebsd.org/changeset/ports/337027 Log: MFH: r337026 - Fix build with clang/libc++. - Support staging. PR: 184974 Submitted by: tijl@ Approved by: portmgr (implicit) Added: branches/2014Q1/biology/clustalw/files/ - copied from r337026, head/biology/clustalw/files/ Modified: branches/2014Q1/biology/clustalw/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/biology/clustalw/Makefile ============================================================================== --- branches/2014Q1/biology/clustalw/Makefile Fri Dec 20 15:29:07 2013 (r337026) +++ branches/2014Q1/biology/clustalw/Makefile Fri Dec 20 16:01:38 2013 (r337027) @@ -10,7 +10,7 @@ MASTER_SITES= ftp://ftp.ebi.ac.uk/pub/so MASTER_SITE_SUBDIR= ${PORTVERSION} MAINTAINER= wen@FreeBSD.org -COMMENT= A multiple alignment program for DNA or proteins +COMMENT= Multiple alignment program for DNA or proteins RESTRICTED= No commercial use. @@ -20,8 +20,7 @@ GNU_CONFIGURE= yes PLIST_FILES= bin/clustalw bin/clustalw2 -NO_STAGE= yes post-install: - ${LN} -sf clustalw2 ${PREFIX}/bin/clustalw + ${LN} -sf clustalw2 ${STAGEDIR}${PREFIX}/bin/clustalw .include From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 16:10:01 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5F64E905; Fri, 20 Dec 2013 16:10:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4BABF1136; Fri, 20 Dec 2013 16:10:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKGA1Uj025510; Fri, 20 Dec 2013 16:10:01 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKGA037025502; Fri, 20 Dec 2013 16:10:00 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201312201610.rBKGA037025502@svn.freebsd.org> From: Steve Wills Date: Fri, 20 Dec 2013 16:10:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337031 - branches/2014Q1/net/py-ec2-cli-tools X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 16:10:01 -0000 Author: swills Date: Fri Dec 20 16:10:00 2013 New Revision: 337031 URL: http://svnweb.freebsd.org/changeset/ports/337031 Log: MFH: r337025 - Fix RUN_DEPENDS - Use PYTHON_SITELIBDIR - Remove directories installed by lang/python* from plist PR: ports/181383 Submitted by: lwhsu Approved by: portmgr-lurkers (mat) Modified: branches/2014Q1/net/py-ec2-cli-tools/Makefile branches/2014Q1/net/py-ec2-cli-tools/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net/py-ec2-cli-tools/Makefile ============================================================================== --- branches/2014Q1/net/py-ec2-cli-tools/Makefile Fri Dec 20 16:08:37 2013 (r337030) +++ branches/2014Q1/net/py-ec2-cli-tools/Makefile Fri Dec 20 16:10:00 2013 (r337031) @@ -3,6 +3,7 @@ PORTNAME= ec2-cli-tools PORTVERSION= 1.4 +PORTREVISION= 1 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -10,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= swills@FreeBSD.org COMMENT= Helpful CLI utilities for querying and connecting to EC2 instances -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}boto=>1.0:${PORTSDIR}/devel/py-boto +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=1.0:${PORTSDIR}/devel/py-boto USE_PYTHON= yes USE_PYDISTUTILS= easy_install Modified: branches/2014Q1/net/py-ec2-cli-tools/pkg-plist ============================================================================== --- branches/2014Q1/net/py-ec2-cli-tools/pkg-plist Fri Dec 20 16:08:37 2013 (r337030) +++ branches/2014Q1/net/py-ec2-cli-tools/pkg-plist Fri Dec 20 16:10:00 2013 (r337031) @@ -1,9 +1,7 @@ -%%PYTHON_LIBDIR%%/site-packages/%%PYEASYINSTALL_EGG%% +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%% bin/ec2getsnaps bin/ec2host bin/ec2hostcache bin/ec2ssh bin/ec2sshproxy bin/ec2who -@dirrm %%PYTHON_LIBDIR%%/site-packages -@dirrm %%PYTHON_LIBDIR%% From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 16:10:53 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0A90EA36; Fri, 20 Dec 2013 16:10:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EAB831187; Fri, 20 Dec 2013 16:10:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKGAqIm026514; Fri, 20 Dec 2013 16:10:52 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKGAqVv026512; Fri, 20 Dec 2013 16:10:52 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201312201610.rBKGAqVv026512@svn.freebsd.org> From: Steve Wills Date: Fri, 20 Dec 2013 16:10:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337032 - branches/2014Q1/net/py-ec2-cli-tools X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 16:10:53 -0000 Author: swills Date: Fri Dec 20 16:10:52 2013 New Revision: 337032 URL: http://svnweb.freebsd.org/changeset/ports/337032 Log: MFH: r337030 - Add bash dependency [1] - Fix shebang on bash files [1] - Staging seems to work fine, go ahead and enable it - Bump PORTREVISION for package change PR: ports/184277 [1] Reported by: Koichiro IWAO [1] Approved by: portmgr-lurkers (mat) Modified: branches/2014Q1/net/py-ec2-cli-tools/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net/py-ec2-cli-tools/Makefile ============================================================================== --- branches/2014Q1/net/py-ec2-cli-tools/Makefile Fri Dec 20 16:10:00 2013 (r337031) +++ branches/2014Q1/net/py-ec2-cli-tools/Makefile Fri Dec 20 16:10:52 2013 (r337032) @@ -3,7 +3,7 @@ PORTNAME= ec2-cli-tools PORTVERSION= 1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,10 +11,12 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= swills@FreeBSD.org COMMENT= Helpful CLI utilities for querying and connecting to EC2 instances -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=1.0:${PORTSDIR}/devel/py-boto +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=1.0:${PORTSDIR}/devel/py-boto \ + bash>=0:${PORTSDIR}/shells/bash USE_PYTHON= yes USE_PYDISTUTILS= easy_install +USES= shebangfix +SHEBANG_FILES= bin/ec2getsnaps bin/ec2hostcache bin/ec2ssh -NO_STAGE= yes .include From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 16:32:18 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 69F0C303; Fri, 20 Dec 2013 16:32:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 497961307; Fri, 20 Dec 2013 16:32:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKGWIUC035553; Fri, 20 Dec 2013 16:32:18 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKGWHXr035548; Fri, 20 Dec 2013 16:32:17 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312201632.rBKGWHXr035548@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 20 Dec 2013 16:32:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337034 - in branches/2014Q1/audio/mp3stat: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 16:32:18 -0000 Author: mat Date: Fri Dec 20 16:32:17 2013 New Revision: 337034 URL: http://svnweb.freebsd.org/changeset/ports/337034 Log: MFH: r337033 - Fix build with clang - Update MASTER_SITES - Support staging PR: ports/184863 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/audio/mp3stat/files/patch-base.cpp - copied unchanged from r337033, head/audio/mp3stat/files/patch-base.cpp branches/2014Q1/audio/mp3stat/files/patch-input__vorbis__oggstat.cpp - copied unchanged from r337033, head/audio/mp3stat/files/patch-input__vorbis__oggstat.cpp branches/2014Q1/audio/mp3stat/files/patch-ui__console__cli.cpp - copied unchanged from r337033, head/audio/mp3stat/files/patch-ui__console__cli.cpp Modified: branches/2014Q1/audio/mp3stat/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/mp3stat/Makefile ============================================================================== --- branches/2014Q1/audio/mp3stat/Makefile Fri Dec 20 16:21:19 2013 (r337033) +++ branches/2014Q1/audio/mp3stat/Makefile Fri Dec 20 16:32:17 2013 (r337034) @@ -19,12 +19,12 @@ OPTIONS_DEFAULT= VORBIS WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= gmake pkgconfig -NO_STAGE= yes +USES= dos2unix gmake pkgconfig +DOS2UNIX_FILES= ui/console/cli.cpp USE_GNOME= gtk20 -CXX+= -I${LOCALBASE}/include -L${LOCALBASE}/lib \ - -Wl,--rpath,${LOCALBASE}/lib +CXXFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -Wl,--rpath,${LOCALBASE}/lib PORTDOCS= README PLIST_FILES= bin/mp3stat \ @@ -46,23 +46,25 @@ post-patch: @${FIND} ${WRKSRC} -name "Makefile*" | ${XARGS} ${REINPLACE_CMD} -e \ 's|@$${CXX}|$${CXX}|g ; \ s|-ldl|-lz|g ; \ - s|-lc||g ; \ + s|-lc|$${LDFLAGS}|g ; \ s|-Wl,-soname,.*\.so\.1||g ; \ s|-fpic|-fPIC|g ; \ s|^CXX|#CXX|g' do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/mp3stat ${PREFIX}/bin - @${MKDIR} ${PREFIX}/lib/mp3stat - ${INSTALL_DATA} ${WRKSRC}/ui/gtk/ui_gtk2.so ${PREFIX}/lib/mp3stat - ${INSTALL_DATA} ${WRKSRC}/ui/console/ui_console.so ${PREFIX}/lib/mp3stat - ${INSTALL_DATA} ${WRKSRC}/input/mp3/input_mp3.so ${PREFIX}/lib/mp3stat + (cd ${WRKSRC} && ${INSTALL_PROGRAM} mp3stat ${STAGEDIR}${PREFIX}/bin) + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/mp3stat + (cd ${WRKSRC}/ui/gtk && ${INSTALL_DATA} ui_gtk2.so \ + ${STAGEDIR}${PREFIX}/lib/mp3stat) + (cd ${WRKSRC}/ui/console && ${INSTALL_DATA} ui_console.so \ + ${STAGEDIR}${PREFIX}/lib/mp3stat) + (cd ${WRKSRC}/input/mp3 && ${INSTALL_DATA} input_mp3.so \ + ${STAGEDIR}${PREFIX}/lib/mp3stat) .if ${PORT_OPTIONS:MVORBIS} - ${INSTALL_DATA} ${WRKSRC}/input/vorbis/input_vorb.so ${PREFIX}/lib/mp3stat -.endif -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + (cd ${WRKSRC}/input/vorbis && ${INSTALL_DATA} input_vorb.so \ + ${STAGEDIR}${PREFIX}/lib/mp3stat) .endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}) .include Copied: branches/2014Q1/audio/mp3stat/files/patch-base.cpp (from r337033, head/audio/mp3stat/files/patch-base.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/mp3stat/files/patch-base.cpp Fri Dec 20 16:32:17 2013 (r337034, copy of r337033, head/audio/mp3stat/files/patch-base.cpp) @@ -0,0 +1,9 @@ +--- base.cpp.orig ++++ base.cpp +@@ -1,4 +1,5 @@ +-#include ++#include ++#include + #include + #include + Copied: branches/2014Q1/audio/mp3stat/files/patch-input__vorbis__oggstat.cpp (from r337033, head/audio/mp3stat/files/patch-input__vorbis__oggstat.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/mp3stat/files/patch-input__vorbis__oggstat.cpp Fri Dec 20 16:32:17 2013 (r337034, copy of r337033, head/audio/mp3stat/files/patch-input__vorbis__oggstat.cpp) @@ -0,0 +1,7 @@ +--- input/vorbis/oggstat.cpp.orig ++++ input/vorbis/oggstat.cpp +@@ -1,3 +1,4 @@ ++#include + #include "oggstat.h" + + using namespace std; Copied: branches/2014Q1/audio/mp3stat/files/patch-ui__console__cli.cpp (from r337033, head/audio/mp3stat/files/patch-ui__console__cli.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/mp3stat/files/patch-ui__console__cli.cpp Fri Dec 20 16:32:17 2013 (r337034, copy of r337033, head/audio/mp3stat/files/patch-ui__console__cli.cpp) @@ -0,0 +1,9 @@ +--- ui/console/cli.cpp.orig ++++ ui/console/cli.cpp +@@ -1,4 +1,5 @@ +-#include ++#include ++#include + #include "cli.h" + + using namespace std; From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 17:25:41 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3A27314E; Fri, 20 Dec 2013 17:25:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 24CEC1791; Fri, 20 Dec 2013 17:25:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKHPfa4055013; Fri, 20 Dec 2013 17:25:41 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKHPeUb055006; Fri, 20 Dec 2013 17:25:40 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312201725.rBKHPeUb055006@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 20 Dec 2013 17:25:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337046 - in branches/2014Q1/emulators/lisaem: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 17:25:41 -0000 Author: mat Date: Fri Dec 20 17:25:40 2013 New Revision: 337046 URL: http://svnweb.freebsd.org/changeset/ports/337046 Log: MFH: r337039 - Fix build with clang - Add desktop entry file - Support staging PR: ports/184866 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/emulators/lisaem/files/patch-generator__cpu68k.c - copied unchanged from r337039, head/emulators/lisaem/files/patch-generator__cpu68k.c branches/2014Q1/emulators/lisaem/files/patch-generator__reg68k.c - copied unchanged from r337039, head/emulators/lisaem/files/patch-generator__reg68k.c Modified: branches/2014Q1/emulators/lisaem/Makefile (contents, props changed) branches/2014Q1/emulators/lisaem/files/patch-build.sh (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/emulators/lisaem/Makefile ============================================================================== --- branches/2014Q1/emulators/lisaem/Makefile Fri Dec 20 17:25:22 2013 (r337045) +++ branches/2014Q1/emulators/lisaem/Makefile Fri Dec 20 17:25:40 2013 (r337046) @@ -3,7 +3,7 @@ PORTNAME= lisaem DISTVERSION= 1.2.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= emulators MASTER_SITES= http://lisaem.sunder.net/downloads/ @@ -12,25 +12,26 @@ COMMENT= Apple Lisa 2 Emulator BUILD_DEPENDS= pngtopnm:${PORTSDIR}/graphics/netpbm -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE= GPLv2 # (or later) USE_BZIP2= yes USE_WX= 2.8 -NO_STAGE= yes +DESKTOP_ENTRIES="LisaEm" "" "${DATADIR}/lisa2icon.xpm" "${PORTNAME}" "" "" + post-patch: - ${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g" \ - -e "s|wx-config|${WX_CONFIG}|g" ${WRKSRC}/build.sh + @${REINPLACE_CMD} -e \ + 's|%%PREFIX%%|${PREFIX}|g ; \ + s|%%WX_CONFIG%%|${WX_CONFIG}|g' ${WRKSRC}/build.sh + do-build: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build.sh build + ${FIND} ${WRKSRC} -type l -delete + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build.sh build do-install: - @# This file is a symlink to itself; result of mistyped command? - ${RM} -f ${WRKSRC}/resources/resources - ${INSTALL_PROGRAM} ${WRKSRC}/bin/lisaem ${PREFIX}/bin - ${MKDIR} ${PREFIX}/share/lisaem - ${INSTALL_DATA} ${WRKSRC}/resources/* ${PREFIX}/share/lisaem/ - ${LN} -sf ${PREFIX}/share/lisaem ${PREFIX}/share/LisaEm + (cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} lisaem ${STAGEDIR}${PREFIX}/bin) + @${MKDIR} ${STAGEDIR}${DATADIR} + (cd ${WRKSRC}/resources && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}) + ${LN} -sf lisaem ${STAGEDIR}${PREFIX}/share/LisaEm .include Modified: branches/2014Q1/emulators/lisaem/files/patch-build.sh ============================================================================== --- branches/2014Q1/emulators/lisaem/files/patch-build.sh Fri Dec 20 17:25:22 2013 (r337045) +++ branches/2014Q1/emulators/lisaem/files/patch-build.sh Fri Dec 20 17:25:40 2013 (r337046) @@ -20,7 +20,7 @@ WXVER=0 -case "`wx-config --version`" in -+case "`/usr/local/bin/wxgtk2-2.8-config --version`" in ++case "`%%WX_CONFIG%% --version`" in 2.9*|3*) echo WARNING: wxWidgets versions higher than 2.8 have not been tested. echo It might work if they are compiled with backwards compatibility. @@ -28,7 +28,7 @@ 2.8*) ;; *) echo Could not find wxWidgets 2.8.0 or higher. - echo Please install it and ensure that wx-config is in the path -+ echo Please install it and ensure that /usr/local/bin/wxgtk2-2.8-config is in the path ++ echo Please install it and ensure that %%WX_CONFIG%% is in the path exit 1 ;; esac @@ -47,11 +47,22 @@ then - WXREL="`wx-config --release`" - if [ -n "`wx-config --list | grep $WXREL | grep unicode`" ] -+ WXREL="`/usr/local/bin/wxgtk2-2.8-config --release`" -+ if [ -n "`/usr/local/bin/wxgtk2-2.8-config --list | grep $WXREL | grep unicode`" ] ++ WXREL="`%%WX_CONFIG%% --release`" ++ if [ -n "`%%WX_CONFIG%% --list | grep $WXREL | grep unicode`" ] then WITHUNICODE="--unicode=yes" fi +@@ -210,8 +210,8 @@ + PREFIX="/cygdrive/c/Program Files/Sunder.NET/LisaEm" + PREFIXLIB="/cygdrive/c/Program Files/Sunder.NET/LisaEm" + else +- PREFIX="/usr/local/bin" +- PREFIXLIB="/usr/local/share/" ++ PREFIX="%%PREFIX%%/bin" ++ PREFIXLIB="%%PREFIX%%/share/" + fi + fi + fi @@ -230,11 +230,11 @@ # if the object is older than the source, it will return true. ############################################################################## @@ -72,8 +83,8 @@ (default for non-OS X) ---with-unicode Ask wx-config for a unicode build (might not yet work) ---without-unicode Ask wx-config for a non-unicode build (default) -+--with-unicode Ask /usr/local/bin/wxgtk2-2.8-config for a unicode build (might not yet work) -+--without-unicode Ask /usr/local/bin/wxgtk2-2.8-config for a non-unicode build (default) ++--with-unicode Ask %%WX_CONFIG%% for a unicode build (might not yet work) ++--without-unicode Ask %%WX_CONFIG%% for a non-unicode build (default) Environment Variables you can pass: @@ -82,13 +93,13 @@ # many thanks to David Cecchin for finding the unicode issues fixed below. - WXCONFIGFLAGS=`wx-config --cppflags $WITHUNICODE ` -+ WXCONFIGFLAGS=`/usr/local/bin/wxgtk2-2.8-config --cppflags $WITHUNICODE ` ++ WXCONFIGFLAGS=`%%WX_CONFIG%% --cppflags $WITHUNICODE ` if [ -z "$WXCONFIGFLAGS" ] then - echo wx-config has failed, or returned an error. Ensure that it exists in your path. - which wx-config -+ echo /usr/local/bin/wxgtk2-2.8-config has failed, or returned an error. Ensure that it exists in your path. -+ which /usr/local/bin/wxgtk2-2.8-config ++ echo %%WX_CONFIG%% has failed, or returned an error. Ensure that it exists in your path. ++ which %%WX_CONFIG%% exit 3 fi - CFLAGS="-I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS $WITHOPTIMIZE $WITHDEBUG" @@ -96,13 +107,13 @@ - LINKOPTS="`wx-config $STATIC $WITHUNICODE --libs --linkdeps --cppflags`" + CFLAGS="$CFLAGS -I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS" + CXXFLAGS="$CXXFLAGS -I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS" -+ LINKOPTS="`/usr/local/bin/wxgtk2-2.8-config $STATIC $WITHUNICODE --libs --linkdeps --cppflags`" ++ LINKOPTS="`%%WX_CONFIG%% $STATIC $WITHUNICODE --libs --linkdeps --cppflags`" if [ -z "$LINKOPTS" ] then - echo wx-config has failed, or returned an error. Ensure that it exists in your path. - which wx-config -+ echo /usr/local/bin/wxgtk2-2.8-config has failed, or returned an error. Ensure that it exists in your path. -+ which /usr/local/bin/wxgtk2-2.8-config ++ echo %%WX_CONFIG%% has failed, or returned an error. Ensure that it exists in your path. ++ which %%WX_CONFIG%% exit 3 fi @@ -115,3 +126,14 @@ fi if [ -f ../bin/lisaem ] +@@ -960,8 +960,8 @@ + then + + echo "Freshly compiled `du -sh lisaem`" +- strip lisaem${EXT} +- echo "Stripped `du -sh lisaem`" ++# strip lisaem${EXT} ++# echo "Stripped `du -sh lisaem`" + + # compress it if upx exists. + if [ -z "$WITHOUTUPX" ]; then Copied: branches/2014Q1/emulators/lisaem/files/patch-generator__cpu68k.c (from r337039, head/emulators/lisaem/files/patch-generator__cpu68k.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/emulators/lisaem/files/patch-generator__cpu68k.c Fri Dec 20 17:25:40 2013 (r337046, copy of r337039, head/emulators/lisaem/files/patch-generator__cpu68k.c) @@ -0,0 +1,161 @@ +--- generator/cpu68k.c.orig ++++ generator/cpu68k.c +@@ -259,7 +259,7 @@ + continue; + } + } +- if (cpu68k_iibtable[bitmap] != NULL) {EXIT(283,0,"CPU definition #%d conflicts (0x%x)", i, bitmap);} ++ if (cpu68k_iibtable[bitmap] != NULL) {EXITR(283,0,"CPU definition #%d conflicts (0x%x)", i, bitmap);} + + cpu68k_iibtable[bitmap] = iib; + /* set both flag and non-flag versions */ +@@ -285,7 +285,7 @@ + + if (j != cpu68k_totalinstr) + { +- EXIT(84,0,"Instruction count not verified (%d/%d)\n", ++ EXITR(84,0,"Instruction count not verified (%d/%d)\n", + cpu68k_totalinstr, i); + } + +@@ -904,19 +904,19 @@ + else /*---- Nope! We're out of IPCt's, allocate some more. ----*/ + { + +- if ( ipcts_free) { EXIT(3,0,"Bug! ipcts_free is %ld, but ipct_free_head is null",ipcts_free);} ++ if ( ipcts_free) { EXITR(3,0,"Bug! ipcts_free is %ld, but ipct_free_head is null",ipcts_free);} + + //check_iib(); + + /*--- Did we call Malloc too many times? ---*/ +- if ((iipct_mallocs++)>MAX_IPCT_MALLOCS) { EXIT(2,0,"Excessive mallocs of ipct's recompile with more!");} ++ if ((iipct_mallocs++)>MAX_IPCT_MALLOCS) { EXITR(2,0,"Excessive mallocs of ipct's recompile with more!");} + + size_to_get = (ipcts_allocated/IPCT_ALLOC_PERCENT)+1; // add a percentange of what we have, least 1 + if ( (ipct_mallocs[iipct_mallocs]=(t_ipc_table *)malloc(size_to_get * sizeof(t_ipc_table)+1) )==NULL) + { + DEBUG_LOG(0,"Out of memory getting more ipcs: %p was returned", ipct_mallocs[iipct_mallocs]); + DEBUG_LOG(0,"%d ipcts allocated so far, %d are free, %d used, %d mallocs done", ipcts_allocated, ipcts_free, ipcts_used, iipct_mallocs); +- EXIT(86,0,"Out of memory while allocating more ipct's"); ++ EXITR(86,0,"Out of memory while allocating more ipct's"); + } + + // DEBUG_LOG(0,"zzzzzzz ipct land allocated:: %p -to- %p", ipct_mallocs[iipct_mallocs], (void *)(ipct_mallocs[iipct_mallocs]+size_to_get * sizeof(t_ipc_table))); +@@ -1084,8 +1084,8 @@ + DEBUG_LOG(1000,"Nope - calling get_ipct()"); + mmu_trn->table=get_ipct(); // allocate an ipc table for this mmu_t + table=mmu_trn->table; +- if (!table) {EXIT(21,0,"Couldn't get IPC Table! Doh!");} +- if (pc&1) {EXIT(14,0,"odd pc!");} ++ if (!table) {EXITR(21,0,"Couldn't get IPC Table! Doh!");} ++ if (pc&1) {EXITR(14,0,"odd pc!");} + + //check_iib(); + +@@ -1094,11 +1094,11 @@ + // ipc points to the MMU translation table entry for this page. + ipc = &(table->ipc[((pc>>1) & 0xff)]); + DEBUG_LOG(200,"ipc is now %p at pc %06x max %06x",ipc,pc,xpc); +- if (!ipc) {EXIT(501,0,"cpu68k_makeipclist: But! ipc is null!"); } +- if (pc&1) {EXIT(501,0,"odd pc!");} ++ if (!ipc) {EXITR(501,0,"cpu68k_makeipclist: But! ipc is null!"); } ++ if (pc&1) {EXITR(501,0,"odd pc!");} + } + else +- {EXIT(502,0,"Let the bodies hit the floor!\nLet the bodies hit the floor!\nLet the bodies hit the floor!\n\n Either mmu_trn or table is null!");} ++ {EXITR(502,0,"Let the bodies hit the floor!\nLet the bodies hit the floor!\nLet the bodies hit the floor!\n\n Either mmu_trn or table is null!");} + } + + //check_iib(); +@@ -1106,7 +1106,7 @@ + + if ( !ipc) + { +- EXIT(17,0,"ipc=NULL\n1. Something's got to give 2. Something's got to give. 3. Something's got to give 4. Something's got to give.\nNOW!"); ++ EXITR(17,0,"ipc=NULL\n1. Something's got to give 2. Something's got to give. 3. Something's got to give 4. Something's got to give.\nNOW!"); + } + + //check_iib(); +@@ -1126,7 +1126,7 @@ + + if ( !ipc) + { +- EXIT(20,0,"ipc=NULL\n1. Something's got to give 2. Something's got to give. 3. Something's got to give 4. Something's got to give.\nNOW!"); ++ EXITR(20,0,"ipc=NULL\n1. Something's got to give 2. Something's got to give. 3. Something's got to give 4. Something's got to give.\nNOW!"); + } + + //check_iib(); +@@ -1236,8 +1236,8 @@ + // fflush(buglog); + // #endif + +- if (!iib) {EXIT(53,0,"There's no proper IIB for the possibly illegal instruction opcode %04x @ pc=%08x\n",opcode,pc);} +- if ( !ipc) {EXIT(54,0,"Have a cow man! ipc=NULL\n"); } ++ if (!iib) {EXITR(53,0,"There's no proper IIB for the possibly illegal instruction opcode %04x @ pc=%08x\n",opcode,pc);} ++ if ( !ipc) {EXITR(54,0,"Have a cow man! ipc=NULL\n"); } + + //DEBUG_LOG(200,"ipc is %s",(!ipc)?"null":"ok"); + +@@ -1283,7 +1283,7 @@ + // grow the list of ipcs if we need to. + if (instrs>=ipcs_to_get) + { +- EXIT(24,0,"Welcome to the realms of chaos! I'm dealing with over %d instructions, %d ipcs! %d/%d/%d pc=%d/%08x",instrs,ipcs_to_get,segment1,segment2,start,context,pc); ++ EXITR(24,0,"Welcome to the realms of chaos! I'm dealing with over %d instructions, %d ipcs! %d/%d/%d pc=%d/%08x",instrs,ipcs_to_get,segment1,segment2,start,context,pc); + pc24=pc; + } + +@@ -1308,7 +1308,7 @@ + table=mmu_trn->table; + + if (!table) { +- EXIT(99,0,"Couldnt get IPC Table! Doh!\n");} ++ EXITR(99,0,"Couldnt get IPC Table! Doh!\n");} + + //if (pc&1) {DEBUG_LOG(200,"odd pc!"); EXIT(26);} + } +@@ -1333,7 +1333,7 @@ + + // check_iib(); + +- if (!table) {EXIT(27,0,"Couldnt get IPC Table! Doh!");} ++ if (!table) {EXITR(27,0,"Couldnt get IPC Table! Doh!");} + //ipc = &(mmu_trn->table->ipc[((pc>>1) & 0xff)]); + //myiib=cpu68k_iibtable[opcode]; iib=myiib; // iib = myiib ? myiib : illegaliib; + //////cpu68k_ipc(pc, iib, ipc); +@@ -1370,7 +1370,7 @@ + if (instrs == 2) + { + +- if (pc&1) {EXIT(28,0,"odd pc!");} ++ if (pc&1) {EXITR(28,0,"odd pc!");} + DEBUG_LOG(200,"*~*~*~*~*~*~ in 2instrs ipc is now %p at pc %06x max %06x",ipc,pc,xpc); + ipc=ipcs[instrs-1-1]; //ipc-- + DEBUG_LOG(200,"ipc is now %p at pc %06x max %06x",ipc,pc,xpc); +@@ -1443,7 +1443,7 @@ + DEBUG_LOG(200,"ipc is now %p at pc %06x max %06x ix=%d",ipc,pc,xpc,ix); + if ( !ipc) + { +- EXIT(29,0,"Null ipc, bye"); ++ EXITR(29,0,"Null ipc, bye"); + } + + //check_iib(); +@@ -1460,7 +1460,7 @@ + + if (!ipc->function) + { +- EXIT(3,0,"Null IPC fn returned for opcode:%04x ix=%d of %d instrs",ipc->opcode,ix,instrs); ++ EXITR(3,0,"Null IPC fn returned for opcode:%04x ix=%d of %d instrs",ipc->opcode,ix,instrs); + // cpu68k_printipc(ipc); + } + +@@ -1479,7 +1479,7 @@ + { + // check_iib(); + ipc=ipcs[ix]; +- EXIT(6,0,"FATAL ipc with null fnction at index %d-> used:%d, set:%d, opcode %04x, len %02x, src %08x, dst %08x\n", ++ EXITR(6,0,"FATAL ipc with null fnction at index %d-> used:%d, set:%d, opcode %04x, len %02x, src %08x, dst %08x\n", + ix, ipc->used, ipc->set, ipc->opcode, ipc->wordlen, ipc->src, ipc->dst); + } + Copied: branches/2014Q1/emulators/lisaem/files/patch-generator__reg68k.c (from r337039, head/emulators/lisaem/files/patch-generator__reg68k.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/emulators/lisaem/files/patch-generator__reg68k.c Fri Dec 20 17:25:40 2013 (r337046, copy of r337039, head/emulators/lisaem/files/patch-generator__reg68k.c) @@ -0,0 +1,19 @@ +--- generator/reg68k.c.orig ++++ generator/reg68k.c +@@ -1308,7 +1308,7 @@ + + /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +- if (abort_opcode==1) {EXIT(476,0,"MMU/BUS/Address exception occured on opcode fetch!\n");} ++ if (abort_opcode==1) {EXITR(476,0,"MMU/BUS/Address exception occured on opcode fetch!\n");} + abort_opcode=0; // clear any addr/bus errors/traps/etc that may have occured. + + InstructionRegister=ipc->opcode; +@@ -1397,7 +1397,7 @@ + InstructionRegister=ipc->opcode; + abort_opcode=0; + if (ipc->function) ipc->function(ipc); +- else { EXIT(277,0,"No ipc function at %d/%08x, even after attempting to get one!\n",context,pc24);} ++ else { EXITR(277,0,"No ipc function at %d/%08x, even after attempting to get one!\n",context,pc24);} + } + } // if we have it, execute, else loop is done. :) From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 17:26:36 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3D2A7241; Fri, 20 Dec 2013 17:26:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2607F179C; Fri, 20 Dec 2013 17:26:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKHQab8055251; Fri, 20 Dec 2013 17:26:36 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKHQZEA055247; Fri, 20 Dec 2013 17:26:35 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312201726.rBKHQZEA055247@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 20 Dec 2013 17:26:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337047 - in branches/2014Q1/games/xdigger: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 17:26:36 -0000 Author: mat Date: Fri Dec 20 17:26:34 2013 New Revision: 337047 URL: http://svnweb.freebsd.org/changeset/ports/337047 Log: MFH: r337040 - Fix build with clang - Add desktop entry file - Support staging PR: ports/184867 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/games/xdigger/files/patch-runleves.c - copied unchanged from r337040, head/games/xdigger/files/patch-runleves.c Modified: branches/2014Q1/games/xdigger/Makefile (contents, props changed) branches/2014Q1/games/xdigger/files/patch-ad (contents, props changed) branches/2014Q1/games/xdigger/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/xdigger/Makefile ============================================================================== --- branches/2014Q1/games/xdigger/Makefile Fri Dec 20 17:25:40 2013 (r337046) +++ branches/2014Q1/games/xdigger/Makefile Fri Dec 20 17:26:34 2013 (r337047) @@ -3,10 +3,9 @@ PORTNAME= xdigger PORTVERSION= 1.0.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR= games/arcade +MASTER_SITES= SUNSITE/games/arcade EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org @@ -14,23 +13,16 @@ COMMENT= Boulderdash-like KC85 Digger fo USES= imake USE_XORG= x11 xext -MAN6= xdigger.6 -NO_STAGE= yes -.include +DESKTOP_ENTRIES="XDigger" "" "" "${PORTNAME}" "" "" post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/configure.h post-install: - @${CHMOD} 2755 ${PREFIX}/bin/xdigger - @${CHOWN} root:games ${PREFIX}/bin/xdigger - @${CHMOD} 664 ${PREFIX}/share/xdigger/xdigger.hiscore - @${CHOWN} root:games ${PREFIX}/share/xdigger/xdigger.hiscore -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for i in ChangeLog README + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) +.endfor .include Modified: branches/2014Q1/games/xdigger/files/patch-ad ============================================================================== --- branches/2014Q1/games/xdigger/files/patch-ad Fri Dec 20 17:25:40 2013 (r337046) +++ branches/2014Q1/games/xdigger/files/patch-ad Fri Dec 20 17:26:34 2013 (r337047) @@ -16,7 +16,7 @@ #ifdef SOUND_RPLAY RPLAYLIB = -lrplay -@@ -23,12 +23,10 @@ +@@ -23,15 +23,13 @@ ComplexProgramTarget(xdigger) InstallNonExecFile(xdigger.level,XDIGGER_LIB_DIR) @@ -30,3 +30,9 @@ /* InstallNonExecFileNoClobber(xdigger.hiscore,XDIGGER_HISCORE_DIR) */ install:: +- $(MKDIRHIER) XDIGGER_HISCORE_DIR +- touch XDIGGER_HISCORE_DIR/xdigger.hiscore +- chmod a+w XDIGGER_HISCORE_DIR/xdigger.hiscore ++ $(MKDIRHIER) $(DESTDIR)XDIGGER_HISCORE_DIR ++ touch $(DESTDIR)XDIGGER_HISCORE_DIR/xdigger.hiscore ++ chmod a+w $(DESTDIR)XDIGGER_HISCORE_DIR/xdigger.hiscore Copied: branches/2014Q1/games/xdigger/files/patch-runleves.c (from r337040, head/games/xdigger/files/patch-runleves.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/xdigger/files/patch-runleves.c Fri Dec 20 17:26:34 2013 (r337047, copy of r337040, head/games/xdigger/files/patch-runleves.c) @@ -0,0 +1,201 @@ +--- runlevels.c.orig ++++ runlevels.c +@@ -672,6 +672,20 @@ + } + } /* DiggerHalfStep() */ + ++typedef struct ++{ ++ unsigned char x, y, id, type; ++} TMerk; ++ ++void Merke(unsigned char type, int x, int y, int *merkidx, TMerk *merk) ++{ ++ merk[*merkidx].x = x; ++ merk[*merkidx].y = y; ++ merk[*merkidx].id = field[x][y].id & 7; ++ merk[*merkidx].type = type; ++ *merkidx++; ++} ++ + void StoneDiamondStep() + { + +@@ -680,24 +694,10 @@ + #define SF_LEFTDOWN 2 + #define SF_CHANGER 3 + +- typedef struct +- { +- unsigned char x, y, id, type; +- } TMerk; +- + TMerk merk[140], ghosts_todie[17]; + int i, x, y, dx, dy, merkidx, ghosts_todie_idx; + Bool digger_todie = False; +- +- void Merke(unsigned char type) +- { +- merk[merkidx].x = x; +- merk[merkidx].y = y; +- merk[merkidx].id = field[x][y].id & 7; +- merk[merkidx].type = type; +- merkidx++; +- } +- ++ + /* Schritt 1 (nur markieren) : */ + merkidx = 0; ghosts_todie_idx = 0; + +@@ -708,19 +708,19 @@ + (field[x][y].id == ID_IVDIAMOND)) + { + if (field[x][y+1].id == ID_NOTHING) +- Merke(SF_DOWN); ++ Merke(SF_DOWN, x, y, &merkidx, merk); + else + if ((field[x][y+1].id == ID_STONE) || + (field[x][y+1].id == ID_DIAMOND)) + { + if ((field[x-1][y].id == ID_NOTHING) && + (field[x-1][y+1].id == ID_NOTHING)) +- Merke(SF_LEFTDOWN); ++ Merke(SF_LEFTDOWN, x, y, &merkidx, merk); + else + if ((field[x+1][y].id == ID_NOTHING) && + (field[x+1][y+1].id == ID_NOTHING)) + { +- Merke(SF_RIGHTDOWN); ++ Merke(SF_RIGHTDOWN, x, y, &merkidx, &merk); + field[x+1][y+1].id = ID_FSTODMD; + } + } +@@ -729,7 +729,7 @@ + (field[x][y].id == ID_IVSTONE)) && + (field[x][y+1].id == ID_CHANGER) && + (field[x][y+2].id == ID_NOTHING)) +- Merke(SF_CHANGER); ++ Merke(SF_CHANGER, x, y, &merkidx, &merk); + } + merk[merkidx].x = 0; + merk[merkidx].y = 0; +@@ -1573,6 +1573,50 @@ + + /*---------------------------------------------------------------------------*/ + ++void Save_Ghost(int flags, int *id, int *d, unsigned char *file_daten) ++{ ++ switch (flags & F_GHOST_TYPEMASK) ++ { ++ case F_GHOST_TYPE180: ++ *id = 3; ++ break; ++ case F_GHOST_TYPEL: ++ *id = 7; ++ break; ++ case F_GHOST_TYPER: ++ *id = 15; ++ break; ++ case F_GHOST_TYPELR: ++ *id = 11; ++ break; ++ } ++ switch (flags & F_GHOST_MOVEMASK) ++ { ++ case F_GHOST_DOWN: ++ *d = 0; ++ break; ++ case F_GHOST_UP: ++ *d = 1; ++ break; ++ case F_GHOST_RIGHT: ++ *d = 2; ++ break; ++ case F_GHOST_LEFT: ++ *d = 3; ++ break; ++ } ++ if (number_ghosts < MAX_GHOSTS) ++ { ++ if (number_ghosts & 1) ++ file_daten[0x94 + number_ghosts/2] = ++ (file_daten[0x94 + number_ghosts/2] & 0xf0) | (*d); ++ else ++ file_daten[0x94 + number_ghosts/2] = ++ (file_daten[0x94 + number_ghosts/2] & 0x0f) | (*d << 4); ++ number_ghosts++; ++ } ++} ++ + void Edit_SaveLevel(int level_number) + { + /* char filename[256]; */ +@@ -1580,50 +1624,6 @@ + int x, y, id, flags, i, d; + FILE *filehandle; + +- void Save_Ghost() +- { +- switch (flags & F_GHOST_TYPEMASK) +- { +- case F_GHOST_TYPE180: +- id = 3; +- break; +- case F_GHOST_TYPEL: +- id = 7; +- break; +- case F_GHOST_TYPER: +- id = 15; +- break; +- case F_GHOST_TYPELR: +- id = 11; +- break; +- } +- switch (flags & F_GHOST_MOVEMASK) +- { +- case F_GHOST_DOWN: +- d = 0; +- break; +- case F_GHOST_UP: +- d = 1; +- break; +- case F_GHOST_RIGHT: +- d = 2; +- break; +- case F_GHOST_LEFT: +- d = 3; +- break; +- } +- if (number_ghosts < MAX_GHOSTS) +- { +- if (number_ghosts & 1) +- file_daten[0x94 + number_ghosts/2] = +- (file_daten[0x94 + number_ghosts/2] & 0xf0) | (d); +- else +- file_daten[0x94 + number_ghosts/2] = +- (file_daten[0x94 + number_ghosts/2] & 0x0f) | (d << 4); +- number_ghosts++; +- } +- } +- + bzero(file_daten, sizeof(file_daten)); + number_ghosts = 0; + c = file_daten; +@@ -1637,7 +1637,7 @@ + diggerposy = y; + } + if (id == ID_GHOST) +- Save_Ghost(); ++ Save_Ghost(flags, &id, &d, file_daten); + *c = (*c & 0x0f) | (id << 4); + + /* ------------------------------------------------------------------ */ +@@ -1650,7 +1650,7 @@ + diggerposy = y; + } + if (id == ID_GHOST) +- Save_Ghost(); ++ Save_Ghost(flags, &id, &d, file_daten); + *c = (*c & 0xf0) | id; + } + c += 3; Modified: branches/2014Q1/games/xdigger/pkg-plist ============================================================================== --- branches/2014Q1/games/xdigger/pkg-plist Fri Dec 20 17:25:40 2013 (r337046) +++ branches/2014Q1/games/xdigger/pkg-plist Fri Dec 20 17:26:34 2013 (r337047) @@ -1,10 +1,19 @@ +@mode 2755 +@group games bin/xdigger -%%PORTDOCS%%share/doc/xdigger/ChangeLog -%%PORTDOCS%%share/doc/xdigger/README -share/xdigger/diamond.au -share/xdigger/step.au -share/xdigger/stone.au -share/xdigger/xdigger.hiscore -share/xdigger/xdigger.level -%%PORTDOCS%%@dirrm share/doc/xdigger -@dirrm share/xdigger +@group +@mode +man/man6/xdigger.6.gz +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/README +%%DATADIR%%/diamond.au +%%DATADIR%%/step.au +%%DATADIR%%/stone.au +@mode 644 +@group games +%%DATADIR%%/xdigger.hiscore +@group +@mode +%%DATADIR%%/xdigger.level +@dirrm %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 17:27:26 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 71397332; Fri, 20 Dec 2013 17:27:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5D66217A6; Fri, 20 Dec 2013 17:27:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKHRQJA055435; Fri, 20 Dec 2013 17:27:26 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKHRQkm055434; Fri, 20 Dec 2013 17:27:26 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312201727.rBKHRQkm055434@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 20 Dec 2013 17:27:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337048 - branches/2014Q1/japanese/py-mecab X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 17:27:26 -0000 Author: mat Date: Fri Dec 20 17:27:25 2013 New Revision: 337048 URL: http://svnweb.freebsd.org/changeset/ports/337048 Log: MFH: r337041 - Fix swig dependency PR: 183203 Submitted by: amdmi3 Approved by: maintainer timeout Approved by: portmgr (implicit) Modified: branches/2014Q1/japanese/py-mecab/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/japanese/py-mecab/Makefile ============================================================================== --- branches/2014Q1/japanese/py-mecab/Makefile Fri Dec 20 17:26:34 2013 (r337047) +++ branches/2014Q1/japanese/py-mecab/Makefile Fri Dec 20 17:27:25 2013 (r337048) @@ -13,7 +13,7 @@ COMMENT= Python bindings for MeCab LICENSE= BSD GPLv2 LGPL21 LICENSE_COMB= dual -BUILD_DEPENDS= swig>=1.3:${PORTSDIR}/devel/swig13 +BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 LIB_DEPENDS= mecab:${PORTSDIR}/japanese/mecab USE_PYTHON= yes From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 18:24:49 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9DBEC86A; Fri, 20 Dec 2013 18:24:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6EB0C1D92; Fri, 20 Dec 2013 18:24:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKIOnll077876; Fri, 20 Dec 2013 18:24:49 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKIOnh1077874; Fri, 20 Dec 2013 18:24:49 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312201824.rBKIOnh1077874@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 20 Dec 2013 18:24:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337062 - branches/2014Q1/security/racoon2/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 18:24:49 -0000 Author: mat Date: Fri Dec 20 18:24:48 2013 New Revision: 337062 URL: http://svnweb.freebsd.org/changeset/ports/337062 Log: MFH: r337053 fix build on FreeBSD 10. Approved by: portmgr (implicit) Added: branches/2014Q1/security/racoon2/files/patch-lib-cfparse.y - copied unchanged from r337053, head/security/racoon2/files/patch-lib-cfparse.y branches/2014Q1/security/racoon2/files/patch-lib-cftoken.l - copied unchanged from r337053, head/security/racoon2/files/patch-lib-cftoken.l Modified: Directory Properties: branches/2014Q1/ (props changed) Copied: branches/2014Q1/security/racoon2/files/patch-lib-cfparse.y (from r337053, head/security/racoon2/files/patch-lib-cfparse.y) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/security/racoon2/files/patch-lib-cfparse.y Fri Dec 20 18:24:48 2013 (r337062, copy of r337053, head/security/racoon2/files/patch-lib-cfparse.y) @@ -0,0 +1,11 @@ +--- lib/cfparse.y- 2013-12-21 11:29:53.328819029 +0900 ++++ lib/cfparse.y 2013-12-21 11:30:25.058283579 +0900 +@@ -1712,7 +1712,7 @@ + int n; + char *bp; + struct cf_list *new; +- rcf_t type; ++ rc_type type; + + n = strtoll(str, &bp, 10); + Copied: branches/2014Q1/security/racoon2/files/patch-lib-cftoken.l (from r337053, head/security/racoon2/files/patch-lib-cftoken.l) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/security/racoon2/files/patch-lib-cftoken.l Fri Dec 20 18:24:48 2013 (r337062, copy of r337053, head/security/racoon2/files/patch-lib-cftoken.l) @@ -0,0 +1,20 @@ +--- lib/cftoken.l- 2013-12-21 11:31:18.701191439 +0900 ++++ lib/cftoken.l 2013-12-21 11:33:51.653300338 +0900 +@@ -53,7 +53,7 @@ + extern int yyget_lineno (void); + extern FILE *yyget_in (void); + extern FILE *yyget_out (void); +-extern int yyget_leng (void); ++extern yy_size_t yyget_leng (void); + extern char *yyget_text (void); + extern void yyset_lineno (int); + extern void yyset_in (FILE *); +@@ -78,7 +78,7 @@ + if (cf_debug) { \ + fprintf(CF_ERRDEV, "%s:%d:%d[%s] len=%d\n", \ + rcf_istk[rcf_istkp].path, rcf_istk[rcf_istkp].lineno, \ +- yy_start, yytext, yyleng); \ ++ yy_start, yytext, (int)yyleng); \ + } + #else + #define DP From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 18:27:14 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 25ECBA4D; Fri, 20 Dec 2013 18:27:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 11CA71DB6; Fri, 20 Dec 2013 18:27:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKIRD1o078273; Fri, 20 Dec 2013 18:27:13 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKIRDX0078271; Fri, 20 Dec 2013 18:27:13 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312201827.rBKIRDX0078271@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 20 Dec 2013 18:27:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337063 - branches/2014Q1/x11/3ddesktop/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 18:27:14 -0000 Author: mat Date: Fri Dec 20 18:27:13 2013 New Revision: 337063 URL: http://svnweb.freebsd.org/changeset/ports/337063 Log: MFH: r337055 Fix build with clang PR: ports/184871 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/x11/3ddesktop/files/patch-config.cpp - copied unchanged from r337055, head/x11/3ddesktop/files/patch-config.cpp Modified: branches/2014Q1/x11/3ddesktop/files/patch-event.hpp (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Copied: branches/2014Q1/x11/3ddesktop/files/patch-config.cpp (from r337055, head/x11/3ddesktop/files/patch-config.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/x11/3ddesktop/files/patch-config.cpp Fri Dec 20 18:27:13 2013 (r337063, copy of r337055, head/x11/3ddesktop/files/patch-config.cpp) @@ -0,0 +1,13 @@ +--- config.cpp.orig ++++ config.cpp +@@ -64,8 +64,9 @@ + } + + +-Options::Options(char *n = NULL) ++Options::Options(char *n) + { ++ n = NULL; + + if (n) + strncpy(name, n, sizeof(name)); Modified: branches/2014Q1/x11/3ddesktop/files/patch-event.hpp ============================================================================== --- branches/2014Q1/x11/3ddesktop/files/patch-event.hpp Fri Dec 20 18:24:48 2013 (r337062) +++ branches/2014Q1/x11/3ddesktop/files/patch-event.hpp Fri Dec 20 18:27:13 2013 (r337063) @@ -5,7 +5,7 @@ for (k = events.begin(); k != events.end(); ++k) { Event *e = *k; - printf(":: Event %d 0x%x\n", e->type, (unsigned int)(e->function)); -+ printf(":: Event %d 0x%x\n", e->type, (unsigned intptr_t)(e->function)); ++ printf(":: Event %d %p\n", e->type, e->function); } } From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 18:43:18 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 504835A9; Fri, 20 Dec 2013 18:43:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3C2DE1F44; Fri, 20 Dec 2013 18:43:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKIhIfB084494; Fri, 20 Dec 2013 18:43:18 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKIhIbR084493; Fri, 20 Dec 2013 18:43:18 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312201843.rBKIhIbR084493@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 20 Dec 2013 18:43:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337068 - in branches/2014Q1/graphics/gtimelapse: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 18:43:18 -0000 Author: mat Date: Fri Dec 20 18:43:17 2013 New Revision: 337068 URL: http://svnweb.freebsd.org/changeset/ports/337068 Log: MFH: r337065 - Fix build with clang - Add DESKTOP_ENTRIES - Port supports staging PR: ports/184874 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/graphics/gtimelapse/files/ - copied from r337065, head/graphics/gtimelapse/files/ Modified: branches/2014Q1/graphics/gtimelapse/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/gtimelapse/Makefile ============================================================================== --- branches/2014Q1/graphics/gtimelapse/Makefile Fri Dec 20 18:41:56 2013 (r337067) +++ branches/2014Q1/graphics/gtimelapse/Makefile Fri Dec 20 18:43:17 2013 (r337068) @@ -3,24 +3,28 @@ PORTNAME= gtimelapse DISTVERSION= 0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/Relase # yes, this is not a typo (here) MAINTAINER= ports@FreeBSD.org -COMMENT= An application for capturing images to generate timelapse videos +COMMENT= Application for capturing images to generate timelapse videos LICENSE= GPLv2 -LIB_DEPENDS= gphoto2.2:${PORTSDIR}/graphics/libgphoto2 +LIB_DEPENDS= libgphoto2.so:${PORTSDIR}/graphics/libgphoto2 + +WRKSRC= ${WRKDIR}/${PORTNAME} -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-wx-config=${WX_CONFIG} USES= pkgconfig USE_WX= 2.8+ -WRKSRC= ${WRKDIR}/${PORTNAME} +WX_CONF_ARGS= absolute +USE_AUTOTOOLS= libtoolize aclocal automake autoconf +LIBTOOLIZE_ARGS=--copy --force +AUTOMAKE_ARGS= --add-missing --copy PLIST_FILES= bin/${PORTNAME} -NO_STAGE= yes +DESKTOP_ENTRIES="gTimelapse" "" "" "${PORTNAME}" "Graphics;GTK;" "" + .include From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 19:01:41 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5F1DE23D; Fri, 20 Dec 2013 19:01:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3F7B910ED; Fri, 20 Dec 2013 19:01:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKJ1fFJ092126; Fri, 20 Dec 2013 19:01:41 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKJ1ePI092124; Fri, 20 Dec 2013 19:01:40 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201312201901.rBKJ1ePI092124@svn.freebsd.org> From: Steve Wills Date: Fri, 20 Dec 2013 19:01:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337075 - branches/2014Q1/sysutils/puppet X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 19:01:41 -0000 Author: swills Date: Fri Dec 20 19:01:40 2013 New Revision: 337075 URL: http://svnweb.freebsd.org/changeset/ports/337075 Log: MFH: r336798 - Install rack's config in WWWDIR to use with, say, passenger - Convert to staging - Pet portlint a bit - Be consistent with the generated config and use /var/puppet and not /var/lib/puppet - Drop an old ruby 1.8 test - Add license PR: ports/184939 Submitted by: mat Approved by: portmgr-lurkers (mat) Modified: branches/2014Q1/sysutils/puppet/Makefile branches/2014Q1/sysutils/puppet/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/sysutils/puppet/Makefile ============================================================================== --- branches/2014Q1/sysutils/puppet/Makefile Fri Dec 20 19:01:37 2013 (r337074) +++ branches/2014Q1/sysutils/puppet/Makefile Fri Dec 20 19:01:40 2013 (r337075) @@ -3,18 +3,20 @@ PORTNAME= puppet PORTVERSION= 3.3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ MAINTAINER= swills@FreeBSD.org COMMENT= A configuration management framework written in Ruby +LICENSE= AL2 + RUN_DEPENDS= rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \ rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-augeas \ rubygem-hiera>=0:${PORTSDIR}/sysutils/rubygem-hiera -CONFLICTS= puppet-2* +CONFLICTS= puppet-2* NO_BUILD= yes USE_RUBY= yes USE_RUBY_FEATURES= iconv @@ -26,29 +28,14 @@ GROUPS= puppet SUB_FILES+= pkg-message SUB_LIST= RUBY=${RUBY} -MANCOMPRESSED= yes -MAN5= puppet.conf.5 -MAN8= extlookup2hiera.8 puppet-agent.8 puppet-apply.8 puppet-ca.8 \ - puppet-catalog.8 puppet-cert.8 puppet-certificate.8 \ - puppet-certificate_request.8 puppet-certificate_revocation_list.8 \ - puppet-config.8 puppet-describe.8 puppet-device.8 puppet-doc.8 \ - puppet-facts.8 puppet-file.8 puppet-filebucket.8 puppet-help.8 \ - puppet-inspect.8 puppet-instrumentation_data.8 \ - puppet-instrumentation_listener.8 puppet-instrumentation_probe.8 \ - puppet-key.8 puppet-kick.8 puppet-man.8 puppet-master.8 \ - puppet-module.8 puppet-node.8 puppet-parser.8 puppet-plugin.8 \ - puppet-queue.8 puppet-report.8 puppet-resource.8 \ - puppet-resource_type.8 puppet-secret_agent.8 puppet-status.8 \ - puppet.8 - +OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_DEFAULT= PACKAGE_ORIGIN -OPTIONS_SINGLE= PATCHES +OPTIONS_SINGLE= PATCHES OPTIONS_SINGLE_PATCHES= PACKAGE_ORIGIN PACKAGE_ROOT PACKAGE_ORIGIN_DESC= Use port origin as package name PACKAGE_ROOT_DESC= Use PACKAGEROOT insted of PACKAGESITE -PATCHES_DESC= Optional exclusive patches +PATCHES_DESC= Optional exclusive patches -NO_STAGE= yes .include .if ${PORT_OPTIONS:MPACKAGE_ROOT} @@ -63,7 +50,7 @@ BROKEN= PACKAGE_ROOT option patch is inc .if ${PORT_OPTIONS:MPACKAGE_ORIGIN} EXTRA_PATCHES+= ${FILESDIR}/optpatch-package_origin -.if ${RUBY_VER} == 1.8 || ${RUBY_VER} == 1.9 +.if ${RUBY_VER} == 1.9 RUN_DEPENDS+= rubygem-bzip2>=0:${PORTSDIR}/archivers/rubygem-bzip2 .endif .endif @@ -83,34 +70,32 @@ post-patch: ${WRKSRC}/lib/puppet/defaults.rb do-install: - @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs + @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} post-install: - ${INSTALL} -d ${ETCDIR} - ${INSTALL} -m 0755 -o puppet -g puppet -d /var/puppet - ${INSTALL} -m 0644 ${WRKSRC}/conf/auth.conf ${ETCDIR}/auth.conf-dist - ${RUBY} -I ${RUBY_SITELIBDIR} ${PREFIX}/bin/puppet master --genconfig \ + ${MKDIR} ${STAGEDIR}${ETCDIR}/modules + ${MKDIR} ${STAGEDIR}/var/puppet + ${INSTALL_DATA} ${WRKSRC}/conf/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf-dist + ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet master --genconfig \ --confdir=${ETCDIR} \ --rundir=/var/run/puppet \ - --vardir=/var/lib/puppet \ + --vardir=/var/puppet \ --logdir=/var/log/puppet \ - > ${ETCDIR}/puppet.conf-dist - ${MKDIR} -p ${ETCDIR}/modules - @${ECHO} ${RUBY_SITELIBDIR}/puppet.rb | \ - ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} - @${ECHO} ${RUBY_SITELIBDIR}/semver.rb | \ - ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} - @${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type f | \ - ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} - @${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type d | ${SORT} -r | \ - ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} -.if ${PORT_OPTIONS:MDOCS} - ${INSTALL} -d ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif -.if ${PORT_OPTIONS:MEXAMPLES} - cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR} -.endif - @${CAT} ${PKGMESSAGE} + > ${STAGEDIR}${ETCDIR}/puppet.conf-dist + @${ECHO} ${STAGEDIR}${RUBY_SITELIBDIR}/puppet.rb | \ + ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} + @${ECHO} ${STAGEDIR}${RUBY_SITELIBDIR}/semver.rb | \ + ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} + @${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type f | \ + ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} + @${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type d | ${SORT} -r | \ + ${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST} + @${MKDIR} ${STAGEDIR}${WWWDIR}/public + ${INSTALL_DATA} ${WRKSRC}/ext/rack/files/config.ru ${STAGEDIR}${WWWDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/ext/rack/files/apache2.conf ${STAGEDIR}${EXAMPLESDIR} .include Modified: branches/2014Q1/sysutils/puppet/pkg-plist ============================================================================== --- branches/2014Q1/sysutils/puppet/pkg-plist Fri Dec 20 19:01:37 2013 (r337074) +++ branches/2014Q1/sysutils/puppet/pkg-plist Fri Dec 20 19:01:40 2013 (r337075) @@ -1,5 +1,42 @@ bin/extlookup2hiera bin/puppet +man/man5/puppet.conf.5.gz +man/man8/extlookup2hiera.8.gz +man/man8/puppet-agent.8.gz +man/man8/puppet-apply.8.gz +man/man8/puppet-ca.8.gz +man/man8/puppet-catalog.8.gz +man/man8/puppet-cert.8.gz +man/man8/puppet-certificate.8.gz +man/man8/puppet-certificate_request.8.gz +man/man8/puppet-certificate_revocation_list.8.gz +man/man8/puppet-config.8.gz +man/man8/puppet-describe.8.gz +man/man8/puppet-device.8.gz +man/man8/puppet-doc.8.gz +man/man8/puppet-facts.8.gz +man/man8/puppet-file.8.gz +man/man8/puppet-filebucket.8.gz +man/man8/puppet-help.8.gz +man/man8/puppet-inspect.8.gz +man/man8/puppet-instrumentation_data.8.gz +man/man8/puppet-instrumentation_listener.8.gz +man/man8/puppet-instrumentation_probe.8.gz +man/man8/puppet-key.8.gz +man/man8/puppet-kick.8.gz +man/man8/puppet-man.8.gz +man/man8/puppet-master.8.gz +man/man8/puppet-module.8.gz +man/man8/puppet-node.8.gz +man/man8/puppet-parser.8.gz +man/man8/puppet-plugin.8.gz +man/man8/puppet-queue.8.gz +man/man8/puppet-report.8.gz +man/man8/puppet-resource.8.gz +man/man8/puppet-resource_type.8.gz +man/man8/puppet-secret_agent.8.gz +man/man8/puppet-status.8.gz +man/man8/puppet.8.gz %%RUBY_SITELIBDIR%%/hiera/backend/puppet_backend.rb %%RUBY_SITELIBDIR%%/hiera/scope.rb %%RUBY_SITELIBDIR%%/hiera_puppet.rb @@ -10,11 +47,12 @@ bin/puppet %%RUBY_SITELIBDIR%%/puppetx.rb %%ETCDIR%%/puppet.conf-dist %%ETCDIR%%/auth.conf-dist +www/puppet/config.ru +@dirrm www/puppet/public +@dirrm www/puppet @dirrmtry etc/puppet/modules @dirrmtry etc/puppet -@unexec rmdir /var/puppet 2>/dev/null || true -@exec /bin/mkdir -p /var/puppet -@exec /bin/mkdir -p %D/etc/puppet/modules +@unexec rmdir /var/puppet 2>/dev/null || : @exec /usr/sbin/chown -Rh puppet:puppet /var/puppet @dirrm %%RUBY_SITELIBDIR%%/hiera/backend @dirrm %%RUBY_SITELIBDIR%%/hiera From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 19:02:33 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 51F0B42E; Fri, 20 Dec 2013 19:02:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3CF7510FD; Fri, 20 Dec 2013 19:02:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKJ2XST092391; Fri, 20 Dec 2013 19:02:33 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKJ2WKC092387; Fri, 20 Dec 2013 19:02:32 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201312201902.rBKJ2WKC092387@svn.freebsd.org> From: Steve Wills Date: Fri, 20 Dec 2013 19:02:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337076 - in branches/2014Q1/sysutils/puppet: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 19:02:33 -0000 Author: swills Date: Fri Dec 20 19:02:32 2013 New Revision: 337076 URL: http://svnweb.freebsd.org/changeset/ports/337076 Log: MFH: r337069 - Apply the resource-fix.diff from the Puppet issue #9290 [1] - Patch config.ru to use the right paths [2] - Bump PORTREVISION for package change PR: ports/183794 [1] Submitted by: tdb [1] Reported by: mat [2] Approved by: portmgr-lurkers (mat) Added: branches/2014Q1/sysutils/puppet/files/patch-ext__rack__files__config.ru - copied unchanged from r337069, head/sysutils/puppet/files/patch-ext__rack__files__config.ru branches/2014Q1/sysutils/puppet/files/patch-lib__puppet__rails__resource.rb - copied unchanged from r337069, head/sysutils/puppet/files/patch-lib__puppet__rails__resource.rb Modified: branches/2014Q1/sysutils/puppet/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/sysutils/puppet/Makefile ============================================================================== --- branches/2014Q1/sysutils/puppet/Makefile Fri Dec 20 19:01:40 2013 (r337075) +++ branches/2014Q1/sysutils/puppet/Makefile Fri Dec 20 19:02:32 2013 (r337076) @@ -3,7 +3,7 @@ PORTNAME= puppet PORTVERSION= 3.3.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ @@ -68,6 +68,8 @@ post-patch: ${WRKSRC}/lib/puppet/util/run_mode.rb @${REINPLACE_CMD} -e "s|\$$confdir/ssl|/var/puppet/ssl|" \ ${WRKSRC}/lib/puppet/defaults.rb + @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" \ + ${WRKSRC}/ext/rack/files/config.ru do-install: @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} Copied: branches/2014Q1/sysutils/puppet/files/patch-ext__rack__files__config.ru (from r337069, head/sysutils/puppet/files/patch-ext__rack__files__config.ru) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/sysutils/puppet/files/patch-ext__rack__files__config.ru Fri Dec 20 19:02:32 2013 (r337076, copy of r337069, head/sysutils/puppet/files/patch-ext__rack__files__config.ru) @@ -0,0 +1,13 @@ +--- ./ext/rack/files/config.ru.orig 2013-12-20 16:47:22.876896492 +0000 ++++ ./ext/rack/files/config.ru 2013-12-20 16:47:33.826895721 +0000 +@@ -14,8 +14,8 @@ + # Rack applications typically don't start as root. Set --confdir and --vardir + # to prevent reading configuration from ~puppet/.puppet/puppet.conf and writing + # to ~puppet/.puppet +-ARGV << "--confdir" << "/etc/puppet" +-ARGV << "--vardir" << "/var/lib/puppet" ++ARGV << "--confdir" << "%%PREFIX%%/etc/puppet" ++ARGV << "--vardir" << "/var/puppet" + + # NOTE: it's unfortunate that we have to use the "CommandLine" class + # here to launch the app, but it contains some initialization logic Copied: branches/2014Q1/sysutils/puppet/files/patch-lib__puppet__rails__resource.rb (from r337069, head/sysutils/puppet/files/patch-lib__puppet__rails__resource.rb) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/sysutils/puppet/files/patch-lib__puppet__rails__resource.rb Fri Dec 20 19:02:32 2013 (r337076, copy of r337069, head/sysutils/puppet/files/patch-lib__puppet__rails__resource.rb) @@ -0,0 +1,15 @@ +--- ./lib/puppet/rails/resource.rb.orig 2013-10-07 18:00:47.000000000 +0000 ++++ ./lib/puppet/rails/resource.rb 2013-12-20 16:47:14.340897154 +0000 +@@ -84,7 +84,11 @@ + end + + def [](param) +- super || parameter(param) ++ if param == 'id' ++ super ++ else ++ super || parameter(param) ++ end + end + + # Make sure this resource is equivalent to the provided Parser resource. From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 19:46:10 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BAFCFB72; Fri, 20 Dec 2013 19:46:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A6D041486; Fri, 20 Dec 2013 19:46:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKJkA6v009289; Fri, 20 Dec 2013 19:46:10 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKJkAm1009287; Fri, 20 Dec 2013 19:46:10 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201312201946.rBKJkAm1009287@svn.freebsd.org> From: Steve Wills Date: Fri, 20 Dec 2013 19:46:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337085 - branches/2014Q1/sysutils/puppet X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 19:46:10 -0000 Author: swills Date: Fri Dec 20 19:46:09 2013 New Revision: 337085 URL: http://svnweb.freebsd.org/changeset/ports/337085 Log: MFH: r337084 - Set ownership on config.ru file Reported by: mat Approved by: portmgr-lurkers (mat) Modified: branches/2014Q1/sysutils/puppet/Makefile branches/2014Q1/sysutils/puppet/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/sysutils/puppet/Makefile ============================================================================== --- branches/2014Q1/sysutils/puppet/Makefile Fri Dec 20 19:44:35 2013 (r337084) +++ branches/2014Q1/sysutils/puppet/Makefile Fri Dec 20 19:46:09 2013 (r337085) @@ -3,7 +3,7 @@ PORTNAME= puppet PORTVERSION= 3.3.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ Modified: branches/2014Q1/sysutils/puppet/pkg-plist ============================================================================== --- branches/2014Q1/sysutils/puppet/pkg-plist Fri Dec 20 19:44:35 2013 (r337084) +++ branches/2014Q1/sysutils/puppet/pkg-plist Fri Dec 20 19:46:09 2013 (r337085) @@ -54,6 +54,7 @@ www/puppet/config.ru @dirrmtry etc/puppet @unexec rmdir /var/puppet 2>/dev/null || : @exec /usr/sbin/chown -Rh puppet:puppet /var/puppet +@exec /usr/sbin/chown -Rh puppet:puppet www/puppet/config.ru @dirrm %%RUBY_SITELIBDIR%%/hiera/backend @dirrm %%RUBY_SITELIBDIR%%/hiera @dirrm %%RUBY_SITELIBDIR%%/puppetx/puppetlabs/syntax_checkers From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 20 22:39:09 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C77EE48E; Fri, 20 Dec 2013 22:39:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B2D291107; Fri, 20 Dec 2013 22:39:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKMd9ll081010; Fri, 20 Dec 2013 22:39:09 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKMd9Iu081009; Fri, 20 Dec 2013 22:39:09 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312202239.rBKMd9Iu081009@svn.freebsd.org> From: Antoine Brodin Date: Fri, 20 Dec 2013 22:39:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337098 - branches/2014Q1/Keywords X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 22:39:09 -0000 Author: antoine Date: Fri Dec 20 22:39:09 2013 New Revision: 337098 URL: http://svnweb.freebsd.org/changeset/ports/337098 Log: MFH: r337096 Fix fontdir handling to work properly. Fix the name of mkfontdir and use correct paths. Approved by: portmgr (implicit) Modified: branches/2014Q1/Keywords/fontsdir.yaml Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/Keywords/fontsdir.yaml ============================================================================== --- branches/2014Q1/Keywords/fontsdir.yaml Fri Dec 20 22:33:05 2013 (r337097) +++ branches/2014Q1/Keywords/fontsdir.yaml Fri Dec 20 22:39:09 2013 (r337098) @@ -5,13 +5,13 @@ actions: [dirrmtry] post-install: | mkfontscale %D/%@ 2>/dev/null || true - mkfontsdir %D/%@ 2>/dev/null || true + mkfontdir %D/%@ 2>/dev/null || true post-deinstall: | - mkfontscale %@ 2>/dev/null || true + mkfontscale %D/%@ 2>/dev/null || true if [ -e %D/%@/fonts.scale -a "`stat -f '%%z' %D/%@/fonts.scale 2>/dev/null`" = '2' ]; then rm %D/%@/fonts.scale fi - mkfontdir %@ 2>/dev/null || true - if [ -e %D/%@/fonts.dir -a "`stat -f '%%z' %D/%@§fonts.dir 2>/dev/null`" = '2' ]; then + mkfontdir %D/%@ 2>/dev/null || true + if [ -e %D/%@/fonts.dir -a "`stat -f '%%z' %D/%@/fonts.dir 2>/dev/null`" = '2' ]; then rm %D/%@/fonts.dir fi From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 21 00:04:47 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 81E69AF0; Sat, 21 Dec 2013 00:04:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6CE62164C; Sat, 21 Dec 2013 00:04:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBL04l4c018211; Sat, 21 Dec 2013 00:04:47 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBL04lWg018210; Sat, 21 Dec 2013 00:04:47 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201312210004.rBL04lWg018210@svn.freebsd.org> From: Florian Smeets Date: Sat, 21 Dec 2013 00:04:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337105 - branches/2014Q1/databases/percona55-server X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 00:04:47 -0000 Author: flo Date: Sat Dec 21 00:04:46 2013 New Revision: 337105 URL: http://svnweb.freebsd.org/changeset/ports/337105 Log: MFH: r336956 Fix fetch Reported by: Dmitriy Simakov Approved by: portmgr (bapt) Modified: branches/2014Q1/databases/percona55-server/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/databases/percona55-server/Makefile ============================================================================== --- branches/2014Q1/databases/percona55-server/Makefile Fri Dec 20 23:53:29 2013 (r337104) +++ branches/2014Q1/databases/percona55-server/Makefile Sat Dec 21 00:04:46 2013 (r337105) @@ -5,7 +5,7 @@ DISTVERSION= 5.5.34-32.0 DISTNAME= Percona-Server-5.5.34-rel32.0 PORTREVISION?= 0 CATEGORIES= databases ipv6 -MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.5/LATEST/release-${DISTVERSION:S/rel//}/591/source/ +MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.5/LATEST/source/ MASTER_SITE_SUBDIR= MySQL-5.5 PKGNAMESUFFIX?= 55-server From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 21 00:40:05 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9BE8CB77; Sat, 21 Dec 2013 00:40:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 86FFC183A; Sat, 21 Dec 2013 00:40:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBL0e5OL032043; Sat, 21 Dec 2013 00:40:05 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBL0e54i032041; Sat, 21 Dec 2013 00:40:05 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201312210040.rBL0e54i032041@svn.freebsd.org> From: Florian Smeets Date: Sat, 21 Dec 2013 00:40:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337110 - in branches/2014Q1/databases: percona55-server percona56-server X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 00:40:05 -0000 Author: flo Date: Sat Dec 21 00:40:04 2013 New Revision: 337110 URL: http://svnweb.freebsd.org/changeset/ports/337110 Log: MFH: r337107 Don't use the LATEST link. This fixes the issue that these ports became unfetchable after every upstream update. Approved by: portmgr (bapt) Modified: branches/2014Q1/databases/percona55-server/Makefile branches/2014Q1/databases/percona56-server/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/databases/percona55-server/Makefile ============================================================================== --- branches/2014Q1/databases/percona55-server/Makefile Sat Dec 21 00:36:41 2013 (r337109) +++ branches/2014Q1/databases/percona55-server/Makefile Sat Dec 21 00:40:04 2013 (r337110) @@ -5,7 +5,7 @@ DISTVERSION= 5.5.34-32.0 DISTNAME= Percona-Server-5.5.34-rel32.0 PORTREVISION?= 0 CATEGORIES= databases ipv6 -MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.5/LATEST/source/ +MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.5/${DISTNAME}/source/ MASTER_SITE_SUBDIR= MySQL-5.5 PKGNAMESUFFIX?= 55-server Modified: branches/2014Q1/databases/percona56-server/Makefile ============================================================================== --- branches/2014Q1/databases/percona56-server/Makefile Sat Dec 21 00:36:41 2013 (r337109) +++ branches/2014Q1/databases/percona56-server/Makefile Sat Dec 21 00:40:04 2013 (r337110) @@ -5,7 +5,7 @@ PORTNAME?= percona DISTVERSION= 5.6.14-rel62.0 PORTREVISION?= 0 CATEGORIES= databases ipv6 -MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/LATEST/release-${DISTVERSION:S/rel//}/483/source/ +MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/${DISTNAME}/source/ PKGNAMESUFFIX?= 56-server DISTNAME= Percona-Server-5.6.14-rel62.0 From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 21 10:20:52 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CE6F5518; Sat, 21 Dec 2013 10:20:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BA69A194E; Sat, 21 Dec 2013 10:20:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLAKq1I076862; Sat, 21 Dec 2013 10:20:52 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLAKqah076859; Sat, 21 Dec 2013 10:20:52 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312211020.rBLAKqah076859@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 21 Dec 2013 10:20:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337121 - in branches/2014Q1/x11/tycoon: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 10:20:52 -0000 Author: mat Date: Sat Dec 21 10:20:51 2013 New Revision: 337121 URL: http://svnweb.freebsd.org/changeset/ports/337121 Log: MFH: r337078 Fix build with clang PR: ports/184878 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Modified: branches/2014Q1/x11/tycoon/Makefile (contents, props changed) branches/2014Q1/x11/tycoon/files/patch-ac (contents, props changed) branches/2014Q1/x11/tycoon/pkg-descr (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/x11/tycoon/Makefile ============================================================================== --- branches/2014Q1/x11/tycoon/Makefile Sat Dec 21 10:09:12 2013 (r337120) +++ branches/2014Q1/x11/tycoon/Makefile Sat Dec 21 10:20:51 2013 (r337121) @@ -5,24 +5,25 @@ PORTNAME= tycoon PORTVERSION= 1.07o PORTREVISION= 5 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR= X11/desktop +MASTER_SITES= SUNSITE/X11/desktop MAINTAINER= ports@FreeBSD.org COMMENT= Nifty set of desktop apps, including floating buttons -LIB_DEPENDS= forms.2:${PORTSDIR}/x11-toolkits/xforms +LIB_DEPENDS= libforms.so:${PORTSDIR}/x11-toolkits/xforms USES= imake USE_XORG= xaw -REINPLACE_ARGS= -i "" -NO_STAGE= yes post-patch: - ${RM} -f ${WRKSRC}/xbackdrop/backdrops/index~ - ${REINPLACE_CMD} -e 's,/usr/lib,${PREFIX}/lib,' \ + @${REINPLACE_CMD} -e 's,/usr/lib,${PREFIX}/lib,' \ ${WRKSRC}/xbackdrop/backdrops/index - ${FIND} ${WRKSRC} -name '*.c' -type f | ${XARGS} ${REINPLACE_CMD} -e \ + @${REINPLACE_CMD} -e 's|^update_file|void update_file|' \ + ${WRKSRC}/xchooser/xchooser.c + @${FIND} ${WRKSRC} -name '*.c' -type f | ${XARGS} ${REINPLACE_CMD} -e \ 's,FL_REVISION>=80,FL_REVISION >= 80 || FL_VERSION != 0,g' +pre-configure: + @${RM} -f ${WRKSRC}/xbackdrop/backdrops/index?* + .include Modified: branches/2014Q1/x11/tycoon/files/patch-ac ============================================================================== --- branches/2014Q1/x11/tycoon/files/patch-ac Sat Dec 21 10:09:12 2013 (r337120) +++ branches/2014Q1/x11/tycoon/files/patch-ac Sat Dec 21 10:20:51 2013 (r337121) @@ -1,6 +1,6 @@ --- xbackdrop/Imakefile.orig Sat Mar 9 22:41:13 1996 +++ xbackdrop/Imakefile Wed Nov 1 08:19:17 2000 -@@ -1,24 +1,28 @@ +@@ -1,26 +1,27 @@ -XBACKDROP_DIR = /usr/lib/X11/backdrops +XCOMM +XCOMM FBSD--SF--I'm not sure about this location--backdrops?? @@ -28,12 +28,15 @@ +ComplexProgramTargetNoMan(xbackdrop) -install:: xbackdrop @@\ -+install:: xbackdrop @@\ - @if [ -d $(XBACKDROP_DIR) ]; then set +x; \ @@\ - else (set -x; $(MKDIRHIER) $(XBACKDROP_DIR)); fi @@\ - cp backdrops/?* $(XBACKDROP_DIR); @@\ +- @if [ -d $(XBACKDROP_DIR) ]; then set +x; \ @@\ +- else (set -x; $(MKDIRHIER) $(XBACKDROP_DIR)); fi @@\ +- cp backdrops/?* $(XBACKDROP_DIR); @@\ - chown root.root $(XBACKDROP_DIR) $(XBACKDROP_DIR)/?*; @@\ -+ chown root:daemon $(XBACKDROP_DIR) $(XBACKDROP_DIR)/?*; @@\ - chmod 0755 $(XBACKDROP_DIR); @@\ - chmod 0644 $(XBACKDROP_DIR)/?*; @@\ +- chmod 0755 $(XBACKDROP_DIR); @@\ +- chmod 0644 $(XBACKDROP_DIR)/?*; @@\ ++install:: xbackdrop @@\ ++ @if [ -d $(DESTDIR)$(XBACKDROP_DIR) ]; then set +x; \ @@\ ++ else (set -x; $(MKDIRHIER) $(DESTDIR)$(XBACKDROP_DIR)); fi @@\ ++ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) backdrops/?* $(DESTDIR)$(XBACKDROP_DIR); @@\ + Modified: branches/2014Q1/x11/tycoon/pkg-descr ============================================================================== --- branches/2014Q1/x11/tycoon/pkg-descr Sat Dec 21 10:09:12 2013 (r337120) +++ branches/2014Q1/x11/tycoon/pkg-descr Sat Dec 21 10:20:51 2013 (r337121) @@ -4,5 +4,5 @@ is remembered and restored on the next r Right now I have put into tycoon support for OffiX drag-and-drop, so now you can drag icons from the OffiX filemanager into tycoon -icons and have apppropriate action invoked. Check out OffiX, it's +icons and have appropriate action invoked. Check out OffiX, it's very fine package. From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 21 10:22:15 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 17EAB5FC; Sat, 21 Dec 2013 10:22:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 03009195C; Sat, 21 Dec 2013 10:22:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLAMEFZ077665; Sat, 21 Dec 2013 10:22:14 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLAMEgx077660; Sat, 21 Dec 2013 10:22:14 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312211022.rBLAMEgx077660@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 21 Dec 2013 10:22:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337122 - in branches/2014Q1/x11/temperature.app: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 10:22:15 -0000 Author: mat Date: Sat Dec 21 10:22:13 2013 New Revision: 337122 URL: http://svnweb.freebsd.org/changeset/ports/337122 Log: MFH: r337080 - Fix build with clang - Switch to PLIST_FILES - Support staging PR: ports/184880 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/x11/temperature.app/files/patch-Temperature.cc - copied unchanged from r337080, head/x11/temperature.app/files/patch-Temperature.cc branches/2014Q1/x11/temperature.app/files/patch-Temperature.h - copied unchanged from r337080, head/x11/temperature.app/files/patch-Temperature.h branches/2014Q1/x11/temperature.app/files/patch-Xpm.cc - copied unchanged from r337080, head/x11/temperature.app/files/patch-Xpm.cc Deleted: branches/2014Q1/x11/temperature.app/pkg-plist Modified: branches/2014Q1/x11/temperature.app/Makefile (contents, props changed) branches/2014Q1/x11/temperature.app/files/patch-Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/x11/temperature.app/Makefile ============================================================================== --- branches/2014Q1/x11/temperature.app/Makefile Sat Dec 21 10:20:51 2013 (r337121) +++ branches/2014Q1/x11/temperature.app/Makefile Sat Dec 21 10:22:13 2013 (r337122) @@ -11,21 +11,23 @@ DISTNAME= Temperature.app-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Dockable WindowMaker applet which displays the local temperature -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE= GPLv2 # (or later) RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget +OPTIONS_DEFINE= DOCS + USE_XORG= x11 xpm -NO_STAGE= yes +PORTDOCS= README +PLIST_FILES= bin/Temperature.app + .include do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/Temperature.app ${PREFIX}/bin -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} -.endif + (cd ${WRKSRC} && ${INSTALL_PROGRAM} Temperature.app \ + ${STAGEDIR}${PREFIX}/bin) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}) .include Modified: branches/2014Q1/x11/temperature.app/files/patch-Makefile ============================================================================== --- branches/2014Q1/x11/temperature.app/files/patch-Makefile Sat Dec 21 10:20:51 2013 (r337121) +++ branches/2014Q1/x11/temperature.app/files/patch-Makefile Sat Dec 21 10:22:13 2013 (r337122) @@ -9,9 +9,10 @@ +GNUSTEP_BINDIR = $(LOCALBASE)/GNUstep/Apps/Temperature.app +X11_BINDIR = $(LOCALBASE)/bin - CXX=c++ +-CXX=c++ -CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -O2 -I/usr/X11R6/include -LDFLAGS += -L/usr/X11R6/lib -lXpm -lXext -lX11 ++CXX ?= c++ +CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -I$(LOCALBASE)/include +LDFLAGS += -L$(LOCALBASE)/lib -lXpm -lXext -lX11 Copied: branches/2014Q1/x11/temperature.app/files/patch-Temperature.cc (from r337080, head/x11/temperature.app/files/patch-Temperature.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/x11/temperature.app/files/patch-Temperature.cc Sat Dec 21 10:22:13 2013 (r337122, copy of r337080, head/x11/temperature.app/files/patch-Temperature.cc) @@ -0,0 +1,41 @@ +--- Temperature.cc.bak 2002-04-06 08:44:09.000000000 +0900 ++++ Temperature.cc 2013-12-07 17:25:30.000000000 +0900 +@@ -20,24 +20,29 @@ + // + + #include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + #include +-#include +-#include ++#include ++#include + #include + #include +-#include +-#include ++#include ++#include + #include "Xpm.h" + #include "Temperature.h" + + #include "pixmaps/main.xpm" + #include "pixmaps/redlight.xpm" + ++using std::cerr; ++using std::cout; ++using std::endl; ++using std::fstream; ++ + volatile static ChildStatus childStatus; + + static void catchBrokenPipe(int sig) Copied: branches/2014Q1/x11/temperature.app/files/patch-Temperature.h (from r337080, head/x11/temperature.app/files/patch-Temperature.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/x11/temperature.app/files/patch-Temperature.h Sat Dec 21 10:22:13 2013 (r337122, copy of r337080, head/x11/temperature.app/files/patch-Temperature.h) @@ -0,0 +1,15 @@ +--- Temperature.h.bak 2002-04-06 08:44:17.000000000 +0900 ++++ Temperature.h 2013-12-07 17:24:28.000000000 +0900 +@@ -22,9 +22,11 @@ + #ifndef _TEMPERATURE_H_ + #define _TEMPERATURE_H_ + +-#include ++#include + #include + ++using std::ifstream; ++ + #define APPNAME "Temperature.app" + #define VERSION "1.4" + #define INSTANCENAME "temperature_app" Copied: branches/2014Q1/x11/temperature.app/files/patch-Xpm.cc (from r337080, head/x11/temperature.app/files/patch-Xpm.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/x11/temperature.app/files/patch-Xpm.cc Sat Dec 21 10:22:13 2013 (r337122, copy of r337080, head/x11/temperature.app/files/patch-Xpm.cc) @@ -0,0 +1,22 @@ +--- Xpm.cc.bak 2002-04-06 08:44:36.000000000 +0900 ++++ Xpm.cc 2013-12-07 17:25:00.000000000 +0900 +@@ -22,12 +22,16 @@ + #include + #include + #include +-#include +-#include +-#include ++#include ++#include ++#include + #include "Temperature.h" + #include "Xpm.h" + ++using std::cerr; ++using std::cout; ++using std::endl; ++ + Xpm::Xpm(Display* display, Window root, char** data) + { + int error; From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 21 10:23:33 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6B68C6E0; Sat, 21 Dec 2013 10:23:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 577CE1965; Sat, 21 Dec 2013 10:23:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLANXpg077894; Sat, 21 Dec 2013 10:23:33 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLANXaL077893; Sat, 21 Dec 2013 10:23:33 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312211023.rBLANXaL077893@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 21 Dec 2013 10:23:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337123 - branches/2014Q1/security/gsfv X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 10:23:33 -0000 Author: mat Date: Sat Dec 21 10:23:32 2013 New Revision: 337123 URL: http://svnweb.freebsd.org/changeset/ports/337123 Log: MFH: r337089 - Fix build with clang - Add LICENSE PR: ports/184887 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Modified: branches/2014Q1/security/gsfv/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/gsfv/Makefile ============================================================================== --- branches/2014Q1/security/gsfv/Makefile Sat Dec 21 10:22:13 2013 (r337122) +++ branches/2014Q1/security/gsfv/Makefile Sat Dec 21 10:23:32 2013 (r337123) @@ -5,14 +5,20 @@ PORTNAME= gsfv PORTVERSION= 0.2.1 PORTREVISION= 4 CATEGORIES= security -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= ijliao +MASTER_SITES= LOCAL/ijliao MAINTAINER= ports@FreeBSD.org COMMENT= Create or verify Simple File Verification (SFV) checksum files -PLIST_FILES= bin/gsfv +LICENSE= BSD2CLAUSE + USE_GNOME= gtk12 GNU_CONFIGURE= yes +PLIST_FILES= bin/gsfv + +post-patch: + @${REINPLACE_CMD} -e \ + 's|\([[:blank:]]\)log|\1bb_log|' ${WRKSRC}/src/backbone.c + .include From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 21 10:24:28 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9A4F77C2; Sat, 21 Dec 2013 10:24:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7A06F196D; Sat, 21 Dec 2013 10:24:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLAOS1R078123; Sat, 21 Dec 2013 10:24:28 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLAOR9H078117; Sat, 21 Dec 2013 10:24:27 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312211024.rBLAOR9H078117@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 21 Dec 2013 10:24:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337124 - in branches/2014Q1/x11-wm/treewm: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 10:24:28 -0000 Author: mat Date: Sat Dec 21 10:24:27 2013 New Revision: 337124 URL: http://svnweb.freebsd.org/changeset/ports/337124 Log: MFH: r337090 - Fix build with clang - Add LICENSE - Support staging - Reformat pkg-descr PR: ports/184888 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/x11-wm/treewm/files/patch-tile.cc - copied unchanged from r337090, head/x11-wm/treewm/files/patch-tile.cc Modified: branches/2014Q1/x11-wm/treewm/Makefile branches/2014Q1/x11-wm/treewm/pkg-descr (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/x11-wm/treewm/Makefile ============================================================================== --- branches/2014Q1/x11-wm/treewm/Makefile Sat Dec 21 10:23:32 2013 (r337123) +++ branches/2014Q1/x11-wm/treewm/Makefile Sat Dec 21 10:24:27 2013 (r337124) @@ -12,37 +12,40 @@ COMMENT= Window manager that arranges wi LICENSE= GPLv2 -USES= imake:env +OPTIONS_DEFINE= DOCS EXAMPLES USE_BZIP2= yes -USE_GMAKE= yes +USES= gmake imake:env USE_XORG= x11 ice sm xext xmu xpm xt xxf86vm PORTDOCS= AUTHORS ChangeLog INSTALL PROBLEMS README README.tiling TODO PORTEXAMPLES= default.cfg sample.cfg -OPTIONS_DEFINE= DOCS EXAMPLES - -NO_STAGE= yes .include post-patch: - @${REINPLACE_CMD} -e '/^PREFIX/s| =| ?=| ; /^CXXFLAGS/s| =| ?=| ; \ - s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e \ + '/^PREFIX/s| =| ?=| ; \ + /^CXXFLAGS/s| =| ?=| ; \ + s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/treewm ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/xprop/xprop ${PREFIX}/bin/xprop-treewm - ${INSTALL_PROGRAM} ${WRKSRC}/xkill/xkill ${PREFIX}/bin/xkill-treewm - @${MKDIR} ${DATADIR}/pixmaps - ${INSTALL_DATA} ${WRKSRC}/src/pixmaps/*.xpm ${DATADIR}/pixmaps -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif -.if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/|} ${EXAMPLESDIR} -.endif + (cd ${WRKSRC}/src && ${INSTALL_PROGRAM} treewm \ + ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC}/xprop && ${INSTALL_PROGRAM} xprop \ + ${STAGEDIR}${PREFIX}/bin/xprop-treewm) + (cd ${WRKSRC}/xkill && ${INSTALL_PROGRAM} xkill \ + ${STAGEDIR}${PREFIX}/bin/xkill-treewm) + @${MKDIR} ${STAGEDIR}${DATADIR}/pixmaps + (cd ${WRKSRC}/src/pixmaps && ${INSTALL_DATA} *.xpm \ + ${STAGEDIR}${DATADIR}/pixmaps) + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for F in ${PORTDOCS} + (cd ${WRKSRC} && ${INSTALL_DATA} ${F} ${STAGEDIR}${DOCSDIR}) +.endfor + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} +.for F in ${PORTEXAMPLES} + (cd ${WRKSRC} && ${INSTALL_DATA} ${F} ${STAGEDIR}${EXAMPLESDIR}) +.endfor .include Copied: branches/2014Q1/x11-wm/treewm/files/patch-tile.cc (from r337090, head/x11-wm/treewm/files/patch-tile.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/x11-wm/treewm/files/patch-tile.cc Sat Dec 21 10:24:27 2013 (r337124, copy of r337090, head/x11-wm/treewm/files/patch-tile.cc) @@ -0,0 +1,10 @@ +--- src/tile.cc.orig ++++ src/tile.cc +@@ -5,6 +5,7 @@ + #include + #include + //#include ++#include + + /* + * changed<05.02.2003> by Rudolf Polzer: including namespace std (C++) Modified: branches/2014Q1/x11-wm/treewm/pkg-descr ============================================================================== --- branches/2014Q1/x11-wm/treewm/pkg-descr Sat Dec 21 10:23:32 2013 (r337123) +++ branches/2014Q1/x11-wm/treewm/pkg-descr Sat Dec 21 10:24:27 2013 (r337124) @@ -1,21 +1,22 @@ -treewm is a window manager that tries to implement a new concept. In addition -to the client windows the user can create desktops which can themselves contain -windows and desktops. By arranging the windows in such a tree the user is able -to manage his tasks efficiently treewm is feature-rich, flexible and provides -a powerful concept. However, treewm's look is is rather puristic, and its feel -is not always intuitive, but with a bit of practise it should be very effective -to use. +treewm is a window manager that tries to implement a new concept. In +addition to the client windows the user can create desktops which can +themselves contain windows and desktops. By arranging the windows in +such a tree the user is able to manage his tasks efficiently treewm is +feature-rich, flexible and provides a powerful concept. However, +treewm's look is is rather puristic, and its feel is not always +intuitive, but with a bit of practise it should be very effective to +use. Short feature list (some of them are quite unique among window managers): - - - Allows to create desktops and to arbitrarily move windows between desktops - - Many options (such as sticky, autoresize, always on top, or the focus or - raise policy) can be set for any desktop or window + - Allows to create desktops and to arbitrarily move windows between + desktops + - Many options (such as sticky, autoresize, always on top, or the + focus or raise policy) can be set for any desktop or window - Can be fully customized using the configuration file - - Has a very powerful (somewhat vi-like) command mode, and can be controlled - from shell scripts via a FIFO + - Has a very powerful (somewhat vi-like) command mode, and can be + controlled from shell scripts via a FIFO - Icons can be placed on desktops that can execute arbitrary commands - - Only uses very common libraries, in particular it doesn't require GTK, Qt, - or anything like that + - Only uses very common libraries, in particular it doesn't require + GTK, Qt, or anything like that WWW: http://treewm.sourceforge.net/ From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 21 10:25:24 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3A5B48B3; Sat, 21 Dec 2013 10:25:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 268651978; Sat, 21 Dec 2013 10:25:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLAPOSG078339; Sat, 21 Dec 2013 10:25:24 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLAPOWG078338; Sat, 21 Dec 2013 10:25:24 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312211025.rBLAPOWG078338@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 21 Dec 2013 10:25:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337125 - branches/2014Q1/x11-toolkits/gtk20 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 10:25:24 -0000 Author: mat Date: Sat Dec 21 10:25:23 2013 New Revision: 337125 URL: http://svnweb.freebsd.org/changeset/ports/337125 Log: MFH: r337091 Enable explicit depends, this will record X depends in gdk-2.0.pc. This should fix the build of ports that use X libraries but don't explicitly depend on X libraries. Approved by: portmgr (implicit) Modified: branches/2014Q1/x11-toolkits/gtk20/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/x11-toolkits/gtk20/Makefile ============================================================================== --- branches/2014Q1/x11-toolkits/gtk20/Makefile Sat Dec 21 10:24:27 2013 (r337124) +++ branches/2014Q1/x11-toolkits/gtk20/Makefile Sat Dec 21 10:25:23 2013 (r337125) @@ -4,7 +4,7 @@ PORTNAME= gtk PORTVERSION= 2.24.22 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -35,7 +35,7 @@ USES= gettext gmake pathfix pkgconfig p USE_PERL5= build USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite -CONFIGURE_ARGS= --with-xinput=yes +CONFIGURE_ARGS= --with-xinput=yes --enable-explicit-deps CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 21 10:26:25 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CCE32993; Sat, 21 Dec 2013 10:26:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AE8341980; Sat, 21 Dec 2013 10:26:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLAQPuK078561; Sat, 21 Dec 2013 10:26:25 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLAQPt9078559; Sat, 21 Dec 2013 10:26:25 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312211026.rBLAQPt9078559@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 21 Dec 2013 10:26:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337126 - branches/2014Q1/deskutils/tpb X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 10:26:26 -0000 Author: mat Date: Sat Dec 21 10:26:24 2013 New Revision: 337126 URL: http://svnweb.freebsd.org/changeset/ports/337126 Log: MFH: r337092 - Fix build with clang - Add LICENSE - Define OPTIONS, use options subs and helpers - Support staging PR: ports/184889 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Modified: branches/2014Q1/deskutils/tpb/Makefile branches/2014Q1/deskutils/tpb/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/deskutils/tpb/Makefile ============================================================================== --- branches/2014Q1/deskutils/tpb/Makefile Sat Dec 21 10:25:23 2013 (r337125) +++ branches/2014Q1/deskutils/tpb/Makefile Sat Dec 21 10:26:24 2013 (r337126) @@ -5,45 +5,44 @@ PORTNAME= tpb PORTVERSION= 0.6.4 PORTREVISION= 10 CATEGORIES= deskutils -MASTER_SITES= ${MASTER_SITE_SAVANNAH} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SAVANNAH MAINTAINER= ports@FreeBSD.org COMMENT= On-Screen-Display for hotkeys of IBM ThinkPads +LICENSE= GPLv2 + LIB_DEPENDS= libxosd.so:${PORTSDIR}/misc/xosd +OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes + ONLY_FOR_ARCHS= i386 amd64 +USES= bison gmake iconv pkgconfig GNU_CONFIGURE= yes -USES= bison iconv gmake pkgconfig - CONFIGURE_ARGS= ${ICONV_CONFIGURE_ARG} -MAN1= tpb.1 - -NO_STAGE= yes -.include +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALABASE}/lib -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif +NLS_USES= gettext +NLS_CONFIGURE_OFF= --disable-nls post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; \ - s|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/src/cfg.h \ - ${WRKSRC}/man/tpb.1 +.for i in man/tpb.1 src/cfg.h + @${REINPLACE_CMD} -e \ + 's|%%PREFIX%%|${PREFIX}|g ; \ + s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/${i} +.endfor + @${REINPLACE_CMD} -e \ + 's|void test()||' ${WRKSRC}/configure post-install: - ${INSTALL_DATA} ${WRKSRC}/doc/tpbrc ${PREFIX}/etc/tpbrc.default -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/doc/callback_example.sh ${DOCSDIR} -.endif + (cd ${WRKSRC}/doc && ${INSTALL_DATA} tpbrc \ + ${STAGEDIR}${PREFIX}/etc/tpbrc.default) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/doc && ${INSTALL_DATA} callback_example.sh \ + ${STAGEDIR}${DOCSDIR}) .include Modified: branches/2014Q1/deskutils/tpb/pkg-plist ============================================================================== --- branches/2014Q1/deskutils/tpb/pkg-plist Sat Dec 21 10:25:23 2013 (r337125) +++ branches/2014Q1/deskutils/tpb/pkg-plist Sat Dec 21 10:26:24 2013 (r337126) @@ -1,5 +1,6 @@ bin/tpb etc/tpbrc.default +man/man1/tpb.1.gz %%PORTDOCS%%%%DOCSDIR%%/callback_example.sh %%NLS%%share/locale/da/LC_MESSAGES/tpb.mo %%NLS%%share/locale/de/LC_MESSAGES/tpb.mo From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 21 10:27:27 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 11E55A77; Sat, 21 Dec 2013 10:27:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D8E161989; Sat, 21 Dec 2013 10:27:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLARQRt078794; Sat, 21 Dec 2013 10:27:26 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLARQj1078792; Sat, 21 Dec 2013 10:27:26 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312211027.rBLARQj1078792@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 21 Dec 2013 10:27:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337127 - in branches/2014Q1/games/osgg: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 10:27:27 -0000 Author: mat Date: Sat Dec 21 10:27:26 2013 New Revision: 337127 URL: http://svnweb.freebsd.org/changeset/ports/337127 Log: MFH: r337103 - Support staging - Fix segfault when built with clang Approved by: portmgr (implicit) Deleted: branches/2014Q1/games/osgg/pkg-plist Modified: branches/2014Q1/games/osgg/Makefile branches/2014Q1/games/osgg/files/patch-main.cpp Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/osgg/Makefile ============================================================================== --- branches/2014Q1/games/osgg/Makefile Sat Dec 21 10:26:24 2013 (r337126) +++ branches/2014Q1/games/osgg/Makefile Sat Dec 21 10:27:26 2013 (r337127) @@ -16,7 +16,12 @@ USE_GL= yes WRKSRC= ${WRKDIR}/${PORTNAME} -NO_STAGE= yes +PLIST_FILES= bin/${PORTNAME} +PORTDATA= * + +post-extract: + @${FIND} -d ${WRKSRC} -name .svn -exec ${RM} -rf {} \; + post-patch: @${RM} -f ${WRKSRC}/osgg @${REINPLACE_CMD} -e 's|"[a-z]*.txt"|DATADIR&|; s|endian.h|sys/&|' \ @@ -24,16 +29,12 @@ post-patch: do-build: cd ${WRKSRC} && ${CXX} ${CXXFLAGS} `${SDL_CONFIG} --libs --cflags` \ - -lGL -lSDL_image -lSDL_ttf -lSDL_mixer -o osgg \ + -lGL -lSDL_image -lSDL_ttf -lSDL_mixer -o ${PORTNAME} \ -DDATADIR="\"${DATADIR}/\"" \ main.cpp text.cpp sound.cpp do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/osgg ${PREFIX}/bin/ - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/*.txt ${WRKSRC}/*.ogg ${WRKSRC}/Bandal.ttf \ - ${WRKSRC}/icon.png ${DATADIR} - ${MKDIR} ${DATADIR}/levels - ${INSTALL_DATA} ${WRKSRC}/levels/* ${DATADIR}/levels + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ + cd ${WRKSRC} && ${COPYTREE_SHARE} "*.txt *.ogg Bandal.ttf icon.png levels" ${STAGEDIR}${DATADIR}/ .include Modified: branches/2014Q1/games/osgg/files/patch-main.cpp ============================================================================== --- branches/2014Q1/games/osgg/files/patch-main.cpp Sat Dec 21 10:26:24 2013 (r337126) +++ branches/2014Q1/games/osgg/files/patch-main.cpp Sat Dec 21 10:27:26 2013 (r337127) @@ -1,5 +1,5 @@ ---- main.cpp.orig 2013-09-13 20:24:16.310226753 +0400 -+++ main.cpp 2013-09-13 20:24:50.127352703 +0400 +--- main.cpp.orig 2009-03-14 01:46:04.000000000 +0300 ++++ main.cpp 2013-12-21 03:29:52.401817465 +0400 @@ -26,6 +26,7 @@ #include #include @@ -8,3 +8,11 @@ #include +@@ -340,6 +341,7 @@ + } + } + } ++ return false; + } + + void classBullets::shoot(entity owner, gPs velocity) From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 21 10:28:35 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8F8C7C37; Sat, 21 Dec 2013 10:28:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6F1C219C5; Sat, 21 Dec 2013 10:28:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLASZK9079110; Sat, 21 Dec 2013 10:28:35 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLASY8e079107; Sat, 21 Dec 2013 10:28:34 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312211028.rBLASY8e079107@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 21 Dec 2013 10:28:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337129 - in branches/2014Q1/graphics/libecwj2: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 10:28:35 -0000 Author: mat Date: Sat Dec 21 10:28:34 2013 New Revision: 337129 URL: http://svnweb.freebsd.org/changeset/ports/337129 Log: MFH: r337106 - Fix build with the recent clang/gcc [1] - Support staging PR: 185042 [1] Submitted by: Christoph Moench-Tegeder [1] Approved by: maintainer [1] Approved by: portmgr (implicit) Added: branches/2014Q1/graphics/libecwj2/files/patch-Source-C-NCSnet-NCScnet3-NCSProxy.h - copied unchanged from r337106, head/graphics/libecwj2/files/patch-Source-C-NCSnet-NCScnet3-NCSProxy.h Modified: branches/2014Q1/graphics/libecwj2/Makefile branches/2014Q1/graphics/libecwj2/files/patch-Source-NCSBuildGnu-Makefile.in Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/libecwj2/Makefile ============================================================================== --- branches/2014Q1/graphics/libecwj2/Makefile Sat Dec 21 10:27:33 2013 (r337128) +++ branches/2014Q1/graphics/libecwj2/Makefile Sat Dec 21 10:28:34 2013 (r337129) @@ -18,9 +18,9 @@ USE_ZIP= yes USE_AUTOTOOLS= libtool autoconf USE_LDCONFIG= yes GNU_CONFIGURE= yes -USE_GMAKE= yes -NO_STAGE= yes +USES= gmake + .include .if ${OSVERSION} < 800000 Copied: branches/2014Q1/graphics/libecwj2/files/patch-Source-C-NCSnet-NCScnet3-NCSProxy.h (from r337106, head/graphics/libecwj2/files/patch-Source-C-NCSnet-NCScnet3-NCSProxy.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/libecwj2/files/patch-Source-C-NCSnet-NCScnet3-NCSProxy.h Sat Dec 21 10:28:34 2013 (r337129, copy of r337106, head/graphics/libecwj2/files/patch-Source-C-NCSnet-NCScnet3-NCSProxy.h) @@ -0,0 +1,11 @@ +--- Source/C/NCSnet/NCScnet3/NCSProxy.h.orig 2013-12-20 19:22:52.000000000 +0100 ++++ Source/C/NCSnet/NCScnet3/NCSProxy.h 2013-12-20 19:23:26.000000000 +0100 +@@ -35,6 +35,7 @@ + //#include + #include + #include ++#include + #include + #include + #include + Modified: branches/2014Q1/graphics/libecwj2/files/patch-Source-NCSBuildGnu-Makefile.in ============================================================================== --- branches/2014Q1/graphics/libecwj2/files/patch-Source-NCSBuildGnu-Makefile.in Sat Dec 21 10:27:33 2013 (r337128) +++ branches/2014Q1/graphics/libecwj2/files/patch-Source-NCSBuildGnu-Makefile.in Sat Dec 21 10:28:34 2013 (r337129) @@ -1,5 +1,5 @@ ---- Source/NCSBuildGnu/Makefile.in.orig 2006-08-29 11:57:09.000000000 +0400 -+++ Source/NCSBuildGnu/Makefile.in 2010-07-29 19:56:41.000000000 +0400 +--- Source/NCSBuildGnu/Makefile.in.orig 2006-08-29 08:57:09.000000000 +0100 ++++ Source/NCSBuildGnu/Makefile.in 2013-12-21 00:03:30.000000000 +0000 @@ -246,22 +246,6 @@ ../C/NCSEcw/shared_src/qmf_util.c \ ../C/NCSEcw/shared_src/quantize.c \ @@ -96,7 +96,16 @@ @AMDEP_TRUE@ ./$(DEPDIR)/collapse_pyr.Plo \ @AMDEP_TRUE@ ./$(DEPDIR)/compress.Plo ./$(DEPDIR)/dynamiclib.Plo \ @AMDEP_TRUE@ ./$(DEPDIR)/ecw_open.Plo ./$(DEPDIR)/ecw_read.Plo \ -@@ -1321,22 +1262,6 @@ +@@ -1036,8 +977,6 @@ + @list='$(lib_LIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \ +- $(RANLIB) $(DESTDIR)$(libdir)/$$p; \ + else :; fi; \ + done + +@@ -1321,22 +1260,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-NCSWorldFile.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-NCScnet.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-build_pyr.Po@am__quote@ @@ -119,7 +128,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-collapse_pyr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-compress.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-dynamiclib.Po@am__quote@ -@@ -1364,22 +1289,6 @@ +@@ -1364,22 +1287,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-unpack.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-util.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/build_pyr.Plo@am__quote@ @@ -142,7 +151,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collapse_pyr.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dynamiclib.Plo@am__quote@ -@@ -1935,534 +1844,6 @@ +@@ -1935,534 +1842,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(______lib_libecwj2_a_CPPFLAGS) $(CPPFLAGS) $(______lib_libecwj2_a_CFLAGS) $(CFLAGS) -c -o ______lib_libecwj2_a-unpack.lo `test -f '../C/NCSEcw/shared_src/unpack.c' || echo '$(srcdir)/'`../C/NCSEcw/shared_src/unpack.c @@ -677,7 +686,7 @@ ______lib_libecwj2_a-dynamiclib.o: ../C/NCSUtil/dynamiclib.c @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(______lib_libecwj2_a_CPPFLAGS) $(CPPFLAGS) $(______lib_libecwj2_a_CFLAGS) $(CFLAGS) -MT ______lib_libecwj2_a-dynamiclib.o -MD -MP -MF "$(DEPDIR)/______lib_libecwj2_a-dynamiclib.Tpo" \ @am__fastdepCC_TRUE@ -c -o ______lib_libecwj2_a-dynamiclib.o `test -f '../C/NCSUtil/dynamiclib.c' || echo '$(srcdir)/'`../C/NCSUtil/dynamiclib.c; \ -@@ -3288,534 +2669,6 @@ +@@ -3288,534 +2667,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unpack.lo `test -f '../C/NCSEcw/shared_src/unpack.c' || echo '$(srcdir)/'`../C/NCSEcw/shared_src/unpack.c From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 21 10:29:33 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A1870D1D; Sat, 21 Dec 2013 10:29:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8195719CF; Sat, 21 Dec 2013 10:29:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLATXsn079343; Sat, 21 Dec 2013 10:29:33 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLATWch079335; Sat, 21 Dec 2013 10:29:32 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312211029.rBLATWch079335@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 21 Dec 2013 10:29:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337130 - in branches/2014Q1/games/irrlamb: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 10:29:33 -0000 Author: mat Date: Sat Dec 21 10:29:32 2013 New Revision: 337130 URL: http://svnweb.freebsd.org/changeset/ports/337130 Log: MFH: r337111 - Support staging - Fix build on 10.x Approved by: portmgr (implicit) Added: branches/2014Q1/games/irrlamb/files/patch-src-objects-orb.cpp - copied unchanged from r337111, head/games/irrlamb/files/patch-src-objects-orb.cpp branches/2014Q1/games/irrlamb/files/patch-src-objects-player.cpp - copied unchanged from r337111, head/games/irrlamb/files/patch-src-objects-player.cpp Modified: branches/2014Q1/games/irrlamb/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/irrlamb/Makefile ============================================================================== --- branches/2014Q1/games/irrlamb/Makefile Sat Dec 21 10:28:34 2013 (r337129) +++ branches/2014Q1/games/irrlamb/Makefile Sat Dec 21 10:29:32 2013 (r337130) @@ -17,21 +17,20 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libIrrlich USE_LUA= 5.1+ USE_SCONS= yes -USE_DOS2UNIX= src/engine/save.h +USES= scons dos2unix +DOS2UNIX_FILES= src/engine/save.h src/objects/orb.cpp src/objects/player.cpp CPPPATH= ${LOCALBASE}/include ${LUA_INCDIR} LIBPATH= ${LOCALBASE}/lib ${LUA_LIBDIR} WRKSRC= ${WRKDIR}/${PORTNAME} -PORTDOCS= readme.txt changelog.txt -PORTDATA= * - PLIST_FILES= bin/${PORTNAME} +PORTDOCS= * +PORTDATA= * DATA_DIRS= art campaigns collision fonts levels meshes scenes scripts textures -NO_STAGE= yes .include post-patch: @@ -44,14 +43,9 @@ post-patch: @${FIND} ${WRKSRC} -name "*.bak" -delete do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/irrlamb ${PREFIX}/bin -.if !defined(NOPORTDATA) - ${MKDIR} ${DATADIR} - cd ${WRKSRC} && ${COPYTREE_SHARE} "${DATA_DIRS}" ${DATADIR} -.endif -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/ -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/irrlamb ${STAGEDIR}${PREFIX}/bin/ + cd ${WRKSRC} && ${COPYTREE_SHARE} "${DATA_DIRS}" ${STAGEDIR}${DATADIR}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} readme.txt changelog.txt ${STAGEDIR}${DOCSDIR}/ .include Copied: branches/2014Q1/games/irrlamb/files/patch-src-objects-orb.cpp (from r337111, head/games/irrlamb/files/patch-src-objects-orb.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/irrlamb/files/patch-src-objects-orb.cpp Sat Dec 21 10:29:32 2013 (r337130, copy of r337111, head/games/irrlamb/files/patch-src-objects-orb.cpp) @@ -0,0 +1,20 @@ +--- src/objects/orb.cpp.orig 2013-12-19 22:19:20.406056087 +0400 ++++ src/objects/orb.cpp 2013-12-19 22:19:55.234053221 +0400 +@@ -40,7 +40,7 @@ + else + Node->setMaterialTexture(0, irrDriver->getTexture("/home/amdmi3/projects/freebsd/ports/games/irrlamb/prefix/share/irrlamb/textures/orb_outer0.png")); + Node->setMaterialType(EMT_ONETEXTURE_BLEND); +- Node->getMaterial(0).MaterialTypeParam = pack_texureBlendFunc(EBF_ONE, EBF_ONE); ++ Node->getMaterial(0).MaterialTypeParam = pack_textureBlendFunc(EBF_ONE, EBF_ONE); + + // Create glow + //GlowColor = SColor(255, 255, 240, 130); +@@ -50,7 +50,7 @@ + InnerNode->setMaterialFlag(EMF_LIGHTING, false); + InnerNode->setMaterialFlag(EMF_ZBUFFER, false); + InnerNode->setMaterialType(EMT_ONETEXTURE_BLEND); +- InnerNode->getMaterial(0).MaterialTypeParam = pack_texureBlendFunc(EBF_ONE, EBF_ONE); ++ InnerNode->getMaterial(0).MaterialTypeParam = pack_textureBlendFunc(EBF_ONE, EBF_ONE); + if(Template->Textures[1] != "") + InnerNode->setMaterialTexture(0, irrDriver->getTexture(Template->Textures[1].c_str())); + else Copied: branches/2014Q1/games/irrlamb/files/patch-src-objects-player.cpp (from r337111, head/games/irrlamb/files/patch-src-objects-player.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/irrlamb/files/patch-src-objects-player.cpp Sat Dec 21 10:29:32 2013 (r337130, copy of r337111, head/games/irrlamb/files/patch-src-objects-player.cpp) @@ -0,0 +1,20 @@ +--- src/objects/player.cpp.orig 2013-12-19 22:20:16.890052259 +0400 ++++ src/objects/player.cpp 2013-12-19 22:20:57.089132087 +0400 +@@ -45,7 +45,7 @@ + Node->setMaterialType(EMT_TRANSPARENT_ADD_COLOR); + Node->setMaterialFlag(EMF_LIGHTING, false); + Node->setMaterialType(EMT_ONETEXTURE_BLEND); +- Node->getMaterial(0).MaterialTypeParam = pack_texureBlendFunc(EBF_ONE, EBF_ONE); ++ Node->getMaterial(0).MaterialTypeParam = pack_textureBlendFunc(EBF_ONE, EBF_ONE); + + // Light + //Light = irrScene->addLightSceneNode(0, core::vector3df(0.0f, 0.0f, 0.0f), video::SColorf(0.2f, 0.2f, 1.0f), 20.0f); +@@ -57,7 +57,7 @@ + InnerNode->setMaterialFlag(EMF_ZBUFFER, false); + InnerNode->setMaterialTexture(0, irrDriver->getTexture("/home/amdmi3/projects/freebsd/ports/games/irrlamb/prefix/share/irrlamb/textures/player_glow0.png")); + InnerNode->setMaterialType(EMT_ONETEXTURE_BLEND); +- InnerNode->getMaterial(0).MaterialTypeParam = pack_texureBlendFunc(EBF_ONE, EBF_ONE); ++ InnerNode->getMaterial(0).MaterialTypeParam = pack_textureBlendFunc(EBF_ONE, EBF_ONE); + + // Particle system + IParticleSystemSceneNode *ParticleSystem = irrScene->addParticleSystemSceneNode(false, Node); From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 21 10:30:23 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A2245E0A; Sat, 21 Dec 2013 10:30:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8DCB21A24; Sat, 21 Dec 2013 10:30:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLAUNFl079649; Sat, 21 Dec 2013 10:30:23 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLAUN7J079647; Sat, 21 Dec 2013 10:30:23 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312211030.rBLAUN7J079647@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 21 Dec 2013 10:30:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337131 - branches/2014Q1/games/xqf X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 10:30:23 -0000 Author: mat Date: Sat Dec 21 10:30:22 2013 New Revision: 337131 URL: http://svnweb.freebsd.org/changeset/ports/337131 Log: MFH: r337113 - Support staging - Fix build on 10.x - Drop maintainership Approved by: portmgr (implicit) Modified: branches/2014Q1/games/xqf/Makefile branches/2014Q1/games/xqf/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/xqf/Makefile ============================================================================== --- branches/2014Q1/games/xqf/Makefile Sat Dec 21 10:29:32 2013 (r337130) +++ branches/2014Q1/games/xqf/Makefile Sat Dec 21 10:30:22 2013 (r337131) @@ -7,47 +7,41 @@ PORTREVISION= 8 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} -MAINTAINER= amdmi3@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Server browser for many popular 3D action games RUN_DEPENDS= qstat:${PORTSDIR}/games/qstat USE_GNOME= intlhack USES= gettext gmake pkgconfig +USE_XORG= x11 GNU_CONFIGURE= yes - -MAN6= xqf.6 +CONFIGURE_ENV= LIBS="-lX11" # uses XGetWindowAttributes but doesn't link with X11 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= GTK2 GEOIP BZIP2 -OPTIONS_DEFAULT= GTK2 GEOIP BZIP2 +PORTDATA= * +PORTDOCS= * -NO_STAGE= yes -.include +OPTIONS_DEFINE= GTK2 GEOIP BZIP2 DOCS +OPTIONS_DEFAULT=GTK2 GEOIP BZIP2 -.if ${PORT_OPTIONS:MGTK2} -USE_GNOME+= gtk20 -CONFIGURE_ARGS+= --enable-gtk2 -.else -USE_GNOME+= gdkpixbuf -.endif +GTK2_USE= GNOME=gtk20 +GTK2_CONFIGURE_ENABLE= gtk2 -.if ${PORT_OPTIONS:MGEOIP} -LIB_DEPENDS+= GeoIP:${PORTSDIR}/net/GeoIP -.else -CONFIGURE_ARGS+= --disable-geoip -.endif +GEOIP_CONFIGURE_ENABLE= geoip +GEOIP_LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP +BZIP2_CONFIGURE_ENABLE= bzip2 -.if ${PORT_OPTIONS:MBZIP2} -CONFIGURE_ARGS+= --enable-bzip2 +.include + +.if ! ${PORT_OPTIONS:MGTK2} +USE_GNOME+= gdkpixbuf .endif post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/xqfdocs.html ${DOCSDIR} -.endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/xqfdocs.html ${STAGEDIR}${DOCSDIR}/ .include Modified: branches/2014Q1/games/xqf/pkg-plist ============================================================================== --- branches/2014Q1/games/xqf/pkg-plist Sat Dec 21 10:29:32 2013 (r337130) +++ branches/2014Q1/games/xqf/pkg-plist Sat Dec 21 10:30:22 2013 (r337131) @@ -1,7 +1,5 @@ -@comment $FreeBSD$ bin/xqf -@exec mkdir -p %D/lib/xqf -%%PORTDOCS%%%%DOCSDIR%%/xqfdocs.html +man/man6/xqf.6.gz share/locale/ca/LC_MESSAGES/xqf.mo share/locale/da/LC_MESSAGES/xqf.mo share/locale/de/LC_MESSAGES/xqf.mo @@ -15,125 +13,3 @@ share/pixmaps/xqf_22x22.png share/pixmaps/xqf_32x32.png share/pixmaps/xqf_48x48.png share/pixmaps/xqf_48x48_2.png -%%DATADIR%%/default/flags/ae.png -%%DATADIR%%/default/flags/ag.png -%%DATADIR%%/default/flags/ar.png -%%DATADIR%%/default/flags/at.png -%%DATADIR%%/default/flags/au.png -%%DATADIR%%/default/flags/az.png -%%DATADIR%%/default/flags/ba.png -%%DATADIR%%/default/flags/bb.png -%%DATADIR%%/default/flags/bd.png -%%DATADIR%%/default/flags/be.png -%%DATADIR%%/default/flags/bg.png -%%DATADIR%%/default/flags/bh.png -%%DATADIR%%/default/flags/bo.png -%%DATADIR%%/default/flags/br.png -%%DATADIR%%/default/flags/by.png -%%DATADIR%%/default/flags/ca.png -%%DATADIR%%/default/flags/ch.png -%%DATADIR%%/default/flags/cl.png -%%DATADIR%%/default/flags/cn.png -%%DATADIR%%/default/flags/co.png -%%DATADIR%%/default/flags/cr.png -%%DATADIR%%/default/flags/cu.png -%%DATADIR%%/default/flags/cz.png -%%DATADIR%%/default/flags/de.png -%%DATADIR%%/default/flags/dj.png -%%DATADIR%%/default/flags/dk.png -%%DATADIR%%/default/flags/do.png -%%DATADIR%%/default/flags/dz.png -%%DATADIR%%/default/flags/ec.png -%%DATADIR%%/default/flags/ee.png -%%DATADIR%%/default/flags/eg.png -%%DATADIR%%/default/flags/es.png -%%DATADIR%%/default/flags/fi.png -%%DATADIR%%/default/flags/fr.png -%%DATADIR%%/default/flags/gb.png -%%DATADIR%%/default/flags/gd.png -%%DATADIR%%/default/flags/gh.png -%%DATADIR%%/default/flags/gr.png -%%DATADIR%%/default/flags/gt.png -%%DATADIR%%/default/flags/hn.png -%%DATADIR%%/default/flags/hr.png -%%DATADIR%%/default/flags/hu.png -%%DATADIR%%/default/flags/id.png -%%DATADIR%%/default/flags/ie.png -%%DATADIR%%/default/flags/il.png -%%DATADIR%%/default/flags/in.png -%%DATADIR%%/default/flags/iq.png -%%DATADIR%%/default/flags/ir.png -%%DATADIR%%/default/flags/is.png -%%DATADIR%%/default/flags/it.png -%%DATADIR%%/default/flags/jm.png -%%DATADIR%%/default/flags/jo.png -%%DATADIR%%/default/flags/jp.png -%%DATADIR%%/default/flags/kn.png -%%DATADIR%%/default/flags/kp.png -%%DATADIR%%/default/flags/kr.png -%%DATADIR%%/default/flags/kw.png -%%DATADIR%%/default/flags/lan.png -%%DATADIR%%/default/flags/lb.png -%%DATADIR%%/default/flags/lc.png -%%DATADIR%%/default/flags/lt.png -%%DATADIR%%/default/flags/lu.png -%%DATADIR%%/default/flags/lv.png -%%DATADIR%%/default/flags/ly.png -%%DATADIR%%/default/flags/ma.png -%%DATADIR%%/default/flags/mk.png -%%DATADIR%%/default/flags/mt.png -%%DATADIR%%/default/flags/mx.png -%%DATADIR%%/default/flags/ni.png -%%DATADIR%%/default/flags/nl.png -%%DATADIR%%/default/flags/no.png -%%DATADIR%%/default/flags/nz.png -%%DATADIR%%/default/flags/om.png -%%DATADIR%%/default/flags/pa.png -%%DATADIR%%/default/flags/pe.png -%%DATADIR%%/default/flags/pl.png -%%DATADIR%%/default/flags/ps.png -%%DATADIR%%/default/flags/pt.png -%%DATADIR%%/default/flags/py.png -%%DATADIR%%/default/flags/qa.png -%%DATADIR%%/default/flags/ro.png -%%DATADIR%%/default/flags/ru.png -%%DATADIR%%/default/flags/sa.png -%%DATADIR%%/default/flags/sd.png -%%DATADIR%%/default/flags/se.png -%%DATADIR%%/default/flags/si.png -%%DATADIR%%/default/flags/sk.png -%%DATADIR%%/default/flags/so.png -%%DATADIR%%/default/flags/sr.png -%%DATADIR%%/default/flags/sv.png -%%DATADIR%%/default/flags/sy.png -%%DATADIR%%/default/flags/th.png -%%DATADIR%%/default/flags/tn.png -%%DATADIR%%/default/flags/tr.png -%%DATADIR%%/default/flags/tt.png -%%DATADIR%%/default/flags/tw.png -%%DATADIR%%/default/flags/ua.png -%%DATADIR%%/default/flags/us.png -%%DATADIR%%/default/flags/uy.png -%%DATADIR%%/default/flags/vc.png -%%DATADIR%%/default/flags/ve.png -%%DATADIR%%/default/flags/vn.png -%%DATADIR%%/default/flags/ye.png -%%DATADIR%%/default/flags/za.png -%%DATADIR%%/default/gtkrc -%%DATADIR%%/default/splash.png -%%DATADIR%%/default/trayicon/around_frame_1.png -%%DATADIR%%/default/trayicon/around_frame_2.png -%%DATADIR%%/default/trayicon/around_frame_3.png -%%DATADIR%%/default/trayicon/around_frame_4.png -%%DATADIR%%/default/trayicon/busy.ani -%%DATADIR%%/default/trayicon/frame_basic.png -%%DATADIR%%/default/trayicon/ready.ani -%%DATADIR%%/default/trayicon/red_frame_4_4.png -%%DATADIR%%/default/xqf_48x48.png -%%DATADIR%%/qstat.cfg -@dirrm lib/xqf -@dirrm %%DATADIR%%/default/trayicon -@dirrm %%DATADIR%%/default/flags -@dirrm %%DATADIR%%/default -@dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 21 10:31:23 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CB454EE7; Sat, 21 Dec 2013 10:31:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AB9301A30; Sat, 21 Dec 2013 10:31:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLAVNam082164; Sat, 21 Dec 2013 10:31:23 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLAVN0X082162; Sat, 21 Dec 2013 10:31:23 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312211031.rBLAVN0X082162@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 21 Dec 2013 10:31:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337132 - in branches/2014Q1/audio/gtkguitune: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 10:31:24 -0000 Author: mat Date: Sat Dec 21 10:31:22 2013 New Revision: 337132 URL: http://svnweb.freebsd.org/changeset/ports/337132 Log: MFH: r337114 - Fix build with clang - Add LICENSE, desktop entry file - Support staging PR: ports/184891 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/audio/gtkguitune/files/ - copied from r337114, head/audio/gtkguitune/files/ Modified: branches/2014Q1/audio/gtkguitune/Makefile (contents, props changed) branches/2014Q1/audio/gtkguitune/pkg-descr (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/gtkguitune/Makefile ============================================================================== --- branches/2014Q1/audio/gtkguitune/Makefile Sat Dec 21 10:30:22 2013 (r337131) +++ branches/2014Q1/audio/gtkguitune/Makefile Sat Dec 21 10:31:22 2013 (r337132) @@ -3,32 +3,35 @@ PORTNAME= gtkguitune PORTVERSION= 0.8 -PORTREVISION= 3 +DISTVERSIONPREFIX= gtk2- +PORTREVISION= 4 CATEGORIES= audio -MASTER_SITES= http://www.oocities.org/harpin_floh/mysoft/ -DISTNAME= ${PORTNAME}-gtk2-${PORTVERSION} +MASTER_SITES= GENTOO/distfiles \ + http://www.oocities.org/harpin_floh/mysoft/ MAINTAINER= ports@FreeBSD.org COMMENT= Guitar (and other instruments) tuner for GTK+2 -LIB_DEPENDS= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 +LICENSE= GPLv2 # (or later) WRKSRC= ${WRKDIR}/${PORTNAME} USES= pkgconfig -NO_STAGE= yes +USE_GNOME= gtkmm24 GNU_CONFIGURE= yes INSTALLS_ICONS= yes PLIST_FILES= bin/${PORTNAME} \ share/icons/hicolor/scalable/apps/guitune_logo.svg +DESKTOP_ENTRIES="GtkGuitune" "" "guitune_logo" "${PORTNAME}" "" "" + post-patch: @${REINPLACE_CMD} -e \ 's|VERSION=0.7|VERSION=${PORTVERSION}|g' ${WRKSRC}/configure -.for file in guitune.cc main.cc +.for i in guitune.cc main.cc @${REINPLACE_CMD} -e \ - 's|||' ${WRKSRC}/${file} + 's|||' ${WRKSRC}/${i} .endfor .include Modified: branches/2014Q1/audio/gtkguitune/pkg-descr ============================================================================== --- branches/2014Q1/audio/gtkguitune/pkg-descr Sat Dec 21 10:30:22 2013 (r337131) +++ branches/2014Q1/audio/gtkguitune/pkg-descr Sat Dec 21 10:31:22 2013 (r337132) @@ -1,6 +1,7 @@ -gtkguitune is a program for tuning guitars and other instruments. Rather than -using FFT like many programs, it counts the number of triggerings between two -trigger levels in a certain amount of time, which tends to be more accurate for -instrument tuning while requiring less processing than FFT. +gtkguitune is a program for tuning guitars and other instruments. +Rather than using FFT like many programs, it counts the number of +triggerings between two trigger levels in a certain amount of time, +which tends to be more accurate for instrument tuning while requiring +less processing than FFT. WWW: http://www.oocities.com/harpin_floh/kguitune_page.html From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 21 10:32:21 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 368466D; Sat, 21 Dec 2013 10:32:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 08F251A49; Sat, 21 Dec 2013 10:32:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLAWKO1082380; Sat, 21 Dec 2013 10:32:20 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLAWKTZ082379; Sat, 21 Dec 2013 10:32:20 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312211032.rBLAWKTZ082379@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 21 Dec 2013 10:32:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337133 - branches/2014Q1/games/stransball2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 10:32:21 -0000 Author: mat Date: Sat Dec 21 10:32:20 2013 New Revision: 337133 URL: http://svnweb.freebsd.org/changeset/ports/337133 Log: MFH: r337115 - Support staging - Convert USE_GMAKE to USES - Use new LIB_DEPENDS syntax - Fix DOS2UNIX to not corrupt unrelated files Approved by: portmgr (implicit) Deleted: branches/2014Q1/games/stransball2/pkg-plist Modified: branches/2014Q1/games/stransball2/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/stransball2/Makefile ============================================================================== --- branches/2014Q1/games/stransball2/Makefile Sat Dec 21 10:31:22 2013 (r337132) +++ branches/2014Q1/games/stransball2/Makefile Sat Dec 21 10:32:20 2013 (r337133) @@ -12,19 +12,20 @@ DISTNAME= ${PORTNAME}-v${PORTVERSION:C/\ MAINTAINER= amdmi3@FreeBSD.org COMMENT= A sequel to Transball and Transball 2 THRUST-type games -LIB_DEPENDS= SGE:${PORTSDIR}/devel/sdl_sge +LIB_DEPENDS= libSGE.so:${PORTSDIR}/devel/sdl_sge USE_ZIP= yes -USE_GMAKE= yes +USES= gmake dos2unix +DOS2UNIX_FILES= sources/main.cpp USE_SDL= sdl image mixer sound -USE_DOS2UNIX= yes BUILD_WRKSRC= ${WRKSRC}/sources -PORTDOCS= readme.txt +PLIST_FILES= bin/${PORTNAME} +PORTDATA= * +PORTDOCS= * -NO_STAGE= yes -.include +OPTIONS_DEFINE= DOCS post-extract: @${RM} -f ${WRKSRC}/sound/WS_FTP.LOG @@ -36,15 +37,9 @@ post-patch: s|"maps"|"${DATADIR}/maps"|g' do-install: - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/stransball2 ${PREFIX}/bin - ${MKDIR} ${DATADIR} - cd ${WRKSRC} && ${COPYTREE_SHARE} 'graphics sound maps demos' ${DATADIR} - -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} -.for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} -.endfor -.endif + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ + cd ${WRKSRC} && ${COPYTREE_SHARE} 'graphics sound maps demos' ${STAGEDIR}${DATADIR}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}/ .include From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 21 10:33:17 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CB69B18D; Sat, 21 Dec 2013 10:33:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B712B1A51; Sat, 21 Dec 2013 10:33:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLAXH7b082648; Sat, 21 Dec 2013 10:33:17 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLAXHao082646; Sat, 21 Dec 2013 10:33:17 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312211033.rBLAXHao082646@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 21 Dec 2013 10:33:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337134 - in branches/2014Q1/games/flobopuyo: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 10:33:18 -0000 Author: mat Date: Sat Dec 21 10:33:17 2013 New Revision: 337134 URL: http://svnweb.freebsd.org/changeset/ports/337134 Log: MFH: r337116 - Support staging - Fix DOS2UNIX to not corrupt unrelated files Approved by: portmgr (implicit) Added: branches/2014Q1/games/flobopuyo/files/patch-Makefile - copied unchanged from r337116, head/games/flobopuyo/files/patch-Makefile Deleted: branches/2014Q1/games/flobopuyo/pkg-plist Modified: branches/2014Q1/games/flobopuyo/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/flobopuyo/Makefile ============================================================================== --- branches/2014Q1/games/flobopuyo/Makefile Sat Dec 21 10:32:20 2013 (r337133) +++ branches/2014Q1/games/flobopuyo/Makefile Sat Dec 21 10:33:17 2013 (r337134) @@ -12,10 +12,12 @@ EXTRACT_SUFX= .tgz MAINTAINER= amdmi3@FreeBSD.org COMMENT= Clone of the famous PuyoPuyo -USES= bison -USE_GMAKE= yes +USES= bison gmake dos2unix +DOS2UNIX_FILES= IosVector.cpp PuyoGame.cpp USE_SDL= sdl mixer image -USE_DOS2UNIX= yes + +PLIST_FILES= bin/${PORTNAME} +PORTDATA= * DESKTOP_ENTRIES="FloboPuyo" \ "Clone of the famous PuyoPuyo" \ @@ -24,16 +26,7 @@ DESKTOP_ENTRIES="FloboPuyo" \ "Game;BlocksGame;" \ false -NO_STAGE= yes post-extract: @${FIND} ${WRKSRC} -name '._*' -delete -post-patch: - @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's|g++|${CXX}|' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS+=|' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's|^DATADIR=.*$$|DATADIR=${DATADIR}|' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's|^INSTALL_DATADIR=.*$$|INSTALL_DATADIR=${DATADIR}|' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's|^INSTALL_BINDIR=.*$$|INSTALL_BINDIR=${PREFIX}/bin|' ${WRKSRC}/Makefile - .include Copied: branches/2014Q1/games/flobopuyo/files/patch-Makefile (from r337116, head/games/flobopuyo/files/patch-Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/flobopuyo/files/patch-Makefile Sat Dec 21 10:33:17 2013 (r337134, copy of r337116, head/games/flobopuyo/files/patch-Makefile) @@ -0,0 +1,42 @@ +--- Makefile.orig 2013-09-30 06:31:44.043518968 +0400 ++++ Makefile 2013-09-30 06:31:58.306519003 +0400 +@@ -12,9 +12,8 @@ + DEBUG_MODE=false + + # Unix/Linux settings +-PREFIX=/usr/local +-DATADIR=$(PREFIX)/share/games/flobopuyo +-INSTALL_BINDIR=$(DESTDIR)/$(PREFIX)/games ++DATADIR=$(PREFIX)/share/flobopuyo ++INSTALL_BINDIR=$(DESTDIR)/$(PREFIX)/bin + INSTALL_DATADIR=$(DESTDIR)/$(DATADIR) + + # Mac settings +@@ -40,15 +39,12 @@ + # + ############## + +-SDL_CONFIG=sdl-config +-CC=g++ +-CXX=g++ ++CC=${CXX} + +-CFLAGS= -DDATADIR=\"${DATADIR}\" +-LDFLAGS= ++CFLAGS+= -DDATADIR=\"${DATADIR}\" + + ifneq ($(PLATFORM), $(CYGWIN_VERSION)) +-CFLAGS:=$(CFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include ++CFLAGS:=$(CFLAGS) `$(SDL_CONFIG) --cflags` + LDFLAGS:=$(LDFLAGS) `$(SDL_CONFIG) --cflags --libs` + endif + +@@ -110,7 +106,7 @@ + all: prelude flobopuyo + + flobopuyo: ${OBJFILES} +- @echo "[flobopuyo]" && g++ $(CFLAGS) $(LDFLAGS) -o flobopuyo -lSDL_mixer -lSDL_image ${OBJFILES} ++ @echo "[flobopuyo]" && ${CXX} $(CFLAGS) $(LDFLAGS) -o flobopuyo -lSDL_mixer -lSDL_image ${OBJFILES} + @echo "--------------------------------------" + @echo " Compilation finished" + @[ "x`cat WARNINGS | wc -l`" != "x0" ] && echo -e "--------------------------------------\n There have been some warnings:\n" && cat WARNINGS && rm -f WARNINGS && echo "--------------------------------------" || true From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 21 10:34:17 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3EC0D270; Sat, 21 Dec 2013 10:34:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2ABC01A5B; Sat, 21 Dec 2013 10:34:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLAYHl2082847; Sat, 21 Dec 2013 10:34:17 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLAYHui082846; Sat, 21 Dec 2013 10:34:17 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312211034.rBLAYHui082846@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 21 Dec 2013 10:34:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337135 - branches/2014Q1/misc/hotkeys X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 10:34:17 -0000 Author: mat Date: Sat Dec 21 10:34:16 2013 New Revision: 337135 URL: http://svnweb.freebsd.org/changeset/ports/337135 Log: MFH: r337117 misc/hotkeys: Fix build The build requires two additional libraries: Xft and pangoxft Approved by: portmgr (implicit) Modified: branches/2014Q1/misc/hotkeys/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/misc/hotkeys/Makefile ============================================================================== --- branches/2014Q1/misc/hotkeys/Makefile Sat Dec 21 10:33:17 2013 (r337134) +++ branches/2014Q1/misc/hotkeys/Makefile Sat Dec 21 10:34:16 2013 (r337135) @@ -20,7 +20,7 @@ CONFIGURE_ARGS= --with-db3-inc=${BDB_INC --with-db3-lib=${BDB_LIB_DIR} \ --with-db-name=${BDB_LIB_NAME} -USE_XORG= x11 xkbfile xmu +USE_XORG= x11 xkbfile xmu xft GNU_CONFIGURE= yes USE_BDB= yes USES= gmake @@ -39,6 +39,8 @@ post-extract: post-patch: @${REINPLACE_CMD} -e '/^install-exec-am/s/install-sysconfDATA//' \ ${WRKSRC}/src/Makefile.in +post-configure: + ${REINPLACE_CMD} -e 's,-lXinerama,-lXinerama `pkgconf --libs pangoxft`,g' ${WRKSRC}/src/Makefile post-install: @${INSTALL_DATA} ${WRKSRC}/src/hotkeys.conf ${STAGEDIR}${PREFIX}/etc/hotkeys.conf.sample From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 21 10:35:41 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B0857357; Sat, 21 Dec 2013 10:35:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 911191A69; Sat, 21 Dec 2013 10:35:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLAZfSc083141; Sat, 21 Dec 2013 10:35:41 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLAZfxT083139; Sat, 21 Dec 2013 10:35:41 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312211035.rBLAZfxT083139@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 21 Dec 2013 10:35:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337136 - in branches/2014Q1/devel/libffi: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 10:35:41 -0000 Author: mat Date: Sat Dec 21 10:35:40 2013 New Revision: 337136 URL: http://svnweb.freebsd.org/changeset/ports/337136 Log: MFH: r337118 devel/libffi: Fix abort() on ARM related to __clear_cache() The current FreeBSD/ARM __clear_cache() implementation does nothing #if __i386__ || __x86_64__ #else abort(); cognet@ advises this is an issue for anything !Apple that is using the libcompiler_rt provided by Clang on ARM, and requires upstreaming. Additionally, two Python ports (python26 and python31) use devel/libffi for unrelated reasons, so this addresses the related PR for those ports too [2]. - Enable STAGE support - Remove MAN* entries and update pkg-plist accordingly - Add LICENSE - Sort USE/USES section - Use install-strip as the INSTALL_TARGET PR: ports/149167 PR: ports/184517 [2] Approved by: maintainer timeout (2 weeks) Approved by: portmgr (implicit) Added: branches/2014Q1/devel/libffi/files/ - copied from r337118, head/devel/libffi/files/ Modified: branches/2014Q1/devel/libffi/Makefile (contents, props changed) branches/2014Q1/devel/libffi/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/libffi/Makefile ============================================================================== --- branches/2014Q1/devel/libffi/Makefile Sat Dec 21 10:34:16 2013 (r337135) +++ branches/2014Q1/devel/libffi/Makefile Sat Dec 21 10:35:40 2013 (r337136) @@ -3,6 +3,7 @@ PORTNAME= libffi PORTVERSION= 3.0.13 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SOURCEWARE MASTER_SITE_SUBDIR= ${PORTNAME} @@ -10,32 +11,32 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= zeising@FreeBSD.org COMMENT= Foreign Function Interface +LICENSE= MIT + TEST_DEPENDS= runtest:${PORTSDIR}/misc/dejagnu +USES= pathfix pkgconfig +USE_LDCONFIG= yes +GNU_CONFIGURE= yes + OPTIONS_DEFINE= TESTS TESTS_DESC= Include tools for test suite -NO_STAGE= yes .include .if ${PORT_OPTIONS:MTESTS} BUILD_DEPENDS:= ${TEST_DEPENDS} .endif -GNU_CONFIGURE= yes -USE_LDCONFIG= yes -USES= pathfix pkgconfig -PLIST_SUB= PORTVERSION=${PORTVERSION} - +INSTALL_TARGET= install-strip INFO= libffi - -MAN3= ffi.3 ffi_call.3 ffi_prep_cif.3 ffi_prep_cif_var.3 +PLIST_SUB= PORTVERSION=${PORTVERSION} post-install: @${LN} -sf ../lib/libffi-${PORTVERSION}/include/ffi.h \ - ${PREFIX}/include/ + ${STAGEDIR}${PREFIX}/include/ @${LN} -sf ../lib/libffi-${PORTVERSION}/include/ffitarget.h \ - ${PREFIX}/include/ + ${STAGEDIR}${PREFIX}/include/ regression-test: build @cd ${WRKSRC} && ${MAKE} check Modified: branches/2014Q1/devel/libffi/pkg-plist ============================================================================== --- branches/2014Q1/devel/libffi/pkg-plist Sat Dec 21 10:34:16 2013 (r337135) +++ branches/2014Q1/devel/libffi/pkg-plist Sat Dec 21 10:35:40 2013 (r337136) @@ -7,5 +7,9 @@ lib/libffi.la lib/libffi.so lib/libffi.so.6 libdata/pkgconfig/libffi.pc +man/man3/ffi.3.gz +man/man3/ffi_call.3.gz +man/man3/ffi_prep_cif.3.gz +man/man3/ffi_prep_cif_var.3.gz @dirrm lib/libffi-%%PORTVERSION%%/include @dirrm lib/libffi-%%PORTVERSION%% From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 21 13:16:20 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 388EEDEE; Sat, 21 Dec 2013 13:16:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 19FAD14B7; Sat, 21 Dec 2013 13:16:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLDGJf0040970; Sat, 21 Dec 2013 13:16:19 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLDGJs5040967; Sat, 21 Dec 2013 13:16:19 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312211316.rBLDGJs5040967@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 21 Dec 2013 13:16:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337144 - in branches/2014Q1/editors/textroom: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 13:16:20 -0000 Author: mat Date: Sat Dec 21 13:16:19 2013 New Revision: 337144 URL: http://svnweb.freebsd.org/changeset/ports/337144 Log: MFH: r337139 - Fix build on -current - Support desktop-file-utils - Strip textroom binary PR: ports/184893 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Modified: branches/2014Q1/editors/textroom/Makefile branches/2014Q1/editors/textroom/files/patch-application_application.pro (contents, props changed) branches/2014Q1/editors/textroom/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/editors/textroom/Makefile ============================================================================== --- branches/2014Q1/editors/textroom/Makefile Sat Dec 21 12:55:29 2013 (r337143) +++ branches/2014Q1/editors/textroom/Makefile Sat Dec 21 13:16:19 2013 (r337144) @@ -3,27 +3,32 @@ PORTNAME= textroom PORTVERSION= 0.8.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= editors MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Full screen text editor -LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \ - libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26 \ - libcurl.so:${PORTSDIR}/ftp/curl +LICENSE= GPLv3 -USES= qmake shared-mime-info +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ + libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \ + libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26 + +USES= desktop-file-utils pkgconfig qmake +USE_GL= gl USE_SDL= mixer -USE_QT4= moc_build rcc_build uic_build corelib gui xml \ - svg opengl qt3support -QMAKE_ARGS= LOCALBASE=${LOCALBASE} +USE_QT4= moc_build rcc_build uic_build \ + corelib gui opengl qt3support svg xml post-patch: - @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \ - ${WRKSRC}/application/src/textroom.cpp \ - ${WRKSRC}/application/src/getaword.cpp \ - ${WRKSRC}/application/src/optionsdialog.cpp +.for i in getaword.cpp optionsdialog.cpp textroom.cpp + @${REINPLACE_CMD} -e \ + 's|/usr/share|${PREFIX}/share|' ${WRKSRC}/application/src/${i} +.endfor + +post-install: + @${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/textroom .include Modified: branches/2014Q1/editors/textroom/files/patch-application_application.pro ============================================================================== --- branches/2014Q1/editors/textroom/files/patch-application_application.pro Sat Dec 21 12:55:29 2013 (r337143) +++ branches/2014Q1/editors/textroom/files/patch-application_application.pro Sat Dec 21 13:16:19 2013 (r337144) @@ -1,14 +1,14 @@ --- application/application.pro.orig 2011-01-22 03:25:20.000000000 +0100 +++ application/application.pro 2011-02-10 21:37:18.000000000 +0100 -@@ -4,19 +4,20 @@ +@@ -4,20 +4,16 @@ src \ ui -linux-g++ { -+freebsd-g++ { ++unix { INCLUDEPATH += . \ src \ - src/include \ +- src/include \ - /usr/include \ - /usr/include/hunspell \ - /usr/include/libxml++-2.6 \ @@ -18,37 +18,41 @@ - /usr/lib/glib-2.0/include \ - /usr/lib/libxml++-2.6/include \ - /usr/include/SDL -+ $$LOCALBASE/include \ -+ $$LOCALBASE/include/hunspell \ -+ $$LOCALBASE/include/libxml++-2.6 \ -+ $$LOCALBASE/include//libxml++-2.6/include \ -+ $$LOCALBASE/include/glibmm-2.4 \ -+ $$LOCALBASE/lib/glibmm-2.4/include \ -+ $$LOCALBASE/include/glib-2.0 \ -+ $$LOCALBASE/lib/glib-2.0/include \ -+ $$LOCALBASE/lib/libxml++-2.6/include \ -+ $$LOCALBASE/include/SDL - +- ++ src/include ++ PKGCONFIG += \ ++ glib-2.0 \ ++ hunspell \ ++ libcurl \ ++ libxml++-2.6 \ ++ SDL_mixer } -@@ -85,7 +86,7 @@ + macx { +@@ -85,40 +81,33 @@ src/asciireporter.cpp RESOURCES += resource/textroom.qrc \ resource/images/icons-app.qrc -linux-g++ { -+freebsd-g++ { ++unix { CONFIG += release \ ++ link_pkgconfig \ build_all INSTALLS += data \ -@@ -98,27 +99,27 @@ + dict \ + target \ + desktop \ +- uninstaller \ + mime \ + words \ icon - LIBS = -lSDL_mixer \ - -lSDL \ +- LIBS = -lSDL_mixer \ +- -lSDL \ - -lhunspell \ -+ -lhunspell-1.3 \ - -lglibmm-2.4 \ - -lcurl \ - -lxml++-2.6 \ +- -lglibmm-2.4 \ +- -lcurl \ +- -lxml++-2.6 \ ++ LIBS = \ $$TOPDIR/lib/libflo.a - data.path = /usr/share/sounds + data.path = $$PREFIX/share/sounds @@ -68,8 +72,7 @@ + mime.path = $$PREFIX/share/textroom mime.files = resource/desktop/textroom-txr-mime.xml - uninstaller.path = /usr/bin -+ uninstaller.path = $$PREFIX/bin - uninstaller.files = resource/desktop/textroom-uninstall +- uninstaller.files = resource/desktop/textroom-uninstall - dict.path = /usr/share/hunspell + dict.path = $$PREFIX/share/hunspell dict.files = resource/dict/* Modified: branches/2014Q1/editors/textroom/pkg-plist ============================================================================== --- branches/2014Q1/editors/textroom/pkg-plist Sat Dec 21 12:55:29 2013 (r337143) +++ branches/2014Q1/editors/textroom/pkg-plist Sat Dec 21 13:16:19 2013 (r337144) @@ -1,13 +1,12 @@ bin/textroom -bin/textroom-uninstall share/applications/textroom.desktop -share/textroom/textroom-txr-mime.xml -share/textroom/words.txt share/hunspell/tr.aff share/hunspell/tr.dic share/pixmaps/textroom.png share/sounds/keyany.wav share/sounds/keyenter.wav +%%DATADIR%%/textroom-txr-mime.xml +%%DATADIR%%/words.txt +@dirrm %%DATADIR%% @dirrmtry share/sounds @dirrmtry share/hunspell -@dirrm share/textroom From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 21 13:18:17 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6E39AFC5; Sat, 21 Dec 2013 13:18:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 59A4B14ED; Sat, 21 Dec 2013 13:18:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLDIHa9041315; Sat, 21 Dec 2013 13:18:17 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLDIHg5041313; Sat, 21 Dec 2013 13:18:17 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312211318.rBLDIHg5041313@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 21 Dec 2013 13:18:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337145 - in branches/2014Q1/games: flobopuyo stransball2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 13:18:17 -0000 Author: mat Date: Sat Dec 21 13:18:16 2013 New Revision: 337145 URL: http://svnweb.freebsd.org/changeset/ports/337145 Log: MFH: r337141 - Bump PORTREVISIONs after DOS2UNIX fixes as package contents have been changed Suggested by: mat Approved by: portmgr (implicit) Modified: branches/2014Q1/games/flobopuyo/Makefile branches/2014Q1/games/stransball2/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/flobopuyo/Makefile ============================================================================== --- branches/2014Q1/games/flobopuyo/Makefile Sat Dec 21 13:16:19 2013 (r337144) +++ branches/2014Q1/games/flobopuyo/Makefile Sat Dec 21 13:18:16 2013 (r337145) @@ -3,7 +3,7 @@ PORTNAME= flobopuyo PORTVERSION= 0.20 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= games MASTER_SITES= http://www.ios-software.com/flobopuyo/ \ http://mirror.amdmi3.ru/distfiles/ Modified: branches/2014Q1/games/stransball2/Makefile ============================================================================== --- branches/2014Q1/games/stransball2/Makefile Sat Dec 21 13:16:19 2013 (r337144) +++ branches/2014Q1/games/stransball2/Makefile Sat Dec 21 13:18:16 2013 (r337145) @@ -3,7 +3,7 @@ PORTNAME= stransball2 PORTVERSION= 1.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ \ http://braingames.bugreport.nl/stransball2/ From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 21 16:10:50 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8994D4D0; Sat, 21 Dec 2013 16:10:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 69F8C1FAC; Sat, 21 Dec 2013 16:10:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLGAoA5004634; Sat, 21 Dec 2013 16:10:50 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLGAnrr004630; Sat, 21 Dec 2013 16:10:49 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312211610.rBLGAnrr004630@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 21 Dec 2013 16:10:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337152 - in branches/2014Q1/games/galaxyhack: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 16:10:50 -0000 Author: mat Date: Sat Dec 21 16:10:49 2013 New Revision: 337152 URL: http://svnweb.freebsd.org/changeset/ports/337152 Log: MFH: r337147 - Fix build on -current - Update MASTER_SITES - Add desktop entry file - Support staging PR: ports/184895 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Modified: branches/2014Q1/games/galaxyhack/Makefile (contents, props changed) branches/2014Q1/games/galaxyhack/files/patch-Makefile (contents, props changed) branches/2014Q1/games/galaxyhack/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/galaxyhack/Makefile ============================================================================== --- branches/2014Q1/games/galaxyhack/Makefile Sat Dec 21 15:39:36 2013 (r337151) +++ branches/2014Q1/games/galaxyhack/Makefile Sat Dec 21 16:10:49 2013 (r337152) @@ -3,64 +3,69 @@ PORTNAME= galaxyhack PORTVERSION= 1.74 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= games -MASTER_SITES= SF +MASTER_SITES= SF \ + SF/${PORTNAME}/Fleet%20packages/020906:fleets DISTFILES= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= AI script based strategy game +LICENSE= GPLv2 + +BUILD_DEPENDS= winicontoppm:${PORTSDIR}/graphics/netpbm LIB_DEPENDS= libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \ libfreetype.so:${PORTSDIR}/print/freetype2 -USES= dos2unix gmake -USE_BZIP2= yes -USE_SDL= gfx image mixer sdl -WRKSRC= ${WRKDIR}/${PORTNAME}/src - OPTIONS_DEFINE= FLEETS OPTIMIZED_CFLAGS OPTIONS_DEFAULT= OPTIMIZED_CFLAGS -FLEETS_DESC= Install additional fleets +OPTIONS_SUB= yes +FLEETS_DESC= Additional fleets + +WRKSRC= ${WRKDIR}/${PORTNAME}/src +USE_BZIP2= yes +USES= dos2unix gmake +USE_SDL= gfx image mixer sdl ALL_TARGET= ${PORTNAME} + SUB_FILES= ${PORTNAME}-sh -FLEETS_FILE= gh_fleets_020906.zip -NO_STAGE= yes +DESKTOP_ENTRIES="GalaxyHack" "" "${PREFIX}/share/pixmaps/galaxyhack.png" \ + "${PORTNAME}" "" "" + +FLEETS_DISTFILES= gh_fleets_020906.zip:fleets +FLEETS_EXTRACT_DEPENDS= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip +OPTIMIZED_CFLAGS_MAKE_ENV= OPTIMIZED_CFLAGS=YES + .include +post-extract: .if ${PORT_OPTIONS:MFLEETS} -EXTRACT_DEPENDS+= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip -DISTFILES+= ${FLEETS_FILE} -PLIST_SUB+= FLEETS="" -.else -PLIST_SUB+= FLEETS="@comment " + @${MKDIR} ${STAGEDIR}${DATADIR} + @${UNZIP_CMD} -o ${DISTDIR}/${FLEETS_DISTFILES:S/:fleets//} \ + -x "*/CVS/*" "*/.svn/*" -d ${STAGEDIR}${DATADIR} .endif -.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -MAKE_ENV+= OPTIMIZED_CFLAGS=YES -.endif +post-build: + @(winicontoppm ${WRKSRC}/../GalaxyHack.ico | pnmtopng \ + > ${WRKDIR}/galaxyhack.png) do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-sh ${PREFIX}/bin/${PORTNAME} - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/libexec - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/../settings.dat ${DATADIR} + (cd ${WRKDIR} && ${INSTALL_SCRIPT} ${PORTNAME}-sh \ + ${STAGEDIR}${PREFIX}/bin/${PORTNAME}) + (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \ + ${STAGEDIR}${PREFIX}/libexec) + @${MKDIR} ${STAGEDIR}${DATADIR} + (cd ${WRKSRC}/.. && ${INSTALL_DATA} settings.dat \ + ${STAGEDIR}${DATADIR}) .for d in fleets gamedata graphics music standardpictures - ${CP} -R ${WRKSRC}/../${d} ${DATADIR} + @(cd ${WRKSRC}/.. && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}) .endfor -.if ${PORT_OPTIONS:MFLEETS} - @${UNZIP_CMD} -o ${DISTDIR}/${FLEETS_FILE} -x "*/CVS/*" "*/.svn/*" \ - -d ${DATADIR} -.endif - -post-install: - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR} - @${FIND} ${DATADIR} -type f -print0 | \ - ${XARGS} -0 ${CHMOD} ${SHAREMODE} - @${FIND} ${DATADIR} -type d -print0 | \ - ${XARGS} -0 ${CHMOD} ${BINMODE} + @${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps + (cd ${WRKDIR} && ${INSTALL_DATA} galaxyhack.png \ + ${STAGEDIR}/${PREFIX}/share/pixmaps) .include Modified: branches/2014Q1/games/galaxyhack/files/patch-Makefile ============================================================================== --- branches/2014Q1/games/galaxyhack/files/patch-Makefile Sat Dec 21 15:39:36 2013 (r337151) +++ branches/2014Q1/games/galaxyhack/files/patch-Makefile Sat Dec 21 16:10:49 2013 (r337152) @@ -9,7 +9,7 @@ -LDFLAGS = $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lboost_filesystem +CXX ?= g++ +CXXFLAGS += $(shell $(SDL_CONFIG) --cflags) -+LDFLAGS += $(shell $(SDL_CONFIG) --libs) -lSDL_image -lSDL_mixer -lboost_filesystem ++LDFLAGS += $(shell $(SDL_CONFIG) --libs) -lSDL_image -lSDL_mixer -lboost_filesystem -lboost_system + +ifdef OPTIMIZED_CFLAGS +CXXFLAGS += -O3 Modified: branches/2014Q1/games/galaxyhack/pkg-plist ============================================================================== --- branches/2014Q1/games/galaxyhack/pkg-plist Sat Dec 21 15:39:36 2013 (r337151) +++ branches/2014Q1/games/galaxyhack/pkg-plist Sat Dec 21 16:10:49 2013 (r337152) @@ -780,6 +780,7 @@ libexec/galaxyhack %%DATADIR%%/standardpictures/yellow/smallship/kpovieta_ft1.png %%DATADIR%%/standardpictures/yellow/smallship/ss1-hshape-j.png %%DATADIR%%/standardpictures/yellow/smallship/ss2-xshape-j.png +share/pixmaps/galaxyhack.png @dirrm %%DATADIR%%/standardpictures/yellow/smallship @dirrm %%DATADIR%%/standardpictures/yellow/frigate @dirrm %%DATADIR%%/standardpictures/yellow/capship @@ -800,23 +801,6 @@ libexec/galaxyhack @dirrm %%DATADIR%%/music @dirrm %%DATADIR%%/graphics @dirrm %%DATADIR%%/gamedata -%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/yellow/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/yellow/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/yellow/capship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/yellow -%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/red/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/red/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/red/capship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/red -%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/green/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/green/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/green/capship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/green -%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/blue/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/blue/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/blue/capship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures/blue -%%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m/unitpictures %%FLEETS%%@dirrm %%DATADIR%%/fleets/the_m %%FLEETS%%@dirrm %%DATADIR%%/fleets/sitducks %%FLEETS%%@dirrm %%DATADIR%%/fleets/quiters @@ -852,7 +836,6 @@ libexec/galaxyhack %%FLEETS%%@dirrm %%DATADIR%%/fleets/humanoids/unitpictures/green %%FLEETS%%@dirrm %%DATADIR%%/fleets/humanoids/unitpictures/blue/smallship %%FLEETS%%@dirrm %%DATADIR%%/fleets/humanoids/unitpictures/blue/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/humanoids/unitpictures/blue/capship %%FLEETS%%@dirrm %%DATADIR%%/fleets/humanoids/unitpictures/blue %%FLEETS%%@dirrm %%DATADIR%%/fleets/humanoids/unitpictures %%FLEETS%%@dirrm %%DATADIR%%/fleets/humanoids @@ -947,20 +930,12 @@ libexec/galaxyhack %%FLEETS%%@dirrm %%DATADIR%%/fleets/atenyn/unitpictures %%FLEETS%%@dirrm %%DATADIR%%/fleets/atenyn %%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/yellow/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/yellow/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/yellow/capship %%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/yellow %%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/red/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/red/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/red/capship %%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/red %%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/green/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/green/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/green/capship %%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/green %%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/blue/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/blue/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/blue/capship %%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures/blue %%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas/unitpictures %%FLEETS%%@dirrm %%DATADIR%%/fleets/alfarninas @@ -993,38 +968,26 @@ libexec/galaxyhack %%FLEETS%%@dirrm %%DATADIR%%/fleets/The VKY/unitpictures/blue %%FLEETS%%@dirrm %%DATADIR%%/fleets/The VKY/unitpictures %%FLEETS%%@dirrm %%DATADIR%%/fleets/The VKY -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/yellow/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/yellow/frigate %%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/yellow/capship %%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/yellow -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/red/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/red/frigate %%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/red/capship %%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/red -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/green/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/green/frigate %%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/green/capship %%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/green -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/blue/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/blue/frigate %%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/blue/capship %%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures/blue %%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons/unitpictures %%FLEETS%%@dirrm %%DATADIR%%/fleets/Tedingtons %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/yellow/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/yellow/frigate %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/yellow/capship %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/yellow %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/red/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/red/frigate %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/red/capship %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/red %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/green/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/green/frigate %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/green/capship %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/green %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/blue/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/blue/frigate %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/blue/capship %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures/blue %%FLEETS%%@dirrm %%DATADIR%%/fleets/Star Wars/unitpictures @@ -1032,23 +995,6 @@ libexec/galaxyhack %%FLEETS%%@dirrm %%DATADIR%%/fleets/Space Superiority %%FLEETS%%@dirrm %%DATADIR%%/fleets/SS-Rings-2 %%FLEETS%%@dirrm %%DATADIR%%/fleets/SS-Rings -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/yellow/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/yellow/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/yellow/capship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/yellow -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/red/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/red/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/red/capship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/red -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/green/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/green/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/green/capship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/green -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/blue/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/blue/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/blue/capship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures/blue -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers/unitpictures %%FLEETS%%@dirrm %%DATADIR%%/fleets/Rushers %%FLEETS%%@dirrm %%DATADIR%%/fleets/Renennians %%FLEETS%%@dirrm %%DATADIR%%/fleets/Qurennians @@ -1074,41 +1020,7 @@ libexec/galaxyhack %%FLEETS%%@dirrm %%DATADIR%%/fleets/Orbital V2 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Orbital %%FLEETS%%@dirrm %%DATADIR%%/fleets/Omicron -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/yellow/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/yellow/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/yellow/capship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/yellow -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/red/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/red/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/red/capship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/red -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/green/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/green/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/green/capship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/green -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/blue/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/blue/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/blue/capship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures/blue -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers/unitpictures %%FLEETS%%@dirrm %%DATADIR%%/fleets/MiserableStingers -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/yellow/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/yellow/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/yellow/capship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/yellow -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/red/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/red/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/red/capship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/red -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/green/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/green/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/green/capship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/green -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/blue/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/blue/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/blue/capship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures/blue -%%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM/unitpictures %%FLEETS%%@dirrm %%DATADIR%%/fleets/MMM %%FLEETS%%@dirrm %%DATADIR%%/fleets/Kpovieta %%FLEETS%%@dirrm %%DATADIR%%/fleets/Kamikaza @@ -1133,39 +1045,23 @@ libexec/galaxyhack %%FLEETS%%@dirrm %%DATADIR%%/fleets/IR2 The Swarm/unitpictures %%FLEETS%%@dirrm %%DATADIR%%/fleets/IR2 The Swarm %%FLEETS%%@dirrm %%DATADIR%%/fleets/IR Evadies -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/yellow/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/yellow/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/yellow/capship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/yellow %%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/red/smallship %%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/red/frigate %%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/red/capship %%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/red -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/green/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/green/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/green/capship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/green -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/blue/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/blue/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/blue/capship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures/blue %%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset/unitpictures %%FLEETS%%@dirrm %%DATADIR%%/fleets/Hirvikankaalaiset %%FLEETS%%@dirrm %%DATADIR%%/fleets/Ghost v1 %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/yellow/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/yellow/frigate %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/yellow/capship %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/yellow %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/red/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/red/frigate %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/red/capship %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/red %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/green/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/green/frigate %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/green/capship %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/green %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/blue/smallship -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/blue/frigate %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/blue/capship %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures/blue %%FLEETS%%@dirrm %%DATADIR%%/fleets/Fereans/unitpictures @@ -1192,19 +1088,15 @@ libexec/galaxyhack %%FLEETS%%@dirrm %%DATADIR%%/fleets/Cowards %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/yellow/smallship %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/yellow/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/yellow/capship %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/yellow %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/red/smallship %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/red/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/red/capship %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/red %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/green/smallship %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/green/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/green/capship %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/green %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/blue/smallship %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/blue/frigate -%%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/blue/capship %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures/blue %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans/unitpictures %%FLEETS%%@dirrm %%DATADIR%%/fleets/Carcinogeneticans