From owner-svn-ports-branches@FreeBSD.ORG Sun Jan 5 14:55:53 2014 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 C29DCF7A; Sun, 5 Jan 2014 14:55: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 A316C178D; Sun, 5 Jan 2014 14:55: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 s05EtrAN024338; Sun, 5 Jan 2014 14:55:53 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s05Etq4A024331; Sun, 5 Jan 2014 14:55:52 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201401051455.s05Etq4A024331@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sun, 5 Jan 2014 14:55:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r338781 - in branches/2014Q1/net/vde: . 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: Sun, 05 Jan 2014 14:55:53 -0000 Author: rakuco Date: Sun Jan 5 14:55:52 2014 New Revision: 338781 URL: http://svnweb.freebsd.org/changeset/ports/338781 Log: MFH: r338523 - Fix the build when gcc is not present. - Support staging. - Set LICENSE. - Switch from USE_GMAKE to USES=gmake. Approved by: portmgr (erwin) Modified: branches/2014Q1/net/vde/Makefile branches/2014Q1/net/vde/files/patch-Makefile branches/2014Q1/net/vde/files/patch-qemu::Makefile branches/2014Q1/net/vde/files/patch-slirpvde::Makefile branches/2014Q1/net/vde/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net/vde/Makefile ============================================================================== --- branches/2014Q1/net/vde/Makefile Sun Jan 5 14:16:37 2014 (r338780) +++ branches/2014Q1/net/vde/Makefile Sun Jan 5 14:55:52 2014 (r338781) @@ -10,17 +10,15 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= User-mode virtual ethernet infrastructure +LICENSE= GPLv2 + CONFLICTS= vde2-[0-9]* -USE_GMAKE= yes +MAKE_ARGS= CC="${CC}" USE_LDCONFIG= yes USE_CSTD= gnu89 +USES= gmake -NO_STAGE= yes -.include - -CFLAGS+= ${CPPFLAGS} -fPIC - -MAN1= dpipe.1 slirpvde.1 vdetaplib.1 vdeq.1 vde_plug.1 vde_switch.1 +CFLAGS+= -fPIC -.include +.include Modified: branches/2014Q1/net/vde/files/patch-Makefile ============================================================================== --- branches/2014Q1/net/vde/files/patch-Makefile Sun Jan 5 14:16:37 2014 (r338780) +++ branches/2014Q1/net/vde/files/patch-Makefile Sun Jan 5 14:55:52 2014 (r338781) @@ -1,5 +1,5 @@ ---- Makefile Sat Jan 29 15:02:08 2005 -+++ Makefile Sun Jan 30 13:46:59 2005 +--- Makefile.orig 2004-08-27 10:24:43.000000000 +0300 ++++ Makefile 2014-01-03 07:27:47.000000000 +0200 @@ -1,14 +1,15 @@ -TUNTAP = $(shell [ -e /usr/include/linux/if_tun.h ] && echo -DTUNTAP) +TUNTAP = $(shell [ -e /usr/include/net/if_tun.h ] && echo -DTUNTAP) @@ -15,9 +15,9 @@ -LIB_DIR ?= /usr/local/lib -MAN_DIR ?= /usr/local/man +PREFIX ?= /usr/local -+BIN_DIR ?= $(PREFIX)/bin -+LIB_DIR ?= $(PREFIX)/lib -+MAN_DIR ?= $(PREFIX)/man ++BIN_DIR ?= $(DESTDIR)$(PREFIX)/bin ++LIB_DIR ?= $(DESTDIR)$(PREFIX)/lib ++MAN_DIR ?= $(DESTDIR)$(PREFIX)/man ifneq ($(TUNTAP),) OBJS += tuntap.o Modified: branches/2014Q1/net/vde/files/patch-qemu::Makefile ============================================================================== --- branches/2014Q1/net/vde/files/patch-qemu::Makefile Sun Jan 5 14:16:37 2014 (r338780) +++ branches/2014Q1/net/vde/files/patch-qemu::Makefile Sun Jan 5 14:55:52 2014 (r338781) @@ -1,8 +1,22 @@ ---- qemu/Makefile Sat Jan 29 15:02:08 2005 -+++ qemu/Makefile Sun Jan 30 12:59:52 2005 +--- qemu/Makefile.orig 2004-08-27 10:34:33.000000000 +0300 ++++ qemu/Makefile 2014-01-03 07:32:14.000000000 +0200 @@ -1,4 +1,4 @@ -ALL: vdeq +all: vdeq vdeq.o: vdeq.c ../vde.h +@@ -6,10 +6,9 @@ + $(CC) -o vdeq vdeq.o + + install : vdeq +- install -d $(DESTDIR)$(BIN_DIR) +- install -s vdeq $(DESTDIR)$(BIN_DIR) +- rm -f $(DESTDIR)$(BIN_DIR)/vdeqemu +- ln -s $(DESTDIR)$(BIN_DIR)/vdeq $(DESTDIR)$(BIN_DIR)/vdeqemu ++ install -d $(BIN_DIR) ++ install -s vdeq $(BIN_DIR) ++ ln -sf vdeq $(BIN_DIR)/vdeqemu + + clean: + rm -f *.o vdeq Modified: branches/2014Q1/net/vde/files/patch-slirpvde::Makefile ============================================================================== --- branches/2014Q1/net/vde/files/patch-slirpvde::Makefile Sun Jan 5 14:16:37 2014 (r338780) +++ branches/2014Q1/net/vde/files/patch-slirpvde::Makefile Sun Jan 5 14:55:52 2014 (r338781) @@ -1,5 +1,5 @@ ---- slirpvde/Makefile Sat Jan 29 15:02:08 2005 -+++ slirpvde/Makefile Sun Jan 30 14:02:57 2005 +--- slirpvde/Makefile.orig 2004-06-03 18:19:40.000000000 +0300 ++++ slirpvde/Makefile 2014-01-03 07:25:37.000000000 +0200 @@ -3,7 +3,7 @@ tcp_timer.o udp.o \ bootp.o @@ -9,7 +9,7 @@ all: libslirp.a slirpvde -@@ -34,7 +34,7 @@ +@@ -34,12 +34,12 @@ udp.o: udp.c ip_icmp.h slirpvde: slirpvde.o libslirp.a @@ -18,3 +18,10 @@ clean: rm -rf *.o slirpvde libslirp.a + + install : slirpvde +- install -d $(DESTDIR)$(BIN_DIR) +- install -s slirpvde $(DESTDIR)$(BIN_DIR) ++ install -d $(BIN_DIR) ++ install -s slirpvde $(BIN_DIR) + Modified: branches/2014Q1/net/vde/pkg-plist ============================================================================== --- branches/2014Q1/net/vde/pkg-plist Sun Jan 5 14:16:37 2014 (r338780) +++ branches/2014Q1/net/vde/pkg-plist Sun Jan 5 14:55:52 2014 (r338781) @@ -6,3 +6,9 @@ bin/vdeq bin/vdeqemu bin/vdetap lib/libvdetap.so +man/man1/dpipe.1.gz +man/man1/slirpvde.1.gz +man/man1/vdetaplib.1.gz +man/man1/vdeq.1.gz +man/man1/vde_plug.1.gz +man/man1/vde_switch.1.gz From owner-svn-ports-branches@FreeBSD.ORG Sun Jan 5 19:52:21 2014 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 20778A96; Sun, 5 Jan 2014 19:52: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 0C8E31EA1; Sun, 5 Jan 2014 19:52: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 s05JqKZH048366; Sun, 5 Jan 2014 19:52:20 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s05JqKJA048364; Sun, 5 Jan 2014 19:52:20 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201401051952.s05JqKJA048364@svn.freebsd.org> From: Antoine Brodin Date: Sun, 5 Jan 2014 19:52:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r338820 - in branches/2014Q1/x11-wm/ede: . 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: Sun, 05 Jan 2014 19:52:21 -0000 Author: antoine Date: Sun Jan 5 19:52:20 2014 New Revision: 338820 URL: http://svnweb.freebsd.org/changeset/ports/338820 Log: MFH: r338818 Fix build with clang PR: ports/184859 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/x11-wm/ede/files/ - copied from r338818, head/x11-wm/ede/files/ Modified: branches/2014Q1/x11-wm/ede/Makefile branches/2014Q1/x11-wm/ede/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/x11-wm/ede/Makefile ============================================================================== --- branches/2014Q1/x11-wm/ede/Makefile Sun Jan 5 19:44:38 2014 (r338819) +++ branches/2014Q1/x11-wm/ede/Makefile Sun Jan 5 19:52:20 2014 (r338820) @@ -3,7 +3,7 @@ PORTNAME= ede PORTVERSION= 2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm MASTER_SITES= SF \ SF/${PORTNAME}/${PORTNAME}lib/${PORTVERSION}:edelib @@ -16,21 +16,19 @@ COMMENT= Equinox Desktop Environment LICENSE= GPLv2 LGPL20 LICENSE_COMB= multi -BUILD_DEPENDS= python:${PORTSDIR}/lang/python \ - doxygen:${PORTSDIR}/devel/doxygen \ +BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen \ jam:${PORTSDIR}/devel/jam \ - update-mime-database:${PORTSDIR}/misc/shared-mime-info -LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus \ - curl:${PORTSDIR}/ftp/curl \ - startup-notification-1.0:${PORTSDIR}/x11/startup-notification \ - fltk.1:${PORTSDIR}/x11-toolkits/fltk -RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info + python:${PORTSDIR}/lang/python +LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ + libcurl.so:${PORTSDIR}/ftp/curl \ + libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \ + libfltk.so:${PORTSDIR}/x11-toolkits/fltk OPTIONS_DEFINE= HAL HAL_DESC= Enable HAL support +USES= iconv gettext pathfix pkgconfig shared-mime-info USE_XORG= xcomposite xft xinerama xpm xrandr -USES= pathfix gettext pkgconfig USE_PYTHON= yes USE_FAM= yes GNU_CONFIGURE= yes @@ -53,15 +51,16 @@ EDELIB_WRKSRC= ${WRKDIR}/${EDELIB_DISTNA HAL_LIB_DEPENDS= libhal.so.1:${PORTSDIR}/sysutils/hal HAL_CONFIGURE_OFF= --disable-hal -# use multiple make jobs -_make_jobs= -j${MAKE_JOBS_NUMBER} - -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e \ 's|/usr/local/share|${LOCALBASE}/share| ; \ /OPTIM_FLAGS=/s|-O2|-fPIC| ; \ s|_daylight=yes|_daylight=no|' ${EDELIB_WRKSRC}/configure + @${REINPLACE_CMD} -e \ + 's| -liconv| ${ICONV_LIB}|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + 's|$$(CC)|@CXX@| ; \ + s|-lstdc++||' ${WRKSRC}/Jamconfig.in pre-configure: @(cd ${EDELIB_WRKSRC} \ @@ -75,14 +74,25 @@ pre-configure: pre-build: @(cd ${EDELIB_WRKSRC} \ - && ${LOCALBASE}/bin/jam ${_make_jobs} \ + && ${LOCALBASE}/bin/jam -j${MAKE_JOBS_NUMBER} \ && ${LOCALBASE}/bin/jam ${INSTALL_TARGET}) do-build: - @(cd ${BUILD_WRKSRC} && ${LOCALBASE}/bin/jam ${_make_jobs}) + @(cd ${BUILD_WRKSRC} && ${LOCALBASE}/bin/jam -j${MAKE_JOBS_NUMBER}) do-install: - @(cd ${INSTALL_WRKSRC} && ${LOCALBASE}/bin/jam ${INSTALL_TARGET}) - @-update-mime-database ${PREFIX}/share/mime + @(cd ${INSTALL_WRKSRC} && ${SETENV} DESTDIR="${STAGEDIR}" \ + ${LOCALBASE}/bin/jam ${INSTALL_TARGET}) + @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ede-2.0.0/manual/images + @(cd ${WRKSRC}/doc/manual/images && ${COPYTREE_SHARE} . \ + ${STAGEDIR}${PREFIX}/share/doc/ede-2.0.0/manual/images) +.for i in ede-about ede-autostart ede-bell-conf ede-bug-report ede-crasher \ + ede-calc ede-conf ede-desktop ede-desktop-conf ede-dialog \ + ede-keyboard-conf ede-notify-daemon ede-screensaver-conf \ + ede-image-view ede-launch emountd ede-timedate ede-tip \ + ede-tip-compiler ede-preferred-applications evoke ede-shutdown \ + ede-panel ede-menu-spec-test pekwm + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i} +.endfor .include Modified: branches/2014Q1/x11-wm/ede/pkg-plist ============================================================================== --- branches/2014Q1/x11-wm/ede/pkg-plist Sun Jan 5 19:44:38 2014 (r338819) +++ branches/2014Q1/x11-wm/ede/pkg-plist Sun Jan 5 19:52:20 2014 (r338820) @@ -1555,5 +1555,3 @@ share/xsessions/ede.desktop @dirrm etc/xdg/ede @dirrmtry etc/xdg @dirrm etc/pekwm -@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime From owner-svn-ports-branches@FreeBSD.ORG Mon Jan 6 15:56:20 2014 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 4B9CA9C; Mon, 6 Jan 2014 15:56: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 362C41ED4; Mon, 6 Jan 2014 15:56: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 s06FuK8Z019163; Mon, 6 Jan 2014 15:56:20 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s06FuI1p019156; Mon, 6 Jan 2014 15:56:18 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201401061556.s06FuI1p019156@svn.freebsd.org> From: Brooks Davis Date: Mon, 6 Jan 2014 15:56:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r338900 - in branches/2014Q1: devel/llvm34 devel/llvm34/files lang/clang34 lang/clang34/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, 06 Jan 2014 15:56:20 -0000 Author: brooks Date: Mon Jan 6 15:56:18 2014 New Revision: 338900 URL: http://svnweb.freebsd.org/changeset/ports/338900 Log: MFH: r338603 Upgrade to 3.4rc3. Install altivec.h and cpuid.h so it is possible to compile things. PR: ports/184770, ports/185058 Approved by: portmgr (bapt), portmgr-lurkers (mat) Deleted: branches/2014Q1/devel/llvm34/files/patch-svn-195411 Modified: branches/2014Q1/devel/llvm34/Makefile branches/2014Q1/devel/llvm34/distinfo branches/2014Q1/lang/clang34/Makefile branches/2014Q1/lang/clang34/distinfo branches/2014Q1/lang/clang34/files/patch-tools_clang_lib_Headers_Makefile branches/2014Q1/lang/clang34/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/llvm34/Makefile ============================================================================== --- branches/2014Q1/devel/llvm34/Makefile Mon Jan 6 15:34:53 2014 (r338899) +++ branches/2014Q1/devel/llvm34/Makefile Mon Jan 6 15:56:18 2014 (r338900) @@ -1,12 +1,11 @@ # $FreeBSD$ PORTNAME= llvm -DISTVERSION= 3.4rc2 -PORTREVISION= 1 +DISTVERSION= 3.4rc3 CATEGORIES= devel lang -MASTER_SITES= http://llvm.org/pre-releases/3.4/rc2/ +MASTER_SITES= http://llvm.org/pre-releases/3.4/rc3/ #MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ -DISTNAME= ${PORTNAME}.src-${DISTVERSION}-source +DISTNAME= ${PORTNAME}-${DISTVERSION}.source PKGNAMESUFFIX= ${LLVM_SUFFIX} MAINTAINER= brooks@FreeBSD.org @@ -23,7 +22,6 @@ UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} WRKSRC= ${WRKDIR}/llvm.src USES= gmake perl5 -USE_XZ= yes GNU_CONFIGURE= yes GNU_CONFIGURE_PREFIX= ${LLVM_PREFIX} USE_LDCONFIG= ${LLVM_PREFIX}/lib Modified: branches/2014Q1/devel/llvm34/distinfo ============================================================================== --- branches/2014Q1/devel/llvm34/distinfo Mon Jan 6 15:34:53 2014 (r338899) +++ branches/2014Q1/devel/llvm34/distinfo Mon Jan 6 15:56:18 2014 (r338900) @@ -1,2 +1,2 @@ -SHA256 (llvm.src-3.4rc2-source.tar.xz) = d9345fe68f1bc60d7aa4d6be559b7fa6d1c16ebfcfb9a8340e6d8beac0f073cc -SIZE (llvm.src-3.4rc2-source.tar.xz) = 10490924 +SHA256 (llvm-3.4rc3.source.tar.gz) = 606b632e01bd57718f2a4607cbde64a113219e649b55439355404285be83f9cb +SIZE (llvm-3.4rc3.source.tar.gz) = 15561407 Modified: branches/2014Q1/lang/clang34/Makefile ============================================================================== --- branches/2014Q1/lang/clang34/Makefile Mon Jan 6 15:34:53 2014 (r338899) +++ branches/2014Q1/lang/clang34/Makefile Mon Jan 6 15:56:18 2014 (r338900) @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= clang -DISTVERSION= 3.4rc2 +DISTVERSION= 3.4rc3 CATEGORIES= lang devel -MASTER_SITES= http://llvm.org/pre-releases/3.4/rc2/ +MASTER_SITES= http://llvm.org/pre-releases/3.4/rc3/ #MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ PKGNAMESUFFIX= ${LLVM_SUFFIX} DISTNAME= ${CLANG_NAME} @@ -13,10 +13,10 @@ DISTFILES= ${CLANG_SOURCE} \ MAINTAINER= brooks@FreeBSD.org COMMENT= C, Objective-C, and C++ compiler -CLANG_NAME= cfe.src-${DISTVERSION}-source +CLANG_NAME= cfe-${DISTVERSION}.source CLANG_SOURCE= ${CLANG_NAME}${EXTRACT_SUFX} CLANG_EXTRACT= cfe.src -LLVM_NAME= llvm.src-${DISTVERSION}-source +LLVM_NAME= llvm-${DISTVERSION}.source LLVM_SOURCE= ${LLVM_NAME}${EXTRACT_SUFX} LLVM_EXTRACT= llvm.src LIBNAME= libLLVM-${DISTVERSION:C/rc[0-9]//}.so @@ -38,7 +38,6 @@ GNU_CONFIGURE_PREFIX= ${LLVM_PREFIX} USES= gmake perl5 USE_LDCONFIG= yes USE_PYTHON_BUILD= yes -USE_XZ= yes MAKE_ARGS= CLANG_TBLGEN=${WRKSRC}/${RELTYPE}/bin/clang-tblgen \ LLVMIncDir=${LLVM_PREFIX}/include \ Modified: branches/2014Q1/lang/clang34/distinfo ============================================================================== --- branches/2014Q1/lang/clang34/distinfo Mon Jan 6 15:34:53 2014 (r338899) +++ branches/2014Q1/lang/clang34/distinfo Mon Jan 6 15:56:18 2014 (r338900) @@ -1,4 +1,4 @@ -SHA256 (cfe.src-3.4rc2-source.tar.xz) = 406e95d56e9078de51e5a290ab5c2330ccb900a0c6373cd0f0dc86bf1017f0bb -SIZE (cfe.src-3.4rc2-source.tar.xz) = 7618328 -SHA256 (llvm.src-3.4rc2-source.tar.xz) = d9345fe68f1bc60d7aa4d6be559b7fa6d1c16ebfcfb9a8340e6d8beac0f073cc -SIZE (llvm.src-3.4rc2-source.tar.xz) = 10490924 +SHA256 (cfe-3.4rc3.source.tar.gz) = 62300ac32551ee333ef21e875f8dd1d2f7275cafc13ad35b7e2df85d284fa6c0 +SIZE (cfe-3.4rc3.source.tar.gz) = 10440545 +SHA256 (llvm-3.4rc3.source.tar.gz) = 606b632e01bd57718f2a4607cbde64a113219e649b55439355404285be83f9cb +SIZE (llvm-3.4rc3.source.tar.gz) = 15561407 Modified: branches/2014Q1/lang/clang34/files/patch-tools_clang_lib_Headers_Makefile ============================================================================== --- branches/2014Q1/lang/clang34/files/patch-tools_clang_lib_Headers_Makefile Mon Jan 6 15:34:53 2014 (r338899) +++ branches/2014Q1/lang/clang34/files/patch-tools_clang_lib_Headers_Makefile Mon Jan 6 15:56:18 2014 (r338900) @@ -8,7 +8,7 @@ $FreeBSD$ HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include -HEADERS := $(notdir $(wildcard $(PROJ_SRC_DIR)/*.h)) -+HEADERS := $(notdir $(wildcard $(PROJ_SRC_DIR)/*intrin*.h) mm3dnow.h mm_malloc.h) ++HEADERS := $(notdir $(wildcard $(PROJ_SRC_DIR)/*intrin*.h) altivec.h cpuid.h mm3dnow.h mm_malloc.h) OBJHEADERS := $(addprefix $(HeaderDir)/, $(HEADERS)) Modified: branches/2014Q1/lang/clang34/pkg-plist ============================================================================== --- branches/2014Q1/lang/clang34/pkg-plist Mon Jan 6 15:34:53 2014 (r338899) +++ branches/2014Q1/lang/clang34/pkg-plist Mon Jan 6 15:56:18 2014 (r338900) @@ -422,12 +422,14 @@ llvm%%LLVM_SUFFIX%%/include/clang/Toolin llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Tooling.h llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/__wmmintrin_aes.h llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/__wmmintrin_pclmul.h +llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/altivec.h llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/ammintrin.h llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/arm_neon.h llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/avx2intrin.h llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/avxintrin.h llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/bmi2intrin.h llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/bmiintrin.h +llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/cpuid.h llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/emmintrin.h llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/f16cintrin.h llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/fma4intrin.h From owner-svn-ports-branches@FreeBSD.ORG Tue Jan 7 23:21:36 2014 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 4E8F45E3; Tue, 7 Jan 2014 23:21: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 201D019FD; Tue, 7 Jan 2014 23:21: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 s07NLZmH051871; Tue, 7 Jan 2014 23:21:35 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s07NLZKU051868; Tue, 7 Jan 2014 23:21:35 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201401072321.s07NLZKU051868@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 7 Jan 2014 23:21:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339048 - branches/2014Q1/cad/meshlab/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, 07 Jan 2014 23:21:36 -0000 Author: mat Date: Tue Jan 7 23:21:35 2014 New Revision: 339048 URL: http://svnweb.freebsd.org/changeset/ports/339048 Log: MFH: r339043 Fix build with gcc47 PR: ports/184565 Submitted by: Christoph Moench-Tegeder Approved by: maintainer Approved by: portmgr (implicit) Added: branches/2014Q1/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h - copied unchanged from r339043, head/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h branches/2014Q1/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h - copied unchanged from r339043, head/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h Deleted: branches/2014Q1/cad/meshlab/files/patch-vcglib-vcg-space_deprecated_point.h Modified: Directory Properties: branches/2014Q1/ (props changed) Copied: branches/2014Q1/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h (from r339043, head/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h Tue Jan 7 23:21:35 2014 (r339048, copy of r339043, head/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h) @@ -0,0 +1,15 @@ +--- ../../meshlab/src/meshlabplugins/decorate_base/colorhistogram.h.orig 2013-11-16 22:04:41.000000000 +0100 ++++ ../../meshlab/src/meshlabplugins/decorate_base/colorhistogram.h 2013-11-16 22:04:56.000000000 +0100 +@@ -39,10 +39,11 @@ + //ScalarType BinWidth(ScalarType v); + + //! Reset histogram data. ++ /* dead code + void Clear() { + this->::Clear(); + CV.clear(); +- } ++ } */ + /* + Note that the histogram holds valid bins plus two semi-infinite bins. + Copied: branches/2014Q1/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h (from r339043, head/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h Tue Jan 7 23:21:35 2014 (r339048, copy of r339043, head/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h) @@ -0,0 +1,18 @@ +--- ../../vcglib/wrap/gl/trimesh.h.orig 2013-11-16 21:32:47.000000000 +0100 ++++ ../../vcglib/wrap/gl/trimesh.h 2013-11-16 21:33:23.000000000 +0100 +@@ -895,6 +895,7 @@ + #define VCTRACE (void)0 + //#define VCTRACE TRACE + ++/* dead code + template + void Crease(MESH_TYPE &m, typename MESH_TYPE::scalar_type angleRad) + { +@@ -1006,6 +1007,7 @@ + m.vert.math::Swap(newvert); + m.vn=m.vert.size(); + } ++*/ + + /* + Secondo tipo di crease angle. ha bisogno del per wedge normal From owner-svn-ports-branches@FreeBSD.ORG Tue Jan 7 23:22:59 2014 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 14C476D7; Tue, 7 Jan 2014 23:22: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 F3E801A0D; Tue, 7 Jan 2014 23:22: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 s07NMwJJ052377; Tue, 7 Jan 2014 23:22:58 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s07NMwUG052376; Tue, 7 Jan 2014 23:22:58 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201401072322.s07NMwUG052376@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 7 Jan 2014 23:22:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339049 - branches/2014Q1/math/abacus/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, 07 Jan 2014 23:22:59 -0000 Author: mat Date: Tue Jan 7 23:22:58 2014 New Revision: 339049 URL: http://svnweb.freebsd.org/changeset/ports/339049 Log: MFH: r339044 Fix build with gcc47. PR: ports/184571 Submitted by: Christoph Moench-Tegeder Approved by: maintainer Approved by: portmgr (implicit) Added: branches/2014Q1/math/abacus/files/patch-Include-standardpool.inc - copied unchanged from r339044, head/math/abacus/files/patch-Include-standardpool.inc Modified: Directory Properties: branches/2014Q1/ (props changed) Copied: branches/2014Q1/math/abacus/files/patch-Include-standardpool.inc (from r339044, head/math/abacus/files/patch-Include-standardpool.inc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/math/abacus/files/patch-Include-standardpool.inc Tue Jan 7 23:22:58 2014 (r339049, copy of r339044, head/math/abacus/files/patch-Include-standardpool.inc) @@ -0,0 +1,20 @@ +--- Include/abacus/standardpool.inc.orig 2013-11-16 14:06:39.000000000 +0100 ++++ Include/abacus/standardpool.inc 2013-11-16 14:08:30.000000000 +0100 +@@ -129,7 +129,7 @@ + + for(int i = 0; i < ABA_POOL::number(); i++) + { +- if(softDeleteConVar(pool_[i]) == 0) ++ if(this->softDeleteConVar(pool_[i]) == 0) + { + nDeleted++; + // consider the case that a slot has been deleted although it was empty +@@ -179,7 +179,7 @@ + + while(nRemoved < maxRemove && !candidates.empty()) { + c = candidates.extractMin(); +- hardDeleteConVar(pool_[c]); ++ this->hardDeleteConVar(pool_[c]); + nRemoved++; + } + From owner-svn-ports-branches@FreeBSD.ORG Tue Jan 7 23:23:57 2014 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 6A65F7C0; Tue, 7 Jan 2014 23:23:57 +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 3C8911A18; Tue, 7 Jan 2014 23:23: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 s07NNvvA052736; Tue, 7 Jan 2014 23:23:57 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s07NNuU0052733; Tue, 7 Jan 2014 23:23:56 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201401072323.s07NNuU0052733@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 7 Jan 2014 23:23:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339050 - in branches/2014Q1/lang/ratfor: . 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, 07 Jan 2014 23:23:57 -0000 Author: mat Date: Tue Jan 7 23:23:56 2014 New Revision: 339050 URL: http://svnweb.freebsd.org/changeset/ports/339050 Log: MFH: r339045 Fix build with gcc47 maintainer timeout PR: ports/184574 Submitted by: Christoph Moench-Tegeder Approved by: portmgr (implicit) Modified: branches/2014Q1/lang/ratfor/Makefile (contents, props changed) branches/2014Q1/lang/ratfor/files/patch-Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/lang/ratfor/Makefile ============================================================================== --- branches/2014Q1/lang/ratfor/Makefile Tue Jan 7 23:22:58 2014 (r339049) +++ branches/2014Q1/lang/ratfor/Makefile Tue Jan 7 23:23:56 2014 (r339050) @@ -26,7 +26,6 @@ USE_FORTRAN= yes NO_STAGE= yes post-patch: @cd ${WRKSRC} ; ${PATCH} --quiet < testw.patch - @${REINPLACE_CMD} -e 's|%%F77%%|${F77}|' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ratfor77 ${PREFIX}/bin Modified: branches/2014Q1/lang/ratfor/files/patch-Makefile ============================================================================== --- branches/2014Q1/lang/ratfor/files/patch-Makefile Tue Jan 7 23:22:58 2014 (r339049) +++ branches/2014Q1/lang/ratfor/files/patch-Makefile Tue Jan 7 23:23:56 2014 (r339050) @@ -1,16 +1,22 @@ ---- Makefile~ Sat Jan 13 18:13:44 2007 -+++ Makefile Sat Jan 13 18:14:35 2007 -@@ -28,11 +28,11 @@ +--- Makefile.orig 2013-11-16 17:28:28.000000000 +0100 ++++ Makefile 2013-11-16 17:27:51.000000000 +0100 +@@ -26,13 +26,15 @@ + clean: + rm -f *.o *~ ratfor ratfor77 a.out test testw test.f testw.f - test: ratfor +-test: ratfor ++test: test.f ++ ++test.f: ratfor ./ratfor -o test.f test.r - f77 -o test test.f -+ %%F77%% -o test test.f - testw: ratfor +-testw: ratfor ++testw: testw.f ++ ++testw.f: ratfor ./ratfor -o testw.f testw.r - f77 -o testw testw.f -+ %%F77%% -o testw testw.f tests: test testw ./test From owner-svn-ports-branches@FreeBSD.ORG Tue Jan 7 23:25:13 2014 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 302FBA56; Tue, 7 Jan 2014 23:25: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 1C4011A2D; Tue, 7 Jan 2014 23:25: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 s07NPCxu053310; Tue, 7 Jan 2014 23:25:12 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s07NPCej053309; Tue, 7 Jan 2014 23:25:12 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201401072325.s07NPCej053309@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 7 Jan 2014 23:25:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339053 - branches/2014Q1/textproc/ctpp2/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, 07 Jan 2014 23:25:13 -0000 Author: mat Date: Tue Jan 7 23:25:12 2014 New Revision: 339053 URL: http://svnweb.freebsd.org/changeset/ports/339053 Log: MFH: r339046 Fix build with gcc47 maintainer timeout PR: ports/184575 Submitted by: Christoph Moench-Tegeder Approved by: portmgr (implicit) Added: branches/2014Q1/textproc/ctpp2/files/patch-src-CTPP2FileSourceLoader.cpp - copied unchanged from r339046, head/textproc/ctpp2/files/patch-src-CTPP2FileSourceLoader.cpp Modified: Directory Properties: branches/2014Q1/ (props changed) Copied: branches/2014Q1/textproc/ctpp2/files/patch-src-CTPP2FileSourceLoader.cpp (from r339046, head/textproc/ctpp2/files/patch-src-CTPP2FileSourceLoader.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/textproc/ctpp2/files/patch-src-CTPP2FileSourceLoader.cpp Tue Jan 7 23:25:12 2014 (r339053, copy of r339046, head/textproc/ctpp2/files/patch-src-CTPP2FileSourceLoader.cpp) @@ -0,0 +1,10 @@ +--- src/CTPP2FileSourceLoader.cpp.orig 2013-11-16 14:26:59.000000000 +0100 ++++ src/CTPP2FileSourceLoader.cpp 2013-11-16 14:27:17.000000000 +0100 +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + + #ifdef WIN32 + #include /* getcwd */ From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 01:07:25 2014 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 5FB78922; Wed, 8 Jan 2014 01:07: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 4B0F212AC; Wed, 8 Jan 2014 01:07: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 s0817PkJ095285; Wed, 8 Jan 2014 01:07:25 GMT (envelope-from garga@svn.freebsd.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0817Om8095283; Wed, 8 Jan 2014 01:07:24 GMT (envelope-from garga@svn.freebsd.org) Message-Id: <201401080107.s0817Om8095283@svn.freebsd.org> From: Renato Botelho Date: Wed, 8 Jan 2014 01:07:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339063 - in branches/2014Q1/security/clamav: . 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, 08 Jan 2014 01:07:25 -0000 Author: garga Date: Wed Jan 8 01:07:24 2014 New Revision: 339063 URL: http://svnweb.freebsd.org/changeset/ports/339063 Log: MFH: r339019 - Add a patch to fix bundled LLVM to build with libc++ - Remove USE_GCC=any PR: ports/185366 Submitted by: tijl@ Approved by: portmgr-lurker (mat) Added: branches/2014Q1/security/clamav/files/patch-libclamav-c++-llvm - copied unchanged from r339019, head/security/clamav/files/patch-libclamav-c++-llvm Modified: branches/2014Q1/security/clamav/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/clamav/Makefile ============================================================================== --- branches/2014Q1/security/clamav/Makefile Wed Jan 8 00:42:32 2014 (r339062) +++ branches/2014Q1/security/clamav/Makefile Wed Jan 8 01:07:24 2014 (r339063) @@ -3,7 +3,7 @@ PORTNAME= clamav PORTVERSION= 0.98 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= SF @@ -44,7 +44,6 @@ IPV6_CONFIGURE_ENABLE= ipv6 GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GCC= any USES= gmake USE_RC_SUBR= clamav-clamd clamav-freshclam Copied: branches/2014Q1/security/clamav/files/patch-libclamav-c++-llvm (from r339019, head/security/clamav/files/patch-libclamav-c++-llvm) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/security/clamav/files/patch-libclamav-c++-llvm Wed Jan 8 01:07:24 2014 (r339063, copy of r339019, head/security/clamav/files/patch-libclamav-c++-llvm) @@ -0,0 +1,72 @@ +--- libclamav/c++/llvm/lib/Target/SubtargetFeature.cpp.orig ++++ libclamav/c++/llvm/lib/Target/SubtargetFeature.cpp +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + using namespace llvm; + + //===----------------------------------------------------------------------===// +--- libclamav/c++/llvm/include/llvm/Support/CFG.h.orig ++++ libclamav/c++/llvm/include/llvm/Support/CFG.h +@@ -27,8 +27,9 @@ + + template // Predecessor Iterator + class PredIterator : public std::iterator { +- typedef std::iterator super; ++ Ptr, ptrdiff_t, Ptr*, Ptr*> { ++ typedef std::iterator super; + typedef PredIterator Self; + USE_iterator It; + +@@ -40,6 +41,7 @@ + + public: + typedef typename super::pointer pointer; ++ typedef typename super::reference reference; + + PredIterator() {} + explicit inline PredIterator(Ptr *bb) : It(bb->use_begin()) { +@@ -50,7 +52,7 @@ + inline bool operator==(const Self& x) const { return It == x.It; } + inline bool operator!=(const Self& x) const { return !operator==(x); } + +- inline pointer operator*() const { ++ inline reference operator*() const { + assert(!It.atEnd() && "pred_iterator out of range!"); + return cast(*It)->getParent(); + } +@@ -100,10 +102,11 @@ + + template // Successor Iterator + class SuccIterator : public std::iterator { ++ BB_, ptrdiff_t, BB_*, BB_*> { + const Term_ Term; + unsigned idx; +- typedef std::iterator super; ++ typedef std::iterator super; + typedef SuccIterator Self; + + inline bool index_is_valid(int idx) { +@@ -112,6 +115,7 @@ + + public: + typedef typename super::pointer pointer; ++ typedef typename super::reference reference; + // TODO: This can be random access iterator, only operator[] missing. + + explicit inline SuccIterator(Term_ T) : Term(T), idx(0) {// begin iterator +@@ -142,7 +146,7 @@ + inline bool operator==(const Self& x) const { return idx == x.idx; } + inline bool operator!=(const Self& x) const { return !operator==(x); } + +- inline pointer operator*() const { return Term->getSuccessor(idx); } ++ inline reference operator*() const { return Term->getSuccessor(idx); } + inline pointer operator->() const { return operator*(); } + + inline Self& operator++() { ++idx; return *this; } // Preincrement From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 01:12:50 2014 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 EAD19A52; Wed, 8 Jan 2014 01:12: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 D6871132B; Wed, 8 Jan 2014 01:12: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 s081CoKH098616; Wed, 8 Jan 2014 01:12:50 GMT (envelope-from garga@svn.freebsd.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s081CoMd098615; Wed, 8 Jan 2014 01:12:50 GMT (envelope-from garga@svn.freebsd.org) Message-Id: <201401080112.s081CoMd098615@svn.freebsd.org> From: Renato Botelho Date: Wed, 8 Jan 2014 01:12:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339064 - branches/2014Q1/security/clamav 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, 08 Jan 2014 01:12:51 -0000 Author: garga Date: Wed Jan 8 01:12:50 2014 New Revision: 339064 URL: http://svnweb.freebsd.org/changeset/ports/339064 Log: MFH: r339021 Fix an old OPTION knob check (WITH_TESTS) Approved by: portmgr (implicit) Modified: branches/2014Q1/security/clamav/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/clamav/Makefile ============================================================================== --- branches/2014Q1/security/clamav/Makefile Wed Jan 8 01:07:24 2014 (r339063) +++ branches/2014Q1/security/clamav/Makefile Wed Jan 8 01:12:50 2014 (r339064) @@ -116,7 +116,7 @@ PLIST_SUB+= CLAMAVUSER=${CLAMAVUSER} \ .if ${PORT_OPTIONS:MLLVM} && ( ${ARCH} == "i386" || ${ARCH} == "amd64" ) CONFIGURE_ARGS+=--enable-llvm -. if defined(WITH_TESTS) +. if ${PORT_OPTIONS:MTESTS} USE_PYTHON_BUILD= yes . endif .else From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 01:18:40 2014 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 4BE53B4E; Wed, 8 Jan 2014 01:18: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 364D11343; Wed, 8 Jan 2014 01:18: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 s081Ieis099383; Wed, 8 Jan 2014 01:18:40 GMT (envelope-from garga@svn.freebsd.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s081IdUi099377; Wed, 8 Jan 2014 01:18:39 GMT (envelope-from garga@svn.freebsd.org) Message-Id: <201401080118.s081IdUi099377@svn.freebsd.org> From: Renato Botelho Date: Wed, 8 Jan 2014 01:18:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339065 - in branches/2014Q1/security/clamav-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: Wed, 08 Jan 2014 01:18:40 -0000 Author: garga Date: Wed Jan 8 01:18:38 2014 New Revision: 339065 URL: http://svnweb.freebsd.org/changeset/ports/339065 Log: MFH: r339042 - Update to 20140107 - Remove USE_GCC=any and fix build with clang Approved by: portmgr-lurker (mat) Added: branches/2014Q1/security/clamav-devel/files/patch-libclamav-c++-llvm - copied unchanged from r339042, head/security/clamav-devel/files/patch-libclamav-c++-llvm branches/2014Q1/security/clamav-devel/files/patch-libclamav__tomsfastmath__mont__fp_montgomery_reduce.c - copied unchanged from r339042, head/security/clamav-devel/files/patch-libclamav__tomsfastmath__mont__fp_montgomery_reduce.c branches/2014Q1/security/clamav-devel/files/patch-libclamav__tomsfastmath__mul__fp_mul_comba.c - copied unchanged from r339042, head/security/clamav-devel/files/patch-libclamav__tomsfastmath__mul__fp_mul_comba.c branches/2014Q1/security/clamav-devel/files/patch-libclamav__tomsfastmath__sqr__fp_sqr_comba.c - copied unchanged from r339042, head/security/clamav-devel/files/patch-libclamav__tomsfastmath__sqr__fp_sqr_comba.c Modified: branches/2014Q1/security/clamav-devel/Makefile branches/2014Q1/security/clamav-devel/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/clamav-devel/Makefile ============================================================================== --- branches/2014Q1/security/clamav-devel/Makefile Wed Jan 8 01:12:50 2014 (r339064) +++ branches/2014Q1/security/clamav-devel/Makefile Wed Jan 8 01:18:38 2014 (r339065) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= clamav -PORTVERSION= 20131023 +PORTVERSION= 20140107 CATEGORIES= security MASTER_SITES= http://www.clamav.net/snapshot/ \ LOCAL/garga/clamav-devel @@ -45,7 +45,6 @@ IPV6_CONFIGURE_ENABLE= ipv6 USES= gmake GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GCC= any USE_RC_SUBR= clamav-clamd clamav-freshclam PORTDOCS= * @@ -120,7 +119,7 @@ PORTSCOUT= ignore:1 .if ${PORT_OPTIONS:MLLVM} && ( ${ARCH} == "i386" || ${ARCH} == "amd64" ) CONFIGURE_ARGS+=--enable-llvm -. if defined(WITH_TESTS) +. if ${PORT_OPTIONS:MTESTS} USE_PYTHON_BUILD= yes . endif .else Modified: branches/2014Q1/security/clamav-devel/distinfo ============================================================================== --- branches/2014Q1/security/clamav-devel/distinfo Wed Jan 8 01:12:50 2014 (r339064) +++ branches/2014Q1/security/clamav-devel/distinfo Wed Jan 8 01:18:38 2014 (r339065) @@ -1,2 +1,2 @@ -SHA256 (clamav-devel-20131023.tar.gz) = 5a5b1e38befc65aec66e8a74208f655ad0257a6ace1244c4bf9943c7581e308f -SIZE (clamav-devel-20131023.tar.gz) = 37002306 +SHA256 (clamav-devel-20140107.tar.gz) = 2b2d5e7e3ac786dbef77c8e8c43d31c2da0194f5422c2499f8bb8701e91f0705 +SIZE (clamav-devel-20140107.tar.gz) = 36998346 Copied: branches/2014Q1/security/clamav-devel/files/patch-libclamav-c++-llvm (from r339042, head/security/clamav-devel/files/patch-libclamav-c++-llvm) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/security/clamav-devel/files/patch-libclamav-c++-llvm Wed Jan 8 01:18:38 2014 (r339065, copy of r339042, head/security/clamav-devel/files/patch-libclamav-c++-llvm) @@ -0,0 +1,72 @@ +--- libclamav/c++/llvm/lib/Target/SubtargetFeature.cpp.orig ++++ libclamav/c++/llvm/lib/Target/SubtargetFeature.cpp +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + using namespace llvm; + + //===----------------------------------------------------------------------===// +--- libclamav/c++/llvm/include/llvm/Support/CFG.h.orig ++++ libclamav/c++/llvm/include/llvm/Support/CFG.h +@@ -27,8 +27,9 @@ + + template // Predecessor Iterator + class PredIterator : public std::iterator { +- typedef std::iterator super; ++ Ptr, ptrdiff_t, Ptr*, Ptr*> { ++ typedef std::iterator super; + typedef PredIterator Self; + USE_iterator It; + +@@ -40,6 +41,7 @@ + + public: + typedef typename super::pointer pointer; ++ typedef typename super::reference reference; + + PredIterator() {} + explicit inline PredIterator(Ptr *bb) : It(bb->use_begin()) { +@@ -50,7 +52,7 @@ + inline bool operator==(const Self& x) const { return It == x.It; } + inline bool operator!=(const Self& x) const { return !operator==(x); } + +- inline pointer operator*() const { ++ inline reference operator*() const { + assert(!It.atEnd() && "pred_iterator out of range!"); + return cast(*It)->getParent(); + } +@@ -100,10 +102,11 @@ + + template // Successor Iterator + class SuccIterator : public std::iterator { ++ BB_, ptrdiff_t, BB_*, BB_*> { + const Term_ Term; + unsigned idx; +- typedef std::iterator super; ++ typedef std::iterator super; + typedef SuccIterator Self; + + inline bool index_is_valid(int idx) { +@@ -112,6 +115,7 @@ + + public: + typedef typename super::pointer pointer; ++ typedef typename super::reference reference; + // TODO: This can be random access iterator, only operator[] missing. + + explicit inline SuccIterator(Term_ T) : Term(T), idx(0) {// begin iterator +@@ -142,7 +146,7 @@ + inline bool operator==(const Self& x) const { return idx == x.idx; } + inline bool operator!=(const Self& x) const { return !operator==(x); } + +- inline pointer operator*() const { return Term->getSuccessor(idx); } ++ inline reference operator*() const { return Term->getSuccessor(idx); } + inline pointer operator->() const { return operator*(); } + + inline Self& operator++() { ++idx; return *this; } // Preincrement Copied: branches/2014Q1/security/clamav-devel/files/patch-libclamav__tomsfastmath__mont__fp_montgomery_reduce.c (from r339042, head/security/clamav-devel/files/patch-libclamav__tomsfastmath__mont__fp_montgomery_reduce.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/security/clamav-devel/files/patch-libclamav__tomsfastmath__mont__fp_montgomery_reduce.c Wed Jan 8 01:18:38 2014 (r339065, copy of r339042, head/security/clamav-devel/files/patch-libclamav__tomsfastmath__mont__fp_montgomery_reduce.c) @@ -0,0 +1,119 @@ +--- libclamav/tomsfastmath/mont/fp_montgomery_reduce.c.orig 2014-01-07 17:20:37.000000000 -0200 ++++ libclamav/tomsfastmath/mont/fp_montgomery_reduce.c 2014-01-07 17:21:17.000000000 -0200 +@@ -30,7 +30,7 @@ + "movl %%edx,%1 \n\t" \ + :"=g"(_c[LO]), "=r"(cy) \ + :"0"(_c[LO]), "1"(cy), "g"(mu), "g"(*tmpm++) \ +-: "%eax", "%edx", "%cc") ++: "%eax", "%edx", "cc") + + #define PROPCARRY \ + asm( \ +@@ -39,7 +39,7 @@ + "movzbl %%al,%1 \n\t" \ + :"=g"(_c[LO]), "=r"(cy) \ + :"0"(_c[LO]), "1"(cy) \ +-: "%eax", "%cc") ++: "%eax", "cc") + + /******************************************************************/ + #elif defined(TFM_X86_64) +@@ -62,7 +62,7 @@ + "movq %%rdx,%1 \n\t" \ + :"=g"(_c[LO]), "=r"(cy) \ + :"0"(_c[LO]), "1"(cy), "r"(mu), "r"(*tmpm++) \ +-: "%rax", "%rdx", "%cc") ++: "%rax", "%rdx", "cc") + + #define INNERMUL8 \ + asm( \ +@@ -155,7 +155,7 @@ + \ + :"=r"(_c), "=r"(cy) \ + : "0"(_c), "1"(cy), "g"(mu), "r"(tmpm)\ +-: "%rax", "%rdx", "%r10", "%r11", "%cc") ++: "%rax", "%rdx", "%r10", "%r11", "cc") + + + #define PROPCARRY \ +@@ -165,7 +165,7 @@ + "movzbq %%al,%1 \n\t" \ + :"=g"(_c[LO]), "=r"(cy) \ + :"0"(_c[LO]), "1"(cy) \ +-: "%rax", "%cc") ++: "%rax", "cc") + + /******************************************************************/ + #elif defined(TFM_SSE2) +@@ -280,7 +280,7 @@ + "movzbl %%al,%1 \n\t" \ + :"=g"(_c[LO]), "=r"(cy) \ + :"0"(_c[LO]), "1"(cy) \ +-: "%eax", "%cc") ++: "%eax", "cc") + + /******************************************************************/ + #elif defined(TFM_ARM) +@@ -300,7 +300,7 @@ + " MOVCC %0,#0 \n\t" \ + " UMLAL r0,%0,%3,%4 \n\t" \ + " STR r0,%1 \n\t" \ +-:"=r"(cy),"=m"(_c[0]):"0"(cy),"r"(mu),"r"(*tmpm++),"1"(_c[0]):"r0","%cc"); ++:"=r"(cy),"=m"(_c[0]):"0"(cy),"r"(mu),"r"(*tmpm++),"1"(_c[0]):"r0","cc"); + + #define PROPCARRY \ + asm( \ +@@ -309,7 +309,7 @@ + " STR r0,%1 \n\t" \ + " MOVCS %0,#1 \n\t" \ + " MOVCC %0,#0 \n\t" \ +-:"=r"(cy),"=m"(_c[0]):"0"(cy),"1"(_c[0]):"r0","%cc"); ++:"=r"(cy),"=m"(_c[0]):"0"(cy),"1"(_c[0]):"r0","cc"); + + /******************************************************************/ + #elif defined(TFM_PPC32) +@@ -331,7 +331,7 @@ + " addc 16,16,18 \n\t" \ + " addze %0,17 \n\t" \ + " stw 16,%1 \n\t" \ +-:"=r"(cy),"=m"(_c[0]):"0"(cy),"r"(mu),"r"(tmpm[0]),"1"(_c[0]):"16", "17", "18","%cc"); ++tmpm; ++:"=r"(cy),"=m"(_c[0]):"0"(cy),"r"(mu),"r"(tmpm[0]),"1"(_c[0]):"16", "17", "18","cc"); ++tmpm; + + #define PROPCARRY \ + asm( \ +@@ -340,7 +340,7 @@ + " stw 16,%1 \n\t" \ + " xor %0,%0,%0 \n\t" \ + " addze %0,%0 \n\t" \ +-:"=r"(cy),"=m"(_c[0]):"0"(cy),"1"(_c[0]):"16","%cc"); ++:"=r"(cy),"=m"(_c[0]):"0"(cy),"1"(_c[0]):"16","cc"); + + /******************************************************************/ + #elif defined(TFM_PPC64) +@@ -362,7 +362,7 @@ + " addc r16,r16,r18 \n\t" \ + " addze %0,r17 \n\t" \ + " sdx r16,0,%1 \n\t" \ +-:"=r"(cy),"=m"(_c[0]):"0"(cy),"r"(mu),"r"(tmpm[0]),"1"(_c[0]):"r16", "r17", "r18","%cc"); ++tmpm; ++:"=r"(cy),"=m"(_c[0]):"0"(cy),"r"(mu),"r"(tmpm[0]),"1"(_c[0]):"r16", "r17", "r18","cc"); ++tmpm; + + #define PROPCARRY \ + asm( \ +@@ -371,7 +371,7 @@ + " sdx r16,0,%1 \n\t" \ + " xor %0,%0,%0 \n\t" \ + " addze %0,%0 \n\t" \ +-:"=r"(cy),"=m"(_c[0]):"0"(cy),"1"(_c[0]):"r16","%cc"); ++:"=r"(cy),"=m"(_c[0]):"0"(cy),"1"(_c[0]):"r16","cc"); + + /******************************************************************/ + #elif defined(TFM_AVR32) +@@ -401,7 +401,7 @@ + " st.w %1,r2 \n\t" \ + " eor %0,%0 \n\t" \ + " acr %0 \n\t" \ +-:"=r"(cy),"=r"(&_c[0]):"0"(cy),"1"(&_c[0]):"r2","%cc"); ++:"=r"(cy),"=r"(&_c[0]):"0"(cy),"1"(&_c[0]):"r2","cc"); + + /******************************************************************/ + #elif defined(TFM_MIPS) Copied: branches/2014Q1/security/clamav-devel/files/patch-libclamav__tomsfastmath__mul__fp_mul_comba.c (from r339042, head/security/clamav-devel/files/patch-libclamav__tomsfastmath__mul__fp_mul_comba.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/security/clamav-devel/files/patch-libclamav__tomsfastmath__mul__fp_mul_comba.c Wed Jan 8 01:18:38 2014 (r339065, copy of r339042, head/security/clamav-devel/files/patch-libclamav__tomsfastmath__mul__fp_mul_comba.c) @@ -0,0 +1,38 @@ +--- libclamav/tomsfastmath/mul/fp_mul_comba.c.orig 2014-01-07 17:20:42.000000000 -0200 ++++ libclamav/tomsfastmath/mul/fp_mul_comba.c 2014-01-07 17:21:24.000000000 -0200 +@@ -53,7 +53,7 @@ + "addl %%eax,%0 \n\t" \ + "adcl %%edx,%1 \n\t" \ + "adcl $0,%2 \n\t" \ +- :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j) :"%eax","%edx","%cc"); ++ :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j) :"%eax","%edx","cc"); + + #elif defined(TFM_X86_64) + /* x86-64 optimized */ +@@ -88,7 +88,7 @@ + "addq %%rax,%0 \n\t" \ + "adcq %%rdx,%1 \n\t" \ + "adcq $0,%2 \n\t" \ +- :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i), "g"(j) :"%rax","%rdx","%cc"); ++ :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i), "g"(j) :"%rax","%rdx","cc"); + + #elif defined(TFM_SSE2) + /* use SSE2 optimizations */ +@@ -128,7 +128,7 @@ + "movd %%mm0,%%eax \n\t" \ + "adcl %%eax,%1 \n\t" \ + "adcl $0,%2 \n\t" \ +- :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j) :"%eax","%cc"); ++ :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j) :"%eax","cc"); + + #elif defined(TFM_ARM) + /* ARM code */ +@@ -155,7 +155,7 @@ + " ADDS %0,%0,r0 \n\t" \ + " ADCS %1,%1,r1 \n\t" \ + " ADC %2,%2,#0 \n\t" \ +-:"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(i), "r"(j) : "r0", "r1", "%cc"); ++:"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(i), "r"(j) : "r0", "r1", "cc"); + + #elif defined(TFM_PPC32) + /* For 32-bit PPC */ Copied: branches/2014Q1/security/clamav-devel/files/patch-libclamav__tomsfastmath__sqr__fp_sqr_comba.c (from r339042, head/security/clamav-devel/files/patch-libclamav__tomsfastmath__sqr__fp_sqr_comba.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/security/clamav-devel/files/patch-libclamav__tomsfastmath__sqr__fp_sqr_comba.c Wed Jan 8 01:18:38 2014 (r339065, copy of r339042, head/security/clamav-devel/files/patch-libclamav__tomsfastmath__sqr__fp_sqr_comba.c) @@ -0,0 +1,277 @@ +--- libclamav/tomsfastmath/sqr/fp_sqr_comba.c.orig 2014-01-07 17:25:18.000000000 -0200 ++++ libclamav/tomsfastmath/sqr/fp_sqr_comba.c 2014-01-07 17:25:40.000000000 -0200 +@@ -41,7 +41,7 @@ + "addl %%eax,%0 \n\t" \ + "adcl %%edx,%1 \n\t" \ + "adcl $0,%2 \n\t" \ +- :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i) :"%eax","%edx","%cc"); ++ :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i) :"%eax","%edx","cc"); + + #define SQRADD2(i, j) \ + asm( \ +@@ -53,7 +53,7 @@ + "addl %%eax,%0 \n\t" \ + "adcl %%edx,%1 \n\t" \ + "adcl $0,%2 \n\t" \ +- :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j) :"%eax","%edx","%cc"); ++ :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j) :"%eax","%edx","cc"); + + #define SQRADDSC(i, j) \ + asm( \ +@@ -62,7 +62,7 @@ + "movl %%eax,%0 \n\t" \ + "movl %%edx,%1 \n\t" \ + "xorl %2,%2 \n\t" \ +- :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) :"%eax","%edx","%cc"); ++ :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) :"%eax","%edx","cc"); + + #define SQRADDAC(i, j) \ + asm( \ +@@ -71,7 +71,7 @@ + "addl %%eax,%0 \n\t" \ + "adcl %%edx,%1 \n\t" \ + "adcl $0,%2 \n\t" \ +- :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) :"%eax","%edx","%cc"); ++ :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) :"%eax","%edx","cc"); + + #define SQRADDDB \ + asm( \ +@@ -81,7 +81,7 @@ + "addl %6,%0 \n\t" \ + "adcl %7,%1 \n\t" \ + "adcl %8,%2 \n\t" \ +- :"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(sc0), "r"(sc1), "r"(sc2) : "%cc"); ++ :"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(sc0), "r"(sc1), "r"(sc2) : "cc"); + + #elif defined(TFM_X86_64) + /* x86-64 optimized */ +@@ -109,7 +109,7 @@ + "addq %%rax,%0 \n\t" \ + "adcq %%rdx,%1 \n\t" \ + "adcq $0,%2 \n\t" \ +- :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i) :"%rax","%rdx","%cc"); ++ :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i) :"%rax","%rdx","cc"); + + #define SQRADD2(i, j) \ + asm( \ +@@ -121,7 +121,7 @@ + "addq %%rax,%0 \n\t" \ + "adcq %%rdx,%1 \n\t" \ + "adcq $0,%2 \n\t" \ +- :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i), "g"(j) :"%rax","%rdx","%cc"); ++ :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i), "g"(j) :"%rax","%rdx","cc"); + + #define SQRADDSC(i, j) \ + asm( \ +@@ -130,7 +130,7 @@ + "movq %%rax,%0 \n\t" \ + "movq %%rdx,%1 \n\t" \ + "xorq %2,%2 \n\t" \ +- :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) :"%rax","%rdx","%cc"); ++ :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) :"%rax","%rdx","cc"); + + #define SQRADDAC(i, j) \ + asm( \ +@@ -139,7 +139,7 @@ + "addq %%rax,%0 \n\t" \ + "adcq %%rdx,%1 \n\t" \ + "adcq $0,%2 \n\t" \ +- :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) :"%rax","%rdx","%cc"); ++ :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) :"%rax","%rdx","cc"); + + #define SQRADDDB \ + asm( \ +@@ -149,7 +149,7 @@ + "addq %6,%0 \n\t" \ + "adcq %7,%1 \n\t" \ + "adcq %8,%2 \n\t" \ +- :"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(sc0), "r"(sc1), "r"(sc2) : "%cc"); ++ :"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(sc0), "r"(sc1), "r"(sc2) : "cc"); + + #elif defined(TFM_SSE2) + +@@ -181,7 +181,7 @@ + "movd %%mm0,%%eax \n\t" \ + "adcl %%eax,%1 \n\t" \ + "adcl $0,%2 \n\t" \ +- :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i) :"%eax","%cc"); ++ :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i) :"%eax","cc"); + + #define SQRADD2(i, j) \ + asm( \ +@@ -197,7 +197,7 @@ + "addl %%eax,%0 \n\t" \ + "adcl %%edx,%1 \n\t" \ + "adcl $0,%2 \n\t" \ +- :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j) :"%eax","%edx","%cc"); ++ :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j) :"%eax","%edx","cc"); + + #define SQRADDSC(i, j) \ + asm( \ +@@ -221,7 +221,7 @@ + "addl %%eax,%0 \n\t" \ + "adcl %%edx,%1 \n\t" \ + "adcl $0,%2 \n\t" \ +- :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "m"(i), "m"(j) :"%eax","%edx","%cc"); ++ :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "m"(i), "m"(j) :"%eax","%edx","cc"); + + #define SQRADDDB \ + asm( \ +@@ -231,7 +231,7 @@ + "addl %6,%0 \n\t" \ + "adcl %7,%1 \n\t" \ + "adcl %8,%2 \n\t" \ +- :"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(sc0), "r"(sc1), "r"(sc2) : "%cc"); ++ :"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(sc0), "r"(sc1), "r"(sc2) : "cc"); + + #elif defined(TFM_ARM) + +@@ -260,7 +260,7 @@ + " ADDS %0,%0,r0 \n\t" \ + " ADCS %1,%1,r1 \n\t" \ + " ADC %2,%2,#0 \n\t" \ +-:"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(i) : "r0", "r1", "%cc"); ++:"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(i) : "r0", "r1", "cc"); + + /* for squaring some of the terms are doubled... */ + #define SQRADD2(i, j) \ +@@ -272,13 +272,13 @@ + " ADDS %0,%0,r0 \n\t" \ + " ADCS %1,%1,r1 \n\t" \ + " ADC %2,%2,#0 \n\t" \ +-:"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(i), "r"(j) : "r0", "r1", "%cc"); ++:"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(i), "r"(j) : "r0", "r1", "cc"); + + #define SQRADDSC(i, j) \ + asm( \ + " UMULL %0,%1,%6,%7 \n\t" \ + " SUB %2,%2,%2 \n\t" \ +-:"=r"(sc0), "=r"(sc1), "=r"(sc2) : "0"(sc0), "1"(sc1), "2"(sc2), "r"(i), "r"(j) : "%cc"); ++:"=r"(sc0), "=r"(sc1), "=r"(sc2) : "0"(sc0), "1"(sc1), "2"(sc2), "r"(i), "r"(j) : "cc"); + + #define SQRADDAC(i, j) \ + asm( \ +@@ -286,7 +286,7 @@ + " ADDS %0,%0,r0 \n\t" \ + " ADCS %1,%1,r1 \n\t" \ + " ADC %2,%2,#0 \n\t" \ +-:"=r"(sc0), "=r"(sc1), "=r"(sc2) : "0"(sc0), "1"(sc1), "2"(sc2), "r"(i), "r"(j) : "r0", "r1", "%cc"); ++:"=r"(sc0), "=r"(sc1), "=r"(sc2) : "0"(sc0), "1"(sc1), "2"(sc2), "r"(i), "r"(j) : "r0", "r1", "cc"); + + #define SQRADDDB \ + asm( \ +@@ -296,7 +296,7 @@ + " ADDS %0,%0,%3 \n\t" \ + " ADCS %1,%1,%4 \n\t" \ + " ADC %2,%2,%5 \n\t" \ +-:"=r"(c0), "=r"(c1), "=r"(c2) : "r"(sc0), "r"(sc1), "r"(sc2), "0"(c0), "1"(c1), "2"(c2) : "%cc"); ++:"=r"(c0), "=r"(c1), "=r"(c2) : "r"(sc0), "r"(sc1), "r"(sc2), "0"(c0), "1"(c1), "2"(c2) : "cc"); + + #elif defined(TFM_PPC32) + +@@ -326,7 +326,7 @@ + " mulhwu 16,%6,%6 \n\t" \ + " adde %1,%1,16 \n\t" \ + " addze %2,%2 \n\t" \ +-:"=r"(c0), "=r"(c1), "=r"(c2):"0"(c0), "1"(c1), "2"(c2), "r"(i):"16","%cc"); ++:"=r"(c0), "=r"(c1), "=r"(c2):"0"(c0), "1"(c1), "2"(c2), "r"(i):"16","cc"); + + /* for squaring some of the terms are doubled... */ + #define SQRADD2(i, j) \ +@@ -339,14 +339,14 @@ + " addc %0,%0,16 \n\t" \ + " adde %1,%1,17 \n\t" \ + " addze %2,%2 \n\t" \ +-:"=r"(c0), "=r"(c1), "=r"(c2):"0"(c0), "1"(c1), "2"(c2), "r"(i), "r"(j):"16", "17","%cc"); ++:"=r"(c0), "=r"(c1), "=r"(c2):"0"(c0), "1"(c1), "2"(c2), "r"(i), "r"(j):"16", "17","cc"); + + #define SQRADDSC(i, j) \ + asm( \ + " mullw %0,%6,%7 \n\t" \ + " mulhwu %1,%6,%7 \n\t" \ + " xor %2,%2,%2 \n\t" \ +-:"=r"(sc0), "=r"(sc1), "=r"(sc2):"0"(sc0), "1"(sc1), "2"(sc2), "r"(i),"r"(j) : "%cc"); ++:"=r"(sc0), "=r"(sc1), "=r"(sc2):"0"(sc0), "1"(sc1), "2"(sc2), "r"(i),"r"(j) : "cc"); + + #define SQRADDAC(i, j) \ + asm( \ +@@ -355,7 +355,7 @@ + " mulhwu 16,%6,%7 \n\t" \ + " adde %1,%1,16 \n\t" \ + " addze %2,%2 \n\t" \ +-:"=r"(sc0), "=r"(sc1), "=r"(sc2):"0"(sc0), "1"(sc1), "2"(sc2), "r"(i), "r"(j):"16", "%cc"); ++:"=r"(sc0), "=r"(sc1), "=r"(sc2):"0"(sc0), "1"(sc1), "2"(sc2), "r"(i), "r"(j):"16", "cc"); + + #define SQRADDDB \ + asm( \ +@@ -365,7 +365,7 @@ + " addc %0,%0,%3 \n\t" \ + " adde %1,%1,%4 \n\t" \ + " adde %2,%2,%5 \n\t" \ +-:"=r"(c0), "=r"(c1), "=r"(c2) : "r"(sc0), "r"(sc1), "r"(sc2), "0"(c0), "1"(c1), "2"(c2) : "%cc"); ++:"=r"(c0), "=r"(c1), "=r"(c2) : "r"(sc0), "r"(sc1), "r"(sc2), "0"(c0), "1"(c1), "2"(c2) : "cc"); + + #elif defined(TFM_PPC64) + /* PPC64 */ +@@ -394,7 +394,7 @@ + " mulhdu r16,%6,%6 \n\t" \ + " adde %1,%1,r16 \n\t" \ + " addze %2,%2 \n\t" \ +-:"=r"(c0), "=r"(c1), "=r"(c2):"0"(c0), "1"(c1), "2"(c2), "r"(i):"r16","%cc"); ++:"=r"(c0), "=r"(c1), "=r"(c2):"0"(c0), "1"(c1), "2"(c2), "r"(i):"r16","cc"); + + /* for squaring some of the terms are doubled... */ + #define SQRADD2(i, j) \ +@@ -407,14 +407,14 @@ + " addc %0,%0,r16 \n\t" \ + " adde %1,%1,r17 \n\t" \ + " addze %2,%2 \n\t" \ +-:"=r"(c0), "=r"(c1), "=r"(c2):"0"(c0), "1"(c1), "2"(c2), "r"(i), "r"(j):"r16", "r17","%cc"); ++:"=r"(c0), "=r"(c1), "=r"(c2):"0"(c0), "1"(c1), "2"(c2), "r"(i), "r"(j):"r16", "r17","cc"); + + #define SQRADDSC(i, j) \ + asm( \ + " mulld %0,%6,%7 \n\t" \ + " mulhdu %1,%6,%7 \n\t" \ + " xor %2,%2,%2 \n\t" \ +-:"=r"(sc0), "=r"(sc1), "=r"(sc2):"0"(sc0), "1"(sc1), "2"(sc2), "r"(i),"r"(j) : "%cc"); ++:"=r"(sc0), "=r"(sc1), "=r"(sc2):"0"(sc0), "1"(sc1), "2"(sc2), "r"(i),"r"(j) : "cc"); + + #define SQRADDAC(i, j) \ + asm( \ +@@ -423,7 +423,7 @@ + " mulhdu r16,%6,%7 \n\t" \ + " adde %1,%1,r16 \n\t" \ + " addze %2,%2 \n\t" \ +-:"=r"(sc0), "=r"(sc1), "=r"(sc2):"0"(sc0), "1"(sc1), "2"(sc2), "r"(i), "r"(j):"r16", "%cc"); ++:"=r"(sc0), "=r"(sc1), "=r"(sc2):"0"(sc0), "1"(sc1), "2"(sc2), "r"(i), "r"(j):"r16", "cc"); + + #define SQRADDDB \ + asm( \ +@@ -433,7 +433,7 @@ + " addc %0,%0,%3 \n\t" \ + " adde %1,%1,%4 \n\t" \ + " adde %2,%2,%5 \n\t" \ +-:"=r"(c0), "=r"(c1), "=r"(c2) : "r"(sc0), "r"(sc1), "r"(sc2), "0"(c0), "1"(c1), "2"(c2) : "%cc"); ++:"=r"(c0), "=r"(c1), "=r"(c2) : "r"(sc0), "r"(sc1), "r"(sc2), "0"(c0), "1"(c1), "2"(c2) : "cc"); + + + #elif defined(TFM_AVR32) +@@ -501,7 +501,7 @@ + " add %0,%0,%3 \n\t" \ + " adc %1,%1,%4 \n\t" \ + " adc %2,%2,%5 \n\t" \ +-:"=r"(c0), "=r"(c1), "=r"(c2) : "r"(sc0), "r"(sc1), "r"(sc2), "0"(c0), "1"(c1), "2"(c2) : "%cc"); ++:"=r"(c0), "=r"(c1), "=r"(c2) : "r"(sc0), "r"(sc1), "r"(sc2), "0"(c0), "1"(c1), "2"(c2) : "cc"); + + #elif defined(TFM_MIPS) + +@@ -571,7 +571,7 @@ + " mflo %0 \n\t" \ + " mfhi %1 \n\t" \ + " xor %2,%2,%2 \n\t" \ +-:"=r"(sc0), "=r"(sc1), "=r"(sc2):"0"(sc0), "1"(sc1), "2"(sc2), "r"(i),"r"(j) : "%cc"); ++:"=r"(sc0), "=r"(sc1), "=r"(sc2):"0"(sc0), "1"(sc1), "2"(sc2), "r"(i),"r"(j) : "cc"); + + #define SQRADDAC(i, j) \ + asm( \ From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 10:42:35 2014 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 B47988EA; Wed, 8 Jan 2014 10:42: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 86BD919CE; Wed, 8 Jan 2014 10:42: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 s08AgZO8021236; Wed, 8 Jan 2014 10:42:35 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08AgZoG021234; Wed, 8 Jan 2014 10:42:35 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201401081042.s08AgZoG021234@svn.freebsd.org> From: Pietro Cerutti Date: Wed, 8 Jan 2014 10:42:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339087 - 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: Wed, 08 Jan 2014 10:42:35 -0000 Author: gahr Date: Wed Jan 8 10:42:35 2014 New Revision: 339087 URL: http://svnweb.freebsd.org/changeset/ports/339087 Log: MFH: r339078 - Fix build on 10 (clang) [1] - STAGE-clean PR: 185419[1] Submitted by: Michael Gmelin Approved by: portmgr-lurker (mat) Modified: Directory Properties: branches/2014Q1/ (props changed) From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 11:15:22 2014 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 5392F54A; Wed, 8 Jan 2014 11:15: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 2548F1D72; Wed, 8 Jan 2014 11:15: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 s08BFMcj034783; Wed, 8 Jan 2014 11:15:22 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08BFLON034781; Wed, 8 Jan 2014 11:15:21 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081115.s08BFLON034781@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 11:15:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339091 - in branches/2014Q1: security/vuxml www/openx 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, 08 Jan 2014 11:15:22 -0000 Author: bapt Date: Wed Jan 8 11:15:21 2014 New Revision: 339091 URL: http://svnweb.freebsd.org/changeset/ports/339091 Log: MFH: r337204 - mark as FORBIDDEN (zero day SQL vuln) Security: CVE-2013-7149 Modified: branches/2014Q1/security/vuxml/vuln.xml branches/2014Q1/www/openx/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Wed Jan 8 11:08:29 2014 (r339090) +++ branches/2014Q1/security/vuxml/vuln.xml Wed Jan 8 11:15:21 2014 (r339091) @@ -51,6 +51,42 @@ Note: Please add new entries to the beg --> + + OpenX -- SQL injection vulnerability + + + openx + 3.0.2 + + + + +

Revive reports:

+
+

An SQL-injection vulnerability was recently discovered and reported + to the Revive Adserver team by Florian Sander. The vulnerability is + known to be already exploited to gain unauthorised access to the + application using brute force mechanisms, however other kind of + attacks might be possible and/or already in use. The risk is rated + to be critical as the most common end goal of the attackers is to + spread malware to the visitors of all the websites and ad networks + that the ad server is being used on.

+

The vulnerability is also present and exploitable in OpenX Source + 2.8.11 and earlier versions, potentially back to phpAdsNew 2.0.x.

+
+ + + + http://www.revive-adserver.com/security/revive-sa-2013-001/ + http://www.kreativrauschen.com/blog/2013/12/18/zero-day-vulnerability-in-openx-source-2-8-11-and-revive-adserver-3-0-1/ + CVE-2013-7149 + + + 2013-12-20 + 2013-12-22 + + + cURL library -- cert name check ignore with GnuTLS Modified: branches/2014Q1/www/openx/Makefile ============================================================================== --- branches/2014Q1/www/openx/Makefile Wed Jan 8 11:08:29 2014 (r339090) +++ branches/2014Q1/www/openx/Makefile Wed Jan 8 11:15:21 2014 (r339091) @@ -11,6 +11,8 @@ COMMENT= Free, opensource ad server in P LICENSE= GPLv2 +FORBIDDEN= CVE-2013-7149 + USE_BZIP2= yes NO_BUILD= yes SUB_LIST+= PKGNAME=${PKGNAME} From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 11:16:18 2014 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 99F4263D; Wed, 8 Jan 2014 11:16: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 858A51D88; Wed, 8 Jan 2014 11:16: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 s08BGILK034988; Wed, 8 Jan 2014 11:16:18 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08BGIrK034986; Wed, 8 Jan 2014 11:16:18 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081116.s08BGIrK034986@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 11:16:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339092 - 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, 08 Jan 2014 11:16:18 -0000 Author: bapt Date: Wed Jan 8 11:16:17 2014 New Revision: 339092 URL: http://svnweb.freebsd.org/changeset/ports/339092 Log: MFH: r338961 Document OpenSSL 1.0.1e multiple vulnerabilities. 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 Jan 8 11:15:21 2014 (r339091) +++ branches/2014Q1/security/vuxml/vuln.xml Wed Jan 8 11:16:17 2014 (r339092) @@ -51,6 +51,39 @@ Note: Please add new entries to the beg --> + + openssl -- multiple vulnerabilities + + + openssl + 1.0.1_9 + + + + +

OpenSSL development team reports:

+
+

Major changes between OpenSSL 1.0.1e and OpenSSL 1.0.1f [6 Jan 2014]:

+
    +
  • Fix for TLS record tampering bug [CVE-2013-4353]
    • +
  • Fix for TLS version checking bug [CVE-2013-6449]
    • +
  • Fix for DTLS retransmission bug [CVE-2013-6450]
    • +
+
+ + + + CVE-2013-4353 + CVE-2013-6449 + CVE-2013-6450 + http://www.openssl.org/news/openssl-1.0.1-notes.html + + + 2014-01-06 + 2014-01-06 + + + OpenX -- SQL injection vulnerability From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 11:18:12 2014 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 CA62172A; Wed, 8 Jan 2014 11:18:12 +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 B47261D99; Wed, 8 Jan 2014 11:18:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s08BICNR035323; Wed, 8 Jan 2014 11:18:12 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08BICEh035322; Wed, 8 Jan 2014 11:18:12 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081118.s08BICEh035322@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 11:18:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339093 - 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, 08 Jan 2014 11:18:13 -0000 Author: bapt Date: Wed Jan 8 11:18:11 2014 New Revision: 339093 URL: http://svnweb.freebsd.org/changeset/ports/339093 Log: MFH: r337930 Correct ident for most recent entries. No functional changes. People, please be aware that we use the FreeBSD Documentation Primer and that there are style rules we have to follow. If you are in doubt please consult me and I am more then willing to help. Hat: secteam 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 Jan 8 11:16:17 2014 (r339092) +++ branches/2014Q1/security/vuxml/vuln.xml Wed Jan 8 11:18:11 2014 (r339093) @@ -177,25 +177,23 @@ Note: Please add new entries to the beg

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.

- + 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.

+ 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.

@@ -487,7 +485,7 @@ within an hour.

The Samba project reports:

-

These are security releases in order to address CVE-2013-4408 +

These are security releases in order to address CVE-2013-4408 (DCE-RPC fragment length field is incorrectly checked) and CVE-2012-6150 (pam_winbind login without require_membership_of restrictions).

@@ -822,12 +820,12 @@ within an hour.

Ruby Gem developers report:

The patch for CVE-2013-4363 was insufficiently verified so the - combined regular expression for verifying gem version remains - vulnerable following CVE-2013-4363.

+ combined regular expression for verifying gem version remains + vulnerable following CVE-2013-4363.

RubyGems validates versions with a regular expression that is - vulnerable to denial of service due to backtracking. For specially - crafted RubyGems versions attackers can cause denial of service - through CPU consumption.

+ vulnerable to denial of service due to backtracking. For specially + crafted RubyGems versions attackers can cause denial of service + through CPU consumption.

@@ -857,9 +855,9 @@ within an hour.

Ruby Gem developers report:

RubyGems validates versions with a regular expression that is - vulnerable to denial of service due to backtracking. For specially - crafted RubyGems versions attackers can cause denial of service - through CPU consumption.

+ vulnerable to denial of service due to backtracking. For specially + crafted RubyGems versions attackers can cause denial of service + through CPU consumption.

@@ -889,11 +887,11 @@ within an hour.

Ruby developers report:

Any time a string is converted to a floating point value, a - specially crafted string can cause a heap overflow. This can lead - to a denial of service attack via segmentation faults and possibly - arbitrary code execution. Any program that converts input of - unknown origin to floating point values (especially common when - accepting JSON) are vulnerable. + specially crafted string can cause a heap overflow. This can lead + to a denial of service attack via segmentation faults and possibly + arbitrary code execution. Any program that converts input of + unknown origin to floating point values (especially common when + accepting JSON) are vulnerable.

@@ -925,11 +923,11 @@ within an hour.

The Samba project reports:

-

Samba 4.0.x before 4.0.11 and 4.1.x before 4.1.1, when LDAP or HTTP is - provided over SSL, uses world-readable permissions for a private key, - which allows local users to obtain sensitive information by reading the - key file, as demonstrated by access to the local filesystem on an AD - domain controller.

+

Samba 4.0.x before 4.0.11 and 4.1.x before 4.1.1, when LDAP or HTTP is + provided over SSL, uses world-readable permissions for a private key, + which allows local users to obtain sensitive information by reading the + key file, as demonstrated by access to the local filesystem on an AD + domain controller.

@@ -971,7 +969,7 @@ within an hour.

The Samba project reports:

-

Samba versions 3.2.0 and above (all versions of 3.2.x, 3.3.x, +

Samba versions 3.2.0 and above (all versions of 3.2.x, 3.3.x, 3.4.x, 3.5.x, 3.6.x, 4.0.x and 4.1.x) do not check the underlying file or directory ACL when opening an alternate data stream.

According to the SMB1 and SMB2+ protocols the ACL on an underlying @@ -1160,18 +1158,15 @@ within an hour.

A memory corruption vulnerability exists in the post- authentication sshd process when an AES-GCM cipher (aes128-gcm@openssh.com or aes256-gcm@openssh.com) is - selected during kex exchange. - - If exploited, this vulnerability might permit code execution + selected during kex exchange.

+

If exploited, this vulnerability might permit code execution with the privileges of the authenticated user and may therefore allow bypassing restricted shell/command configurations.

Either upgrade to 6.4 or disable AES-GCM in the server configuration. The following sshd_config option will disable - AES-GCM while leaving other ciphers active: - - Ciphers aes128-ctr,aes192-ctr,aes256-ctr,aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,aes192-cbc,aes256-cbc -

+ AES-GCM while leaving other ciphers active:

+

Ciphers aes128-ctr,aes192-ctr,aes256-ctr,aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,aes192-cbc,aes256-cbc

@@ -1198,9 +1193,9 @@ within an hour.

Quassel IRC developers report:

SQL injection vulnerability in Quassel IRC before 0.9.1, - when Qt 4.8.5 or later and PostgreSQL 8.2 or later are used, - allows remote attackers to execute arbitrary SQL commands via - a \ (backslash) in a message.

+ when Qt 4.8.5 or later and PostgreSQL 8.2 or later are used, + allows remote attackers to execute arbitrary SQL commands via + a \ (backslash) in a message.

@@ -1310,10 +1305,10 @@ within an hour.

mod_pagespeed developers report:

Various versions of mod_pagespeed are subject to critical - cross-site scripting (XSS) vulnerability, CVE-2013-6111. This - permits a hostile third party to execute JavaScript in users' - browsers in context of the domain running mod_pagespeed, which - could permit theft of users' cookies or data on the site.

+ cross-site scripting (XSS) vulnerability, CVE-2013-6111. This + permits a hostile third party to execute JavaScript in users' + browsers in context of the domain running mod_pagespeed, which + could permit theft of users' cookies or data on the site.

@@ -1343,8 +1338,8 @@ within an hour.

Salvatore Bonaccorso reports:

This vulnerability affects the DANE library of gnutls 3.1.x and - gnutls 3.2.x. A server that returns more 4 DANE entries could - corrupt the memory of a requesting client.

+ gnutls 3.2.x. A server that returns more 4 DANE entries could + corrupt the memory of a requesting client.

@@ -1373,9 +1368,9 @@ within an hour.

Alan Coopersmith reports:

Pedro Ribeiro (pedrib at gmail.com) reported an issue to the X.Org - security team in which an authenticated X client can cause an X - server to use memory after it was freed, potentially leading to - crash and/or memory corruption.

+ security team in which an authenticated X client can cause an X + server to use memory after it was freed, potentially leading to + crash and/or memory corruption.

@@ -1443,16 +1438,16 @@ within an hour.

  • Block unsafe PHP unserialization that could occur in limited - situations and setups, which can lead to remote code - execution.
    • + situations and setups, which can lead to remote code + execution.
  • Prevent a user with an Author role, using a specially crafted - request, from being able to create a post "written by" another - user.
    • + request, from being able to create a post "written by" another + user.
  • Fix insufficient input validation that could result in - redirecting or leading a user to another website.
    • + redirecting or leading a user to another website.

Additionally, we've adjusted security restrictions around file - uploads to mitigate the potential for cross-site scripting.

+ uploads to mitigate the potential for cross-site scripting.

From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 11:20:19 2014 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 9A5CCA29; Wed, 8 Jan 2014 11:20: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 85DF51DC6; Wed, 8 Jan 2014 11:20: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 s08BKJ9R037764; Wed, 8 Jan 2014 11:20:19 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08BKJ5x037763; Wed, 8 Jan 2014 11:20:19 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081120.s08BKJ5x037763@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 11:20:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339095 - branches/2014Q1/net/vortex 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, 08 Jan 2014 11:20:19 -0000 Author: bapt Date: Wed Jan 8 11:20:19 2014 New Revision: 339095 URL: http://svnweb.freebsd.org/changeset/ports/339095 Log: MFH: r337935 Fix build on current. Modified: branches/2014Q1/net/vortex/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net/vortex/Makefile ============================================================================== --- branches/2014Q1/net/vortex/Makefile Wed Jan 8 11:18:44 2014 (r339094) +++ branches/2014Q1/net/vortex/Makefile Wed Jan 8 11:20:19 2014 (r339095) @@ -20,9 +20,10 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-2.9.0 USE_GNOME= glib20 NO_STAGE= yes + do-build: cd ${WRKSRC} && ${CC} -c vortex.c -I${LOCALBASE}/include - cd ${WRKSRC} && ${CC} -o vortex vortex.o -L${LOCALBASE}/lib ${LOCALBASE}/lib/libnids.a `${LIBNET_CONFIG} --libs` -lgthread-2.0 -lpcap + cd ${WRKSRC} && ${CC} -v -o vortex vortex.o -L${LOCALBASE}/lib ${LOCALBASE}/lib/libnids.a `${LIBNET_CONFIG} --libs` -lglib-2.0 -lgthread-2.0 -lpcap cd ${WRKSRC} && ${CC} -o xpipes xpipes.c ${PTHREAD_LIBS} do-install: From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 11:24:00 2014 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 747C1B6D; Wed, 8 Jan 2014 11:24: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 60C791E42; Wed, 8 Jan 2014 11:24: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 s08BO0d6038899; Wed, 8 Jan 2014 11:24:00 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08BO0bq038898; Wed, 8 Jan 2014 11:24:00 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081124.s08BO0bq038898@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 11:24:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339096 - branches/2014Q1/audio/ncmpcpp 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, 08 Jan 2014 11:24:00 -0000 Author: bapt Date: Wed Jan 8 11:23:59 2014 New Revision: 339096 URL: http://svnweb.freebsd.org/changeset/ports/339096 Log: MFH: r337961 - Fix build on 10.x - Support stage PR: ports/185262 Submitted by: Yamagi Burmeister Modified: branches/2014Q1/audio/ncmpcpp/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/ncmpcpp/Makefile ============================================================================== --- branches/2014Q1/audio/ncmpcpp/Makefile Wed Jan 8 11:20:19 2014 (r339095) +++ branches/2014Q1/audio/ncmpcpp/Makefile Wed Jan 8 11:23:59 2014 (r339096) @@ -15,8 +15,8 @@ LIB_DEPENDS= libmpdclient.so:${PORTSDIR} libfftw3.so:${PORTSDIR}/math/fftw3 USES= iconv ncurses pkgconfig -NO_STAGE= yes USE_BZIP2= yes +USE_GCC= any GNU_CONFIGURE= yes USE_GNOME= glib20 USE_AUTOTOOLS= automake aclocal libtool @@ -90,15 +90,15 @@ CONFIGURE_ARGS+= NCURSES_CONFIG=/usr/bin .endif post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/ncmpcpp ${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/src/ncmpcpp ${STAGEDIR}${PREFIX}/bin/ .if ${PORT_OPTIONS:MDOCS} - @${ECHO_MSG} "installing additional documentation to ${DOCSDIR}" + @${ECHO_MSG} "installing additional documentation to ${STAGEDIR}${DOCSDIR}" @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR}/NEWS - ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DOCSDIR}/AUTHORS - ${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}/COPYING - ${INSTALL_DATA} ${WRKSRC}/doc/config ${DOCSDIR}/config - ${INSTALL_DATA} ${WRKSRC}/doc/keys ${DOCSDIR}/keys + ${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}/NEWS + ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${STAGEDIR}${DOCSDIR}/AUTHORS + ${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR}/COPYING + ${INSTALL_DATA} ${WRKSRC}/doc/config ${STAGEDIR}${DOCSDIR}/config + ${INSTALL_DATA} ${WRKSRC}/doc/keys ${STAGEDIR}${DOCSDIR}/keys .endif @${ECHO_MSG} "" From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 11:25:16 2014 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 708FCC5F; Wed, 8 Jan 2014 11:25: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 5BCA81E52; Wed, 8 Jan 2014 11:25: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 s08BPGYJ039160; Wed, 8 Jan 2014 11:25:16 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08BPFZJ039154; Wed, 8 Jan 2014 11:25:15 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201401081125.s08BPFZJ039154@svn.freebsd.org> From: Koop Mast Date: Wed, 8 Jan 2014 11:25:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339097 - in branches/2014Q1: security/vuxml x11-fonts/libXfont 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, 08 Jan 2014 11:25:16 -0000 Author: kwm Date: Wed Jan 8 11:25:15 2014 New Revision: 339097 URL: http://svnweb.freebsd.org/changeset/ports/339097 Log: MFH: r339086 Update libXfont to 1.4.7 This is a security fix and it is important to update, since it might lead to a privilege escalation if the X server is run as root (which is the default) Security: CVE-2013-6462 Approved by: portmgr-lurker (mat) Modified: branches/2014Q1/security/vuxml/vuln.xml branches/2014Q1/x11-fonts/libXfont/Makefile branches/2014Q1/x11-fonts/libXfont/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Wed Jan 8 11:23:59 2014 (r339096) +++ branches/2014Q1/security/vuxml/vuln.xml Wed Jan 8 11:25:15 2014 (r339097) @@ -51,6 +51,40 @@ Note: Please add new entries to the beg --> + + libXfont -- Stack buffer overflow in parsing of BDF font files in libXfont + + + libXfont + 1.4.7,1 + + + + +

freedesktop.org reports:

+
+

A BDF font file containing a longer than expected string can cause + a buffer overflow on the stack. Testing in X servers built with + Stack Protector restulted in an immediate crash when reading a + user-proveded specially crafted font.

+

As libXfont is used to read user-specified font files in all X + servers distributed by X.Org, including the Xorg server which is + often run with root privileges or as setuid-root in order to access + hardware, this bug may lead to an unprivileged user acquiring root + privileges in some systems.

+
+ + + + CVE-2013-6462 + http://lists.x.org/archives/xorg-announce/2014-January/002389.html + + + 2013-12-24 + 2014-01-08 + + + openssl -- multiple vulnerabilities Modified: branches/2014Q1/x11-fonts/libXfont/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/libXfont/Makefile Wed Jan 8 11:23:59 2014 (r339096) +++ branches/2014Q1/x11-fonts/libXfont/Makefile Wed Jan 8 11:25:15 2014 (r339097) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libXfont -PORTVERSION= 1.4.6 +PORTVERSION= 1.4.7 PORTEPOCH= 1 CATEGORIES= x11-fonts Modified: branches/2014Q1/x11-fonts/libXfont/distinfo ============================================================================== --- branches/2014Q1/x11-fonts/libXfont/distinfo Wed Jan 8 11:23:59 2014 (r339096) +++ branches/2014Q1/x11-fonts/libXfont/distinfo Wed Jan 8 11:25:15 2014 (r339097) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXfont-1.4.6.tar.bz2) = d0cbfe4554dc17ceea413cdad5601d35ed8d05d5b880e60931a8775fd1157e9f -SIZE (xorg/lib/libXfont-1.4.6.tar.bz2) = 489067 +SHA256 (xorg/lib/libXfont-1.4.7.tar.bz2) = d16ea3541835d296b19cfb05d7e64fc62173d8e7eb93284402ec761b951d1543 +SIZE (xorg/lib/libXfont-1.4.7.tar.bz2) = 482851 From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 11:31:30 2014 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 0B2E1DCE; Wed, 8 Jan 2014 11:31: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 EABA81EE8; Wed, 8 Jan 2014 11:31: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 s08BVTdD042525; Wed, 8 Jan 2014 11:31:29 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08BVTwG042523; Wed, 8 Jan 2014 11:31:29 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081131.s08BVTwG042523@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 11:31:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339098 - branches/2014Q1/www/aria2 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, 08 Jan 2014 11:31:30 -0000 Author: bapt Date: Wed Jan 8 11:31:29 2014 New Revision: 339098 URL: http://svnweb.freebsd.org/changeset/ports/339098 Log: MFH: r338066 - Update to 1.18.2 - Unbreak build for FreeBSD 8.x and 9.x (without libc++) Changes: http://sourceforge.net/projects/aria2/files/stable/aria2-1.18.2/README.rst/view Modified: branches/2014Q1/www/aria2/Makefile branches/2014Q1/www/aria2/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/aria2/Makefile ============================================================================== --- branches/2014Q1/www/aria2/Makefile Wed Jan 8 11:25:15 2014 (r339097) +++ branches/2014Q1/www/aria2/Makefile Wed Jan 8 11:31:29 2014 (r339098) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= aria2 -PORTVERSION= 1.18.1 -PORTREVISION= 1 +PORTVERSION= 1.18.2 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION} @@ -48,10 +47,6 @@ ARIA2_DISK_CACHE?= 16M .include -.if ${OSVERSION} < 1000100 && !exists(/usr/lib/libc++.so) -BROKEN= Build with clang and libc++ only -.endif - .if ${ARCH} == "powerpc" && ${OSVERSION} > 900000 BROKEN= Does not install on powerpc-9 .endif Modified: branches/2014Q1/www/aria2/distinfo ============================================================================== --- branches/2014Q1/www/aria2/distinfo Wed Jan 8 11:25:15 2014 (r339097) +++ branches/2014Q1/www/aria2/distinfo Wed Jan 8 11:31:29 2014 (r339098) @@ -1,2 +1,2 @@ -SHA256 (aria2-1.18.1.tar.xz) = 14179cec7d476204faa52c4220fd8332a1036edd2c16fa3a9a29fd5d8b763968 -SIZE (aria2-1.18.1.tar.xz) = 1326632 +SHA256 (aria2-1.18.2.tar.xz) = b4c99eea9e11d265ed90ab685571f7328a20f5c5a438da93ecdba0959170f460 +SIZE (aria2-1.18.2.tar.xz) = 1336720 From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 11:32:45 2014 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 E6FF8EB4; Wed, 8 Jan 2014 11:32:45 +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 D28461EF5; Wed, 8 Jan 2014 11:32: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 s08BWjQ9042756; Wed, 8 Jan 2014 11:32:45 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08BWj6R042755; Wed, 8 Jan 2014 11:32:45 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081132.s08BWj6R042755@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 11:32:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339099 - branches/2014Q1/security/oidentd 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, 08 Jan 2014 11:32:46 -0000 Author: bapt Date: Wed Jan 8 11:32:45 2014 New Revision: 339099 URL: http://svnweb.freebsd.org/changeset/ports/339099 Log: MFH: r338078 fix build on FreeBSD < 10 Noted By: Lukasz Wasikowski Modified: branches/2014Q1/security/oidentd/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/oidentd/Makefile ============================================================================== --- branches/2014Q1/security/oidentd/Makefile Wed Jan 8 11:31:29 2014 (r339098) +++ branches/2014Q1/security/oidentd/Makefile Wed Jan 8 11:32:45 2014 (r339099) @@ -38,7 +38,7 @@ CONFIGURE_ARGS+=--disable-masq post-patch: @${REINPLACE_CMD} -e 's,/etc/,${PREFIX}&,g' ${WRKSRC}/src/oidentd.h - @${REINPLACE_CMD} -e 's|5-9|5-11|g;s|4-9|4-11|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|\[5-9\]||g;s|\[4-9\]||g' ${WRKSRC}/configure do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/oidentd ${PREFIX}/sbin From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 11:40:03 2014 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 33E45220; Wed, 8 Jan 2014 11:40: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 1EF371F38; Wed, 8 Jan 2014 11:40: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 s08Be2qM043822; Wed, 8 Jan 2014 11:40:02 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08Be28p043815; Wed, 8 Jan 2014 11:40:02 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081140.s08Be28p043815@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 11:40:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339101 - in branches/2014Q1/lang/phantomjs: . 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, 08 Jan 2014 11:40:03 -0000 Author: bapt Date: Wed Jan 8 11:40:01 2014 New Revision: 339101 URL: http://svnweb.freebsd.org/changeset/ports/339101 Log: MFH: r338283 - Unbreak on 10.0 by USE_GCC=4.2+. This may change dependencies other than 10.x environment, so bump PORTREVISION for safety. Added: branches/2014Q1/lang/phantomjs/files/patch-config.tests-fontconfig.pro - copied unchanged from r338283, head/lang/phantomjs/files/patch-config.tests-fontconfig.pro branches/2014Q1/lang/phantomjs/files/patch-configure - copied unchanged from r338283, head/lang/phantomjs/files/patch-configure branches/2014Q1/lang/phantomjs/files/patch-mkspecs-freebsd-g++-qmake.conf - copied unchanged from r338283, head/lang/phantomjs/files/patch-mkspecs-freebsd-g++-qmake.conf Modified: branches/2014Q1/lang/phantomjs/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/lang/phantomjs/Makefile ============================================================================== --- branches/2014Q1/lang/phantomjs/Makefile Wed Jan 8 11:36:02 2014 (r339100) +++ branches/2014Q1/lang/phantomjs/Makefile Wed Jan 8 11:40:01 2014 (r339101) @@ -2,7 +2,7 @@ PORTNAME= phantomjs PORTVERSION= 1.9.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTNAME= ${PORTNAME}-${PORTVERSION}-source @@ -17,12 +17,13 @@ LIB_DEPENDS= libfreetype.so:${PORTSDIR}/ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig PROJECTHOST= phantomjs -USES= gmake dos2unix +USE_GCC= 4.2+ +USES= gmake dos2unix pkgconfig USE_ZIP= YES WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} do-build: - cd ${WRKSRC} && ${SETENV} OSTYPE=freebsd MAKEFLAGS= bash -x build.sh --jobs ${MAKE_JOBS_NUMBER} --confirm + cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} OSTYPE=freebsd MAKEFLAGS= PATH=${PATH} bash -x build.sh --jobs ${MAKE_JOBS_NUMBER} --confirm do-install: cd ${WRKSRC} && ${INSTALL_PROGRAM} bin/phantomjs ${STAGEDIR}${PREFIX}/bin/ Copied: branches/2014Q1/lang/phantomjs/files/patch-config.tests-fontconfig.pro (from r338283, head/lang/phantomjs/files/patch-config.tests-fontconfig.pro) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/lang/phantomjs/files/patch-config.tests-fontconfig.pro Wed Jan 8 11:40:01 2014 (r339101, copy of r338283, head/lang/phantomjs/files/patch-config.tests-fontconfig.pro) @@ -0,0 +1,8 @@ +--- src/qt/config.tests/x11/fontconfig/fontconfig.pro.orig 2013-12-31 13:08:24.457123877 +0900 ++++ src/qt/config.tests/x11/fontconfig/fontconfig.pro 2013-12-31 13:08:35.878125769 +0900 +@@ -1,5 +1,4 @@ + SOURCES = fontconfig.cpp +-CONFIG += x11 + CONFIG -= qt + LIBS += -lfreetype -lfontconfig + include(../../unix/freetype/freetype.pri) Copied: branches/2014Q1/lang/phantomjs/files/patch-configure (from r338283, head/lang/phantomjs/files/patch-configure) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/lang/phantomjs/files/patch-configure Wed Jan 8 11:40:01 2014 (r339101, copy of r338283, head/lang/phantomjs/files/patch-configure) @@ -0,0 +1,50 @@ +--- src/qt/configure.orig 2013-12-31 18:16:16.149123834 +0900 ++++ src/qt/configure 2013-12-31 18:21:26.989125910 +0900 +@@ -2707,8 +2707,8 @@ + ShadowMkspecs() + { + rm -rf "$outpath/mkspecs/$1" +- find "$relpath/mkspecs/$1" -type d | sed "s,^$relpath,$outpath," | xargs mkdir -p +- find "$relpath/mkspecs/$1" -type f | sed "s,^$relpath/,," | while read f; do ln -s "$relpath/$f" "$outpath/$f"; done ++ find -s "$relpath/mkspecs/$1" -type d | sed "s,^$relpath,$outpath," | xargs mkdir -p ++ find -s "$relpath/mkspecs/$1" -type f | sed "s,^$relpath/,," | while read f; do ln -s "$relpath/$f" "$outpath/$f"; done + } + + # Special case for mkspecs/features directory. +@@ -2880,6 +2880,10 @@ + ULTRIX:*) + PLATFORM=ultrix-g++ + ;; ++# FreeBSD:10.[0-9]*) ++# echo "=== ($UNAME_RELEASE) ===" ++# PLATFORM=freebsd-clang ++# ;; + FreeBSD:*) + PLATFORM=freebsd-g++ + PLATFORM_NOTES=" +@@ -3017,7 +3021,7 @@ + CFG_SM=no + PLATFORMS=`find "$relpath/mkspecs/qws" | sed "s,$relpath/mkspecs/qws/,,"` + else +- PLATFORMS=`find "$relpath/mkspecs/" -type f | grep -v qws | sed "s,$relpath/mkspecs/qws/,,"` ++ PLATFORMS=`find -s "$relpath/mkspecs/" -type f | grep -v qws | sed "s,$relpath/mkspecs/qws/,,"` + fi + + [ -z "$XPLATFORM" ] && XPLATFORM="$PLATFORM" +@@ -5118,6 +5122,7 @@ + # tests that need qmake + #------------------------------------------------------------------------------- + ++export CXX="${CXX}" + # detect availability of float math.h functions + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/floatmath "floatmath" $L_FLAGS $I_FLAGS $l_FLAGS; then + CFG_USE_FLOATMATH=yes +@@ -7665,7 +7670,7 @@ + ;; + *-g++*) + # Check gcc's version +- case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in ++ case "$(${TEST_COMPILER} -dumpversion)" in + 4*|3.4*) + ;; + 3.3*) Copied: branches/2014Q1/lang/phantomjs/files/patch-mkspecs-freebsd-g++-qmake.conf (from r338283, head/lang/phantomjs/files/patch-mkspecs-freebsd-g++-qmake.conf) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/lang/phantomjs/files/patch-mkspecs-freebsd-g++-qmake.conf Wed Jan 8 11:40:01 2014 (r339101, copy of r338283, head/lang/phantomjs/files/patch-mkspecs-freebsd-g++-qmake.conf) @@ -0,0 +1,11 @@ +--- src/qt/mkspecs/freebsd-g++/qmake.conf.orig 2013-12-23 19:04:54.234123703 +0900 ++++ src/qt/mkspecs/freebsd-g++/qmake.conf 2013-12-23 23:55:19.434123270 +0900 +@@ -51,4 +51,8 @@ + include(../common/unix.conf) + include(../common/gcc-base-unix.conf) + include(../common/g++-unix.conf) ++QMAKE_CC = $$(CC) ++QMAKE_CXX = $$(CXX) ++#QMAKE_LINK_SHLIB = $$(CXX) ++QMAKE_LINK = $$(CXX) + load(qt_config) From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 11:41:11 2014 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 30FB9327; Wed, 8 Jan 2014 11:41:11 +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 12B481F9A; Wed, 8 Jan 2014 11:41:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s08BfARE044726; Wed, 8 Jan 2014 11:41:10 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08BfACn044724; Wed, 8 Jan 2014 11:41:10 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081141.s08BfACn044724@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 11:41:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339102 - branches/2014Q1/textproc/p5-Text-ClearSilver/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, 08 Jan 2014 11:41:11 -0000 Author: bapt Date: Wed Jan 8 11:41:10 2014 New Revision: 339102 URL: http://svnweb.freebsd.org/changeset/ports/339102 Log: MFH: r338312 - Unbreak on 10.x (clang only environment). Added: branches/2014Q1/textproc/p5-Text-ClearSilver/files/patch-noe_err.h - copied unchanged from r338312, head/textproc/p5-Text-ClearSilver/files/patch-noe_err.h branches/2014Q1/textproc/p5-Text-ClearSilver/files/patch-rules.mk.in - copied unchanged from r338312, head/textproc/p5-Text-ClearSilver/files/patch-rules.mk.in Modified: Directory Properties: branches/2014Q1/ (props changed) Copied: branches/2014Q1/textproc/p5-Text-ClearSilver/files/patch-noe_err.h (from r338312, head/textproc/p5-Text-ClearSilver/files/patch-noe_err.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/textproc/p5-Text-ClearSilver/files/patch-noe_err.h Wed Jan 8 11:41:10 2014 (r339102, copy of r338312, head/textproc/p5-Text-ClearSilver/files/patch-noe_err.h) @@ -0,0 +1,29 @@ +--- cs/util/neo_err.h.orig 2013-12-31 23:09:45.821123833 +0900 ++++ cs/util/neo_err.h 2013-12-31 23:16:18.810123255 +0900 +@@ -85,7 +85,7 @@ + */ + #if defined(USE_C99_VARARG_MACROS) + #define nerr_raise(e,f,...) \ +- nerr_raisef(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,__VA_ARGS__) ++ nerr_raisef(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,## __VA_ARGS__) + #elif defined(USE_GNUC_VARARG_MACROS) + #define nerr_raise(e,f,a...) \ + nerr_raisef(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,##a) +@@ -99,7 +99,7 @@ + + #if defined(USE_C99_VARARG_MACROS) + #define nerr_raise_errno(e,f,...) \ +- nerr_raise_errnof(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,__VA_ARGS__) ++ nerr_raise_errnof(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,## __VA_ARGS__) + #elif defined(USE_GNUC_VARARG_MACROS) + #define nerr_raise_errno(e,f,a...) \ + nerr_raise_errnof(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,##a) +@@ -139,7 +139,7 @@ + */ + #if defined(USE_C99_VARARG_MACROS) + #define nerr_pass_ctx(e,f,...) \ +- nerr_pass_ctxf(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,__VA_ARGS__) ++ nerr_pass_ctxf(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,## __VA_ARGS__) + #elif defined(USE_GNUC_VARARG_MACROS) + #define nerr_pass_ctx(e,f,a...) \ + nerr_pass_ctxf(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,##a) Copied: branches/2014Q1/textproc/p5-Text-ClearSilver/files/patch-rules.mk.in (from r338312, head/textproc/p5-Text-ClearSilver/files/patch-rules.mk.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/textproc/p5-Text-ClearSilver/files/patch-rules.mk.in Wed Jan 8 11:41:10 2014 (r339102, copy of r338312, head/textproc/p5-Text-ClearSilver/files/patch-rules.mk.in) @@ -0,0 +1,11 @@ +--- cs/rules.mk.in.orig 2013-12-31 22:42:58.734123396 +0900 ++++ cs/rules.mk.in 2013-12-31 22:43:10.268123883 +0900 +@@ -158,7 +158,7 @@ + @touch Makefile.depends + @if test "x" != "x$(SOURCE_FILES)"; then \ + for II in "$(SOURCE_FILES)"; do \ +- gcc -M -MG ${CFLAGS} $$II >> Makefile.depends; \ ++ ${CC} -M -MG ${CFLAGS} $$II >> Makefile.depends; \ + done; \ + fi + @echo "** (done) " From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 11:48:22 2014 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 DEB6578F; Wed, 8 Jan 2014 11:48: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 BE16E1FEF; Wed, 8 Jan 2014 11:48: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 s08BmLcq047624; Wed, 8 Jan 2014 11:48:21 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08BmLPr047622; Wed, 8 Jan 2014 11:48:21 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201401081148.s08BmLPr047622@svn.freebsd.org> From: Rene Ladan Date: Wed, 8 Jan 2014 11:48:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339104 - branches/2014Q1/games/el-data 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, 08 Jan 2014 11:48:22 -0000 Author: rene Date: Wed Jan 8 11:48:21 2014 New Revision: 339104 URL: http://svnweb.freebsd.org/changeset/ports/339104 Log: MFH: r338863 Fix fetching, undeprecate. While here convert to USES=dos2unix PR: ports/185113 (related) Submitted by: rene Approved by: maintainer timeout (acm, 15 days) Approved by: portmgr (bapt) Modified: branches/2014Q1/games/el-data/Makefile branches/2014Q1/games/el-data/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/el-data/Makefile ============================================================================== --- branches/2014Q1/games/el-data/Makefile Wed Jan 8 11:45:58 2014 (r339103) +++ branches/2014Q1/games/el-data/Makefile Wed Jan 8 11:48:21 2014 (r339104) @@ -7,8 +7,8 @@ CATEGORIES= games MASTER_SITES= http://el.beplacid.net/downloads/:data \ http://www.eternal-lands.com/:data \ http://el.rauchs-home.de/client/:data \ - http://www.eternallands.co.uk/:sound \ - http://www.eternallands.co.uk/:music + http://www.gm.fh-koeln.de/~linke/EL-Downloads/:sound \ + http://www.gm.fh-koeln.de/~linke/EL-Downloads/:music PKGNAMEPREFIX= el- DISTFILES= ${EL_DATA}:data DIST_SUBDIR= ${PKGNAMEPREFIX:S/-//} @@ -16,13 +16,11 @@ DIST_SUBDIR= ${PKGNAMEPREFIX:S/-//} MAINTAINER= acm@FreeBSD.org COMMENT= Eternal Lands data, sound, and music files -DEPRECATED= Broken for more than 6 month -EXPIRATION_DATE= 2013-12-22 - USE_ZIP= yes NO_PACKAGE= Package will be 140MB, set FORCE_PACKAGE if you really want it NO_BUILD= yes -USE_DOS2UNIX= *.ini *.txt +USES= dos2unix +DOS2UNIX_GLOB= *.ini *.txt DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX:S/-//} PLIST= ${WRKDIR}/pkg-plist @@ -38,13 +36,12 @@ NO_STAGE= yes .include .if ${PORT_OPTIONS:MELSOUND} -BROKEN= EL_sound_191.zip is unfetchable DISTFILES+= EL_sound_191${EXTRACT_SUFX}:sound HAVE_ESOUND= yes .endif .if ${PORT_OPTIONS:MELMUSIC} -DISTFILES+= music_full${EXTRACT_SUFX}:music +DISTFILES+= EL_music_full${EXTRACT_SUFX}:music HAVE_EMUSIC= yes .endif @@ -56,7 +53,7 @@ do-extract: .endif .if ${PORT_OPTIONS:MELMUSIC} @${MKDIR} ${WRKSRC}/music - @${UNZIP_CMD} -q ${_DISTDIR}/music_full${EXTRACT_SUFX} -d ${WRKSRC}/music + @${UNZIP_CMD} -q ${_DISTDIR}/EL_music_full${EXTRACT_SUFX} -d ${WRKSRC}/music .endif post-extract: Modified: branches/2014Q1/games/el-data/distinfo ============================================================================== --- branches/2014Q1/games/el-data/distinfo Wed Jan 8 11:45:58 2014 (r339103) +++ branches/2014Q1/games/el-data/distinfo Wed Jan 8 11:48:21 2014 (r339104) @@ -2,5 +2,5 @@ SHA256 (el/el_linux_192.zip) = bd7002581 SIZE (el/el_linux_192.zip) = 65888714 SHA256 (el/EL_sound_191.zip) = e73046ab03c916d562cda2d243427969678e3bb7a22d98c3b44646b4c3ae5da7 SIZE (el/EL_sound_191.zip) = 42979628 -SHA256 (el/music_full.zip) = 1ea4de25081034ac684aaebf127ab6ca8524ba5367532863d84d63837dd631ec -SIZE (el/music_full.zip) = 65511882 +SHA256 (el/EL_music_full.zip) = 1ea4de25081034ac684aaebf127ab6ca8524ba5367532863d84d63837dd631ec +SIZE (el/EL_music_full.zip) = 65511882 From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 11:49:35 2014 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 ADB6186D; Wed, 8 Jan 2014 11:49: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 8D1A81FF7; Wed, 8 Jan 2014 11:49: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 s08BnZwf047824; Wed, 8 Jan 2014 11:49:35 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08BnZjE047822; Wed, 8 Jan 2014 11:49:35 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201401081149.s08BnZjE047822@svn.freebsd.org> From: Rene Ladan Date: Wed, 8 Jan 2014 11:49:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339105 - branches/2014Q1/games/el-data 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, 08 Jan 2014 11:49:35 -0000 Author: rene Date: Wed Jan 8 11:49:34 2014 New Revision: 339105 URL: http://svnweb.freebsd.org/changeset/ports/339105 Log: MFH: r338896 - Update to version 193 (*) - Stagify - Mark as architecture-independent - Remove NO_PACKAGE (pkg will show the package size upon installation) (*) Version 192 is not accepted by the servers any longer, version 193 allows me to connect to the servers, create an account, and wander around. Approved by: acm (implicit) Approved by: portmgr (bapt) Modified: branches/2014Q1/games/el-data/Makefile branches/2014Q1/games/el-data/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/el-data/Makefile ============================================================================== --- branches/2014Q1/games/el-data/Makefile Wed Jan 8 11:48:21 2014 (r339104) +++ branches/2014Q1/games/el-data/Makefile Wed Jan 8 11:49:34 2014 (r339105) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= data -PORTVERSION= 192 +PORTVERSION= 193 CATEGORIES= games MASTER_SITES= http://el.beplacid.net/downloads/:data \ http://www.eternal-lands.com/:data \ @@ -16,8 +16,8 @@ DIST_SUBDIR= ${PKGNAMEPREFIX:S/-//} MAINTAINER= acm@FreeBSD.org COMMENT= Eternal Lands data, sound, and music files +NO_ARCH= yes USE_ZIP= yes -NO_PACKAGE= Package will be 140MB, set FORCE_PACKAGE if you really want it NO_BUILD= yes USES= dos2unix DOS2UNIX_GLOB= *.ini *.txt @@ -32,7 +32,6 @@ OPTIONS_DEFAULT= ELSOUND ELMUSIC ELSOUND_DESC= Install additional sound files ELMUSIC_DESC= Install additional music files -NO_STAGE= yes .include .if ${PORT_OPTIONS:MELSOUND} @@ -74,9 +73,9 @@ pre-install: @${ECHO_CMD} "@dirrm %%DATADIR%%" >> ${PLIST} do-install: - ${MKDIR} ${DATADIR} + ${MKDIR} ${STAGEDIR}${DATADIR} @cd ${WRKSRC} && \ - ${FIND} * -type d -exec ${MKDIR} "${DATADIR}/{}" \; && \ - ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \; + ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DATADIR}/{}" \; && \ + ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DATADIR}/{}" \; .include Modified: branches/2014Q1/games/el-data/distinfo ============================================================================== --- branches/2014Q1/games/el-data/distinfo Wed Jan 8 11:48:21 2014 (r339104) +++ branches/2014Q1/games/el-data/distinfo Wed Jan 8 11:49:34 2014 (r339105) @@ -1,5 +1,5 @@ -SHA256 (el/el_linux_192.zip) = bd700258110b8ac7b540cce1517777ca718c22cb5330989e097206adf962b8e9 -SIZE (el/el_linux_192.zip) = 65888714 +SHA256 (el/el_linux_193.zip) = 32881313e48bf9a6520dc77b55ef1f4ede3b8922383c4976ca38d0aceeea628a +SIZE (el/el_linux_193.zip) = 67104165 SHA256 (el/EL_sound_191.zip) = e73046ab03c916d562cda2d243427969678e3bb7a22d98c3b44646b4c3ae5da7 SIZE (el/EL_sound_191.zip) = 42979628 SHA256 (el/EL_music_full.zip) = 1ea4de25081034ac684aaebf127ab6ca8524ba5367532863d84d63837dd631ec From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 11:54:03 2014 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 8AF549B7; Wed, 8 Jan 2014 11:54: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 76FAA10BA; Wed, 8 Jan 2014 11:54: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 s08Bs36q050922; Wed, 8 Jan 2014 11:54:03 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08Bs3Jt050921; Wed, 8 Jan 2014 11:54:03 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201401081154.s08Bs3Jt050921@svn.freebsd.org> From: Rene Ladan Date: Wed, 8 Jan 2014 11:54:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339106 - branches/2014Q1/games/el 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, 08 Jan 2014 11:54:03 -0000 Author: rene Date: Wed Jan 8 11:54:02 2014 New Revision: 339106 URL: http://svnweb.freebsd.org/changeset/ports/339106 Log: MFH: r338864 Try to build after games/el-data is resurrected. Fails to link on 10.0-amd64 with old Xorg, so mark BROKEN: > LINK el.bin > /usr/bin/ld: invalid DSO for symbol `XConvertSelection' definition > /usr/local/lib/libX11.so.6: could not read symbols: Bad value While here convert to new LIB_DEPENDS and USES=gmake PR: ports/185113 (related) Submitted by: rene Approved by: maintainer timeout (acm, 15 days) Approved by: portmgr (bapt) Modified: branches/2014Q1/games/el/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/el/Makefile ============================================================================== --- branches/2014Q1/games/el/Makefile Wed Jan 8 11:49:34 2014 (r339105) +++ branches/2014Q1/games/el/Makefile Wed Jan 8 11:54:02 2014 (r339106) @@ -12,9 +12,9 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= acm@FreeBSD.org COMMENT= Eternal Lands is a free 3D MMORPG -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ - vorbis.4:${PORTSDIR}/audio/libvorbis \ - cal3d.12:${PORTSDIR}/graphics/cal3d +LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ + libvorbis.so.4:${PORTSDIR}/audio/libvorbis \ + libcal3d.so.12:${PORTSDIR}/graphics/cal3d RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/el.ini:${PORTSDIR}/games/el-data PROJECTHOST= bsdistfiles @@ -24,6 +24,7 @@ USE_OPENAL= al alut USE_GNOME= libxml2 USE_SDL= sdl net image USE_GL= yes +USES= gmake ALL_TARGET= el.bin MAKEFILE= Makefile.bsd @@ -32,8 +33,8 @@ PLIST= ${WRKDIR}/pkg-plist NO_STAGE= yes .include -.if ${ARCH} == "sparc64" -BROKEN= Does not compile on sparc64 +.if ${ARCH} == "sparc64" || ${ARCH} == "amd64" +BROKEN= Does not build on ${ARCH} .endif pre-install: From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 11:56:13 2014 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 DB1B3AB7; Wed, 8 Jan 2014 11:56: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 C742A10D3; Wed, 8 Jan 2014 11:56: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 s08BuDHN051315; Wed, 8 Jan 2014 11:56:13 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08BuD0a051314; Wed, 8 Jan 2014 11:56:13 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201401081156.s08BuD0a051314@svn.freebsd.org> From: Rene Ladan Date: Wed, 8 Jan 2014 11:56:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339107 - branches/2014Q1/games/el 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, 08 Jan 2014 11:56:13 -0000 Author: rene Date: Wed Jan 8 11:56:13 2014 New Revision: 339107 URL: http://svnweb.freebsd.org/changeset/ports/339107 Log: MFH: r338874 Fix build (on my 10.0-amd64 laptop at least). Submitted by: marino Approved by: acm (maintainer, implicit) Approved by: portmgr (bapt) Modified: branches/2014Q1/games/el/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/el/Makefile ============================================================================== --- branches/2014Q1/games/el/Makefile Wed Jan 8 11:54:02 2014 (r339106) +++ branches/2014Q1/games/el/Makefile Wed Jan 8 11:56:13 2014 (r339107) @@ -24,7 +24,7 @@ USE_OPENAL= al alut USE_GNOME= libxml2 USE_SDL= sdl net image USE_GL= yes -USES= gmake +LDFLAGS+= -L${LOCALBASE}/lib -lX11 ALL_TARGET= el.bin MAKEFILE= Makefile.bsd @@ -33,7 +33,7 @@ PLIST= ${WRKDIR}/pkg-plist NO_STAGE= yes .include -.if ${ARCH} == "sparc64" || ${ARCH} == "amd64" +.if ${ARCH} == "sparc64" BROKEN= Does not build on ${ARCH} .endif From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 11:57:49 2014 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 7B66CBB4; Wed, 8 Jan 2014 11:57: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 5B81D10E7; Wed, 8 Jan 2014 11:57: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 s08Bvnkl051615; Wed, 8 Jan 2014 11:57:49 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08BvmtM051607; Wed, 8 Jan 2014 11:57:48 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201401081157.s08BvmtM051607@svn.freebsd.org> From: Rene Ladan Date: Wed, 8 Jan 2014 11:57:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339108 - in branches/2014Q1/games/el: . 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, 08 Jan 2014 11:57:49 -0000 Author: rene Date: Wed Jan 8 11:57:47 2014 New Revision: 339108 URL: http://svnweb.freebsd.org/changeset/ports/339108 Log: MFH: r338898 - Update to 193 to be able to connect to the servers again - Repack distribution file, reroll/simplify patches. The original host is gone, and there is no obvious replacement for the distribution file, so roll our own from the referenced git repository: git://git.berlios.de/elc branch master, commit 86780d5dd43b3c9b66fa014944cf1811fa78d161 - Stagify - Strip library versions [1] Submitted by: portlint [1] Approved by: acm (implicit) Approved by: portmgr (bapt) Modified: branches/2014Q1/games/el/Makefile branches/2014Q1/games/el/distinfo branches/2014Q1/games/el/files/patch-Makefile.bsd branches/2014Q1/games/el/files/patch-make.defaults branches/2014Q1/games/el/files/patch-platform.h Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/el/Makefile ============================================================================== --- branches/2014Q1/games/el/Makefile Wed Jan 8 11:56:13 2014 (r339107) +++ branches/2014Q1/games/el/Makefile Wed Jan 8 11:57:47 2014 (r339108) @@ -2,23 +2,20 @@ # $FreeBSD$ PORTNAME= el -PORTVERSION= 192 -PORTREVISION= 3 +PORTVERSION= 193 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ - ${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,} -DIST_SUBDIR= ${PORTNAME} +MASTER_SITES= LOCAL/rene \ + ftp://rene-ladan.nl/pub/distfiles/ MAINTAINER= acm@FreeBSD.org COMMENT= Eternal Lands is a free 3D MMORPG LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ - libvorbis.so.4:${PORTSDIR}/audio/libvorbis \ - libcal3d.so.12:${PORTSDIR}/graphics/cal3d + libvorbis.so:${PORTSDIR}/audio/libvorbis \ + libcal3d.so:${PORTSDIR}/graphics/cal3d RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/el.ini:${PORTSDIR}/games/el-data -PROJECTHOST= bsdistfiles -USE_BZIP2= yes +USE_XZ= yes USE_GMAKE= yes USE_OPENAL= al alut USE_GNOME= libxml2 @@ -30,7 +27,6 @@ ALL_TARGET= el.bin MAKEFILE= Makefile.bsd PLIST= ${WRKDIR}/pkg-plist -NO_STAGE= yes .include .if ${ARCH} == "sparc64" @@ -47,8 +43,8 @@ pre-install: @${ECHO} "@dirrmtry %%DATADIR%%" >> ${PLIST} do-install: - @${MKDIR} ${DATADIR} - ${INSTALL_SCRIPT} ${WRKDIR}/el ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/el.bin ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKDIR}/el ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/el.bin ${STAGEDIR}${DATADIR} .include Modified: branches/2014Q1/games/el/distinfo ============================================================================== --- branches/2014Q1/games/el/distinfo Wed Jan 8 11:56:13 2014 (r339107) +++ branches/2014Q1/games/el/distinfo Wed Jan 8 11:57:47 2014 (r339108) @@ -1,2 +1,2 @@ -SHA256 (el/el-192.tar.bz2) = 0a88f38642d1a05c7b533101201b80632af398cb0bdc616d2d33115e0689cb13 -SIZE (el/el-192.tar.bz2) = 2181980 +SHA256 (el-193.tar.xz) = d8b815a1c1169102ed3fbd440b66afc90fa78589f8e49c4ebd1c31addc0021d0 +SIZE (el-193.tar.xz) = 1941152 Modified: branches/2014Q1/games/el/files/patch-Makefile.bsd ============================================================================== --- branches/2014Q1/games/el/files/patch-Makefile.bsd Wed Jan 8 11:56:13 2014 (r339107) +++ branches/2014Q1/games/el/files/patch-Makefile.bsd Wed Jan 8 11:57:47 2014 (r339108) @@ -1,5 +1,5 @@ ---- Makefile.bsd.orig 2011-10-20 11:30:54.000000000 -0500 -+++ Makefile.bsd 2011-10-20 11:40:50.000000000 -0500 +--- Makefile.bsd.orig 2014-01-06 15:25:15.000000000 +0100 ++++ Makefile.bsd 2014-01-06 15:49:31.000000000 +0100 @@ -2,17 +2,19 @@ -include make.conf @@ -12,21 +12,21 @@ -_CFLAGS=$(PLATFORM) -O2 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) -CXXFLAGS=$(PLATFORM) $(CXXWARN) -O0 -ggdb -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) -_CXXFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) -+CFLAGS+=$(CWARN) $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) -+_CFLAGS=-fomit-frame-pointer -ffast-math -pipe $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) -+CXXFLAGS+=$(CXXWARN) $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) -+_CXXFLAGS=-fomit-frame-pointer -ffast-math $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) ++CFLAGS+=$(PLATFORM) $(CWARN) $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) ++_CFLAGS=-fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) ++CXXFLAGS+=$(CXXWARN) $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) ++_CXXFLAGS=-fomit-frame-pointer -ffast-math $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) PNG_SCREENSHOT_LIBS = -lpng -LDFLAGS=$(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lcal3d -lm $(EXTRA_LIBS) -lz -lpng -lvorbis -lvorbisfile \ -+LDFLAGS+=`$(SDL_CONFIG) --libs` $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lcal3d -lm $(EXTRA_LIBS) -lz -lpng -lvorbis -lvorbisfile \ ++LDFLAGS+=$(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lcal3d -lm $(EXTRA_LIBS) -lz -lpng -lvorbis -lvorbisfile \ $(foreach FEATURE, $(FEATURES), $($(FEATURE)_LIBS)) -_LDFLAGS=$(XDIR) -lGL -lpthread -lstdc++ +_LDFLAGS=$(XDIR) -lGL -pthread -lstdc++ # This works on Ubuntu 8.04 (LTS) at least # Install these packages in addition to those required for a standard build -@@ -87,16 +89,16 @@ +@@ -86,16 +88,16 @@ DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P) #(shell echo $OBJ |sed s/\.o/\.P/)) Modified: branches/2014Q1/games/el/files/patch-make.defaults ============================================================================== --- branches/2014Q1/games/el/files/patch-make.defaults Wed Jan 8 11:56:13 2014 (r339107) +++ branches/2014Q1/games/el/files/patch-make.defaults Wed Jan 8 11:57:47 2014 (r339108) @@ -1,15 +1,15 @@ ---- make.defaults.orig 2011-10-20 11:41:47.000000000 -0500 -+++ make.defaults 2011-10-20 11:42:04.000000000 -0500 -@@ -65,8 +65,6 @@ +--- make.defaults.orig ++++ make.defaults +@@ -69,8 +69,6 @@ FEATURES += MIDDLE_MOUSE_PASTE # Paste using the middle mouse button from the pr --PLATFORM=-march=i686 +-PLATFORM=-march=native -XDIR=-L/usr/X11R6/lib CWARN=-Wall -Wdeclaration-after-statement # -Wno-pointer-sign -Wno-sign-compare -Werror CXXWARN=-Wall -@@ -82,7 +80,3 @@ +@@ -86,7 +84,3 @@ CXXWARN=-Wall #EXTRA_INCLUDES=-IC:\\Programme\\Dev-Cpp\\Include #EXTRA_LIBS=-lz #EXTRA_STATICLIBS=libs/zlib.a Modified: branches/2014Q1/games/el/files/patch-platform.h ============================================================================== --- branches/2014Q1/games/el/files/patch-platform.h Wed Jan 8 11:56:13 2014 (r339107) +++ branches/2014Q1/games/el/files/patch-platform.h Wed Jan 8 11:57:47 2014 (r339108) @@ -1,5 +1,5 @@ ---- platform.h 2009-01-20 09:51:39.000000000 -0500 -+++ platform.h 2009-01-20 09:51:58.000000000 -0500 +--- platform.h.orig ++++ platform.h @@ -11,7 +11,7 @@ // http://predef.sourceforge.net/prearch.html , these ought to work on // gcc, Sun Studio and Visual Studio. From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 11:58:17 2014 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 784A3CC0; Wed, 8 Jan 2014 11:58: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 59A5E10F3; Wed, 8 Jan 2014 11:58: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 s08BwHSU051853; Wed, 8 Jan 2014 11:58:17 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08BwF5N051843; Wed, 8 Jan 2014 11:58:15 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201401081158.s08BwF5N051843@svn.freebsd.org> From: Mathieu Arnold Date: Wed, 8 Jan 2014 11:58:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339109 - in branches/2014Q1/net/jags: . 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, 08 Jan 2014 11:58:17 -0000 Author: mat Date: Wed Jan 8 11:58:14 2014 New Revision: 339109 URL: http://svnweb.freebsd.org/changeset/ports/339109 Log: MFH: r339078 - Fix build on 10 (clang) [1] - STAGE-clean PR: 185419[1] Submitted by: Michael Gmelin Approved by: portmgr (implicit) Added: branches/2014Q1/net/jags/files/patch-src_jagsabout.h - copied unchanged from r339078, head/net/jags/files/patch-src_jagsabout.h branches/2014Q1/net/jags/files/patch-src_jagsmenubar.h - copied unchanged from r339078, head/net/jags/files/patch-src_jagsmenubar.h branches/2014Q1/net/jags/files/patch-src_jagsmntswindow.h - copied unchanged from r339078, head/net/jags/files/patch-src_jagsmntswindow.h branches/2014Q1/net/jags/files/patch-src_jagsmountwith.h - copied unchanged from r339078, head/net/jags/files/patch-src_jagsmountwith.h branches/2014Q1/net/jags/files/patch-src_jagsmountwithcommand.h - copied unchanged from r339078, head/net/jags/files/patch-src_jagsmountwithcommand.h branches/2014Q1/net/jags/files/patch-src_jagsprefsdialog.h - copied unchanged from r339078, head/net/jags/files/patch-src_jagsprefsdialog.h branches/2014Q1/net/jags/files/patch-src_jagssearchdialog.h - copied unchanged from r339078, head/net/jags/files/patch-src_jagssearchdialog.h branches/2014Q1/net/jags/files/patch-src_mainwindow.h - copied unchanged from r339078, head/net/jags/files/patch-src_mainwindow.h Modified: branches/2014Q1/net/jags/Makefile (contents, props changed) branches/2014Q1/net/jags/files/patch-src_mainwindow.cpp (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net/jags/Makefile ============================================================================== --- branches/2014Q1/net/jags/Makefile Wed Jan 8 11:57:47 2014 (r339108) +++ branches/2014Q1/net/jags/Makefile Wed Jan 8 11:58:14 2014 (r339109) @@ -16,16 +16,10 @@ SAMBA_PORT?= net/samba36 CONFLICTS= jags-1.* -USE_GMAKE= yes +USES= gmake USE_XORG= xi xext x11 USE_GNOME= gtk12 GNU_CONFIGURE= yes - -NO_STAGE= yes -.include - -.if ${OSVERSION} >= 700042 CFLAGS+= -ffriend-injection -.endif -.include +.include Copied: branches/2014Q1/net/jags/files/patch-src_jagsabout.h (from r339078, head/net/jags/files/patch-src_jagsabout.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net/jags/files/patch-src_jagsabout.h Wed Jan 8 11:58:14 2014 (r339109, copy of r339078, head/net/jags/files/patch-src_jagsabout.h) @@ -0,0 +1,9 @@ +--- ./src/jagsabout.h.orig 2003-09-04 23:14:54.000000000 +0200 ++++ ./src/jagsabout.h 2014-01-08 10:20:11.000000000 +0100 +@@ -42,4 +42,6 @@ + + }; + ++gint on_close(GtkWidget *widget, JagsAbout *about); ++ + #endif Copied: branches/2014Q1/net/jags/files/patch-src_jagsmenubar.h (from r339078, head/net/jags/files/patch-src_jagsmenubar.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net/jags/files/patch-src_jagsmenubar.h Wed Jan 8 11:58:14 2014 (r339109, copy of r339078, head/net/jags/files/patch-src_jagsmenubar.h) @@ -0,0 +1,26 @@ +--- ./src/jagsmenubar.h.orig 2003-09-04 23:14:54.000000000 +0200 ++++ ./src/jagsmenubar.h 2014-01-08 10:20:11.000000000 +0100 +@@ -105,4 +105,23 @@ + + }; + ++gint mount_and_browse(GtkMenuItem *item, JagsMenuBar *jmb); ++gint browse(GtkMenuItem *item, JagsMenuBar *jmb); ++gint mount(GtkMenuItem *item, JagsMenuBar *jmb); ++gint mount_with(GtkMenuItem *item, JagsMenuBar *jmb); ++gint mount_with_command(GtkMenuItem *item, JagsMenuBar *jmb); ++gint preferences(GtkMenuItem *item, JagsConfig *conf); ++gint about(GtkMenuItem *item, JagsMenuBar *jmb); ++gint my_search(GtkMenuItem *item, JagsMenuBar *jmb); ++gint umount(GtkMenuItem *item, JagsMenuBar *jmb); ++gint mnts_window(GtkMenuItem *item, JagsMenuBar *jmb); ++gint bookmark_menu(GtkMenuItem *item, JagsMenuBar *jmb); ++gint bookmark_add(GtkMenuItem *item, JagsMenuBar *jmb); ++gint bookmark_edit(GtkMenuItem *item, JagsMenuBar *jmb); ++gint bookmark_selected(GtkMenuItem *item, JagsMenuBar *jmb); ++gint bookmarks_add_edit(GtkMenuItem *item, JagsMenuBar *jmb); ++void bookmarks_radio_local_toggle (GtkWidget *widget, gpointer data); ++gint bookmarks_edit_add_close(GtkWidget *widget, gpointer data); ++gint bookmarks_edit_add_ok(GtkWidget *widget, gpointer data); ++ + #endif Copied: branches/2014Q1/net/jags/files/patch-src_jagsmntswindow.h (from r339078, head/net/jags/files/patch-src_jagsmntswindow.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net/jags/files/patch-src_jagsmntswindow.h Wed Jan 8 11:58:14 2014 (r339109, copy of r339078, head/net/jags/files/patch-src_jagsmntswindow.h) @@ -0,0 +1,17 @@ +--- ./src/jagsmntswindow.h.orig 2003-09-04 23:14:54.000000000 +0200 ++++ ./src/jagsmntswindow.h 2014-01-08 10:20:11.000000000 +0100 +@@ -64,4 +64,14 @@ + + }; + ++gint close_mntswindow(GtkWidget *widget, JagsMntsWindow *me); ++gint toggle_automount(GtkWidget *widget, JagsMntsWindow *me); ++gint unmount_share(GtkWidget *widget, JagsMntsWindow *me); ++gint mnts_browse(GtkWidget *widget, JagsMntsWindow *me); ++gint change_mnt_path(GtkWidget *widget, JagsMntsWindow *me); ++void selection_made(GtkWidget *, gint, gint, GdkEventButton *, ++ gpointer, JagsMntsWindow *); ++gint mw_button_press(GtkWidget *widget, GdkEventButton *event, ++ JagsMntsWindow *me); ++ + #endif Copied: branches/2014Q1/net/jags/files/patch-src_jagsmountwith.h (from r339078, head/net/jags/files/patch-src_jagsmountwith.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net/jags/files/patch-src_jagsmountwith.h Wed Jan 8 11:58:14 2014 (r339109, copy of r339078, head/net/jags/files/patch-src_jagsmountwith.h) @@ -0,0 +1,10 @@ +--- ./src/jagsmountwith.h.orig 2003-09-04 23:14:54.000000000 +0200 ++++ ./src/jagsmountwith.h 2014-01-08 10:20:11.000000000 +0100 +@@ -50,4 +50,7 @@ + void browse(void); + }; + ++gint on_mount_with_ok(GtkWidget *, JagsMountWith *); ++gint on_mount_with_cancel(GtkWidget *, JagsMountWith *); ++ + #endif Copied: branches/2014Q1/net/jags/files/patch-src_jagsmountwithcommand.h (from r339078, head/net/jags/files/patch-src_jagsmountwithcommand.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net/jags/files/patch-src_jagsmountwithcommand.h Wed Jan 8 11:58:14 2014 (r339109, copy of r339078, head/net/jags/files/patch-src_jagsmountwithcommand.h) @@ -0,0 +1,10 @@ +--- ./src/jagsmountwithcommand.h.orig 2003-09-04 23:14:54.000000000 +0200 ++++ ./src/jagsmountwithcommand.h 2014-01-08 10:20:11.000000000 +0100 +@@ -45,5 +45,7 @@ + ~JagsMountWithCommand(); + }; + ++gint on_mount_with_command_ok(GtkWidget *, JagsMountWithCommand *); ++gint on_mount_with_command_cancel(GtkWidget *, JagsMountWithCommand *); + + #endif Copied: branches/2014Q1/net/jags/files/patch-src_jagsprefsdialog.h (from r339078, head/net/jags/files/patch-src_jagsprefsdialog.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net/jags/files/patch-src_jagsprefsdialog.h Wed Jan 8 11:58:14 2014 (r339109, copy of r339078, head/net/jags/files/patch-src_jagsprefsdialog.h) @@ -0,0 +1,13 @@ +--- ./src/jagsprefsdialog.h.orig 2003-09-04 23:14:54.000000000 +0200 ++++ ./src/jagsprefsdialog.h 2014-01-08 10:20:11.000000000 +0100 +@@ -57,4 +57,10 @@ + ~JagsPrefsDialog(); + }; + ++gint onPluginsChanged(GtkWidget *, GdkEvent *, JagsPrefsDialog *pd); ++gint on_cancel(GtkWidget *widget, JagsConfig *conf); ++gint on_apply(GtkWidget *widget, JagsConfig *conf2); ++gint on_close(GtkWidget *widget, JagsConfig *conf); ++void on_toggle_sound(GtkWidget *widget, JagsConfig *conf); ++ + #endif Copied: branches/2014Q1/net/jags/files/patch-src_jagssearchdialog.h (from r339078, head/net/jags/files/patch-src_jagssearchdialog.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net/jags/files/patch-src_jagssearchdialog.h Wed Jan 8 11:58:14 2014 (r339109, copy of r339078, head/net/jags/files/patch-src_jagssearchdialog.h) @@ -0,0 +1,16 @@ +--- ./src/jagssearchdialog.h.orig 2003-09-04 23:14:54.000000000 +0200 ++++ ./src/jagssearchdialog.h 2014-01-08 10:20:11.000000000 +0100 +@@ -52,6 +52,13 @@ + void set_string(gchar *s); + }; + ++gint search_clicked(GtkWidget *widget, JagsSearchDialog *me); ++gint on_close(GtkWidget *widget, JagsSearchDialog *me); ++gint onn_collapse(GtkWidget *item, JagsSearchDialog *mw); ++gint expandd_server(GtkWidget *widget, JagsSearchDialog *mw); ++gint onn_share_selected(GtkTree *tree, GtkWidget *widget, gpointer data, JagsSearchDialog *mw); ++gint check_dd_click(GtkWidget *widget, GdkEventButton *event, JagsSearchDialog *mw); ++gint button_presss (GtkWidget *widget, GdkEventButton *event, JagsSearchDialog *mw); + + + #endif Modified: branches/2014Q1/net/jags/files/patch-src_mainwindow.cpp ============================================================================== --- branches/2014Q1/net/jags/files/patch-src_mainwindow.cpp Wed Jan 8 11:57:47 2014 (r339108) +++ branches/2014Q1/net/jags/files/patch-src_mainwindow.cpp Wed Jan 8 11:58:14 2014 (r339109) @@ -1,5 +1,5 @@ ---- src/mainwindow.cpp.orig 2008-09-16 14:27:01.000000000 +0200 -+++ src/mainwindow.cpp 2008-09-16 14:58:48.000000000 +0200 +--- ./src/mainwindow.cpp.orig 2003-09-04 23:14:54.000000000 +0200 ++++ ./src/mainwindow.cpp 2014-01-08 10:20:11.000000000 +0100 @@ -299,6 +299,8 @@ gchar *workgroup = NULL, *command = NULL, *comment = NULL, *comment2 = NULL; gint h; Copied: branches/2014Q1/net/jags/files/patch-src_mainwindow.h (from r339078, head/net/jags/files/patch-src_mainwindow.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net/jags/files/patch-src_mainwindow.h Wed Jan 8 11:58:14 2014 (r339109, copy of r339078, head/net/jags/files/patch-src_mainwindow.h) @@ -0,0 +1,15 @@ +--- ./src/mainwindow.h.orig 2003-09-04 23:14:54.000000000 +0200 ++++ ./src/mainwindow.h 2014-01-08 10:20:11.000000000 +0100 +@@ -59,5 +59,12 @@ + + gint on_collapse(GtkWidget *item, MainWindow *mw); + gint check_server_click(GtkWidget *widget, GdkEventButton *event, MainWindow *mw); ++gint expand_network(GtkWidget *widget, MainWindow *mw); ++gint expand_workgroup(GtkWidget *widget, MainWindow *mw); ++gint expand_server(GtkWidget *widget, GtkTree *root_tree); ++gint on_share_selected(GtkTree *tree, GtkWidget *widget, gpointer data); ++gint on_workgroup_selected(GtkTree *tree, GtkWidget *widget, GtkTree *root_tree); ++gint check_d_click(GtkWidget *widget, GdkEventButton *event, MainWindow *mw); ++gint button_press(GtkWidget *, GdkEventButton *, MainWindow *mw); + + #endif From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 12:36:13 2014 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 C87F84E9; Wed, 8 Jan 2014 12:36: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 B438B1410; Wed, 8 Jan 2014 12:36: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 s08CaDlU066311; Wed, 8 Jan 2014 12:36:13 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08CaD0q066309; Wed, 8 Jan 2014 12:36:13 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081236.s08CaD0q066309@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 12:36:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339112 - branches/2014Q1/net-mgmt/collectd5/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, 08 Jan 2014 12:36:13 -0000 Author: bapt Date: Wed Jan 8 12:36:13 2014 New Revision: 339112 URL: http://svnweb.freebsd.org/changeset/ports/339112 Log: MFH: r338492 Fix build with clang (on FreeBSD-10) with curl plugin enabled: curl_xml.c:617:37: error: variable 'url' is uninitialized when used here [-Werror,-Wuninitialized] status, db->curl_errbuf, url); ^~~ ./plugin.h:342:47: note: expanded from macro 'ERROR' #define ERROR(...) plugin_log (LOG_ERR, __VA_ARGS__) ^ curl_xml.c:610:12: note: initialize the variable 'url' to silence this warning char *url; ^ = NULL 1 error generated. Added: branches/2014Q1/net-mgmt/collectd5/files/patch-src-curl_xml.c - copied unchanged from r338492, head/net-mgmt/collectd5/files/patch-src-curl_xml.c Modified: Directory Properties: branches/2014Q1/ (props changed) Copied: branches/2014Q1/net-mgmt/collectd5/files/patch-src-curl_xml.c (from r338492, head/net-mgmt/collectd5/files/patch-src-curl_xml.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net-mgmt/collectd5/files/patch-src-curl_xml.c Wed Jan 8 12:36:13 2014 (r339112, copy of r338492, head/net-mgmt/collectd5/files/patch-src-curl_xml.c) @@ -0,0 +1,11 @@ +--- src/curl_xml.c.orig 2013-08-18 14:24:25.069973000 +0400 ++++ src/curl_xml.c 2014-01-03 00:25:17.000000000 +0400 +@@ -607,7 +607,7 @@ + int status; + long rc; + char *ptr; +- char *url; ++ char *url = NULL; + + db->buffer_fill = 0; + status = curl_easy_perform (curl); From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 12:37:13 2014 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 66BF55E7; Wed, 8 Jan 2014 12:37: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 51BDD143E; Wed, 8 Jan 2014 12:37: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 s08CbDdp066511; Wed, 8 Jan 2014 12:37:13 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08CbDEE066510; Wed, 8 Jan 2014 12:37:13 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081237.s08CbDEE066510@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 12:37:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339113 - 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, 08 Jan 2014 12:37:13 -0000 Author: bapt Date: Wed Jan 8 12:37:12 2014 New Revision: 339113 URL: http://svnweb.freebsd.org/changeset/ports/339113 Log: MFH: r338507 Allow to follow 302 redirection when fetching from http. The main reason for it to not be allowed was to avoid infinite redirection loop it appears that fetch(1) anyway limit the number of redirections to 5 on 8.3 and 9.1 20 on 9.2 and 10+ meaning we have no good reasons anymore to continue forbidding following redirections. Thanks to Michael Gmelin for having investigation Reported by: many 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 Jan 8 12:36:13 2014 (r339112) +++ branches/2014Q1/Mk/bsd.port.mk Wed Jan 8 12:37:12 2014 (r339113) @@ -806,7 +806,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # FETCH_BINARY - Path to ftp/http fetch command if not in $PATH. # Default: "/usr/bin/fetch" # FETCH_ARGS - Arguments to ftp/http fetch command. -# Default: "-AFpr" +# Default: "-Fpr" # FETCH_CMD - ftp/http fetch command. # Default: ${FETCH_BINARY} ${FETCH_ARGS} # FETCH_BEFORE_ARGS @@ -2222,7 +2222,7 @@ PTHREAD_LIBS?= -pthread FETCH_ENV?= SSL_NO_VERIFY_PEER=1 SSL_NO_VERIFY_HOSTNAME=1 FETCH_BINARY?= /usr/bin/fetch -FETCH_ARGS?= -AFpr +FETCH_ARGS?= -Fpr FETCH_REGET?= 1 .if !defined(DISABLE_SIZE) FETCH_BEFORE_ARGS+= $${CKSIZE:+-S $$CKSIZE} From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 12:38:18 2014 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 C9D536D1; Wed, 8 Jan 2014 12:38: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 A9EB51448; Wed, 8 Jan 2014 12:38: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 s08CcIIW067021; Wed, 8 Jan 2014 12:38:18 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08CcF5M067000; Wed, 8 Jan 2014 12:38:15 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081238.s08CcF5M067000@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 12:38:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339114 - in branches/2014Q1/devel/fam: . 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, 08 Jan 2014 12:38:18 -0000 Author: bapt Date: Wed Jan 8 12:38:14 2014 New Revision: 339114 URL: http://svnweb.freebsd.org/changeset/ports/339114 Log: MFH: r338514 - Fix build with libc++, dropping hardcoded -lstdc++ from the right Makefile. - Fix build with clang, casting a large constant to int in mntent_compat.c++. - Fix a noisy clang warning in BTree.h by parenthesizing the 2nd for() expr. - Fix a format string mismatch (%d/size_t -> %lu/unsigned long) in snprintf. - Regenerate patches, and normalize their filenames, with make makepatch. - Bump PORTREVISION. Added: branches/2014Q1/devel/fam/files/patch-Makefile.am - copied unchanged from r338514, head/devel/fam/files/patch-Makefile.am branches/2014Q1/devel/fam/files/patch-fam__Directory.c++ - copied unchanged from r338514, head/devel/fam/files/patch-fam__Directory.c++ branches/2014Q1/devel/fam/files/patch-fam__DirectoryScanner.c++ - copied unchanged from r338514, head/devel/fam/files/patch-fam__DirectoryScanner.c++ branches/2014Q1/devel/fam/files/patch-fam__DirectoryScanner.h - copied unchanged from r338514, head/devel/fam/files/patch-fam__DirectoryScanner.h branches/2014Q1/devel/fam/files/patch-fam__FileSystem.c++ - copied unchanged from r338514, head/devel/fam/files/patch-fam__FileSystem.c++ branches/2014Q1/devel/fam/files/patch-fam__FileSystemTable.c++ - copied unchanged from r338514, head/devel/fam/files/patch-fam__FileSystemTable.c++ branches/2014Q1/devel/fam/files/patch-fam__IMon.c++ - copied unchanged from r338514, head/devel/fam/files/patch-fam__IMon.c++ branches/2014Q1/devel/fam/files/patch-fam__Listener.c++ - copied unchanged from r338514, head/devel/fam/files/patch-fam__Listener.c++ branches/2014Q1/devel/fam/files/patch-fam__Log.c++ - copied unchanged from r338514, head/devel/fam/files/patch-fam__Log.c++ branches/2014Q1/devel/fam/files/patch-fam__Makefile.am - copied unchanged from r338514, head/devel/fam/files/patch-fam__Makefile.am branches/2014Q1/devel/fam/files/patch-fam__SmallTable.h - copied unchanged from r338514, head/devel/fam/files/patch-fam__SmallTable.h branches/2014Q1/devel/fam/files/patch-fam__StringTable.h - copied unchanged from r338514, head/devel/fam/files/patch-fam__StringTable.h branches/2014Q1/devel/fam/files/patch-include__BTree.h - copied unchanged from r338514, head/devel/fam/files/patch-include__BTree.h branches/2014Q1/devel/fam/files/patch-libfam__Client.c++ - copied unchanged from r338514, head/devel/fam/files/patch-libfam__Client.c++ Deleted: branches/2014Q1/devel/fam/files/patch-fam-Listener.c++ branches/2014Q1/devel/fam/files/patch-fam-Log.c++ branches/2014Q1/devel/fam/files/patch-fam::SmallTable.h branches/2014Q1/devel/fam/files/patch-fam_Directory.c++ branches/2014Q1/devel/fam/files/patch-fam_DirectoryScanner.c++ branches/2014Q1/devel/fam/files/patch-fam_DirectoryScanner.h branches/2014Q1/devel/fam/files/patch-fam_FileSystem.c++ branches/2014Q1/devel/fam/files/patch-fam_FileSystemTable.c++ branches/2014Q1/devel/fam/files/patch-fam_Makefile.am branches/2014Q1/devel/fam/files/patch-fam_StringTable.h branches/2014Q1/devel/fam/files/patch-include::BTree.h Modified: branches/2014Q1/devel/fam/Makefile (contents, props changed) branches/2014Q1/devel/fam/files/mntent_compat.c++ (contents, props changed) branches/2014Q1/devel/fam/files/patch-configure.in (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/fam/Makefile ============================================================================== --- branches/2014Q1/devel/fam/Makefile Wed Jan 8 12:37:12 2014 (r339113) +++ branches/2014Q1/devel/fam/Makefile Wed Jan 8 12:38:14 2014 (r339114) @@ -3,7 +3,7 @@ PORTNAME= fam PORTVERSION= 2.6.10 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= ftp://oss.sgi.com/projects/fam/download/ DIST_SUBDIR= ${PORTNAME} @@ -23,14 +23,14 @@ SUB_FILES= pkg-message #CONFLICTS_INSTALL= gamin-[0-9]* post-patch: - @${REINPLACE_CMD} -e "s/-lstdc++//g" ${WRKSRC}/Makefile.am + ${REINPLACE_CMD} -e "s/-lstdc++//g" ${WRKSRC}/libfam/Makefile.am pre-configure: - @${RM} -fr ${WRKSRC}/util - @${MV} ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.am.orig - @${SED} -e s/util// -e /SUBDIRS/q \ + ${RM} -fr ${WRKSRC}/util + ${MV} ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.am.orig + ${SED} -e s/util// -e /SUBDIRS/q \ <${WRKSRC}/Makefile.am.orig >${WRKSRC}/Makefile.am - @${CP} ${FILESDIR}/mntent* ${WRKSRC}/fam + ${CP} ${FILESDIR}/mntent* ${WRKSRC}/fam post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfam.so.0 Modified: branches/2014Q1/devel/fam/files/mntent_compat.c++ ============================================================================== --- branches/2014Q1/devel/fam/files/mntent_compat.c++ Wed Jan 8 12:37:12 2014 (r339113) +++ branches/2014Q1/devel/fam/files/mntent_compat.c++ Wed Jan 8 12:38:14 2014 (r339114) @@ -61,7 +61,7 @@ struct { { MNT_SYNCHRONOUS, "sync"}, { MNT_UNION, "union"}, { MNT_NOCLUSTERR, "noclusterr"}, - { MNT_NOCLUSTERW, "noclusterw"}, + { static_cast(MNT_NOCLUSTERW), "noclusterw"}, { MNT_SUIDDIR, "suiddir"}, #ifdef MNT_SNAPSHOT { MNT_SNAPSHOT, "snapshot"}, Copied: branches/2014Q1/devel/fam/files/patch-Makefile.am (from r338514, head/devel/fam/files/patch-Makefile.am) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/fam/files/patch-Makefile.am Wed Jan 8 12:38:14 2014 (r339114, copy of r338514, head/devel/fam/files/patch-Makefile.am) @@ -0,0 +1,40 @@ +--- ./Makefile.am.orig 2003-04-15 06:20:33.000000000 +0200 ++++ ./Makefile.am 2014-01-03 02:35:10.000000000 +0100 +@@ -1,36 +1,3 @@ + include $(top_srcdir)/common.am + +-SUBDIRS = util include support libfam fam man test build +- +-EXTRA_DIST = common.am INSTALL.rpm +- +-rpm: dist +- @cd build && $(MAKE) $(AM_MAKEFLAGS) rpm +- +-# We proceed even if these commands fail because this might be an install +-# into $DESTDIR by a non-root user. +-install-exec-hook: +- -@if test "no$(LDCONFIG)" != "no"; then \ +-## echo "Adding $(libdir) to ld.so.conf..."; \ +- $(EDITCONF) ld.so.conf add $(DESTDIR)$(libdir) $(DESTDIR)$(libdir); \ +- exec $(LDCONFIG); \ +- fi +-## @echo "Adding fam to rpc..." +- -@$(EDITCONF) rpc add 391002 "sgi_fam 391002" +-## @echo "Adding fam to inetd.conf..." +- -@$(EDITCONF) inetd.conf add '\b(fam|FAM)\b' \ +- "# fam, the File Alteration Monitor, http://oss.sgi.com/projects/fam/" \ +- "sgi_fam/1-2 stream rpc/tcp wait root $(DESTDIR)$(bindir)/fam fam" +- @echo "Restarting inetd..." +- -@killall -HUP inetd +- +-# We don't remove $(libdir) from ld.so.conf here because we don't have +-# a way to tell whether we're the ones who added it, and other things +-# probably use it as well. +-uninstall-local: +-## @echo "Removing fam from rpc..." +- -@$(EDITCONF) rpc remove 391002 +-## @echo "Removing fam from inetd.conf..." +- -@$(EDITCONF) inetd.conf remove '\b(fam|FAM)\b' +- @echo "Restarting inetd..." +- -@killall -HUP inetd ++SUBDIRS = include support libfam fam man test build Modified: branches/2014Q1/devel/fam/files/patch-configure.in ============================================================================== --- branches/2014Q1/devel/fam/files/patch-configure.in Wed Jan 8 12:37:12 2014 (r339113) +++ branches/2014Q1/devel/fam/files/patch-configure.in Wed Jan 8 12:38:14 2014 (r339114) @@ -1,5 +1,5 @@ ---- configure.in.orig Fri Aug 11 22:23:19 2006 -+++ configure.in Fri Aug 11 22:24:34 2006 +--- ./configure.in.orig 2003-04-15 08:05:00.000000000 +0200 ++++ ./configure.in 2014-01-03 02:35:10.000000000 +0100 @@ -308,11 +308,6 @@ dnl If we don't have MNTTYPE_NFS , we croak. dnl Copied: branches/2014Q1/devel/fam/files/patch-fam__Directory.c++ (from r338514, head/devel/fam/files/patch-fam__Directory.c++) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/fam/files/patch-fam__Directory.c++ Wed Jan 8 12:38:14 2014 (r339114, copy of r338514, head/devel/fam/files/patch-fam__Directory.c++) @@ -0,0 +1,11 @@ +--- ./fam/Directory.c++.orig 2003-04-15 06:21:29.000000000 +0200 ++++ ./fam/Directory.c++ 2014-01-03 02:35:10.000000000 +0100 +@@ -26,7 +26,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include Copied: branches/2014Q1/devel/fam/files/patch-fam__DirectoryScanner.c++ (from r338514, head/devel/fam/files/patch-fam__DirectoryScanner.c++) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/fam/files/patch-fam__DirectoryScanner.c++ Wed Jan 8 12:38:14 2014 (r339114, copy of r338514, head/devel/fam/files/patch-fam__DirectoryScanner.c++) @@ -0,0 +1,11 @@ +--- ./fam/DirectoryScanner.c++.orig 2003-04-15 06:21:30.000000000 +0200 ++++ ./fam/DirectoryScanner.c++ 2014-01-03 02:35:10.000000000 +0100 +@@ -100,7 +100,7 @@ + + while (dir && ready) + { +- struct direct *dp = readdir(dir); ++ struct dirent *dp = readdir(dir); + if (dp == NULL) + { closedir(dir); + dir = NULL; Copied: branches/2014Q1/devel/fam/files/patch-fam__DirectoryScanner.h (from r338514, head/devel/fam/files/patch-fam__DirectoryScanner.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/fam/files/patch-fam__DirectoryScanner.h Wed Jan 8 12:38:14 2014 (r339114, copy of r338514, head/devel/fam/files/patch-fam__DirectoryScanner.h) @@ -0,0 +1,11 @@ +--- ./fam/DirectoryScanner.h.orig 2003-04-15 06:21:30.000000000 +0200 ++++ ./fam/DirectoryScanner.h 2014-01-03 02:35:10.000000000 +0100 +@@ -27,7 +27,7 @@ + + #include + #include +-#include ++#include + + #include "Event.h" + Copied: branches/2014Q1/devel/fam/files/patch-fam__FileSystem.c++ (from r338514, head/devel/fam/files/patch-fam__FileSystem.c++) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/fam/files/patch-fam__FileSystem.c++ Wed Jan 8 12:38:14 2014 (r339114, copy of r338514, head/devel/fam/files/patch-fam__FileSystem.c++) @@ -0,0 +1,11 @@ +--- ./fam/FileSystem.c++.orig 2003-04-15 06:21:30.000000000 +0200 ++++ ./fam/FileSystem.c++ 2014-01-03 02:35:10.000000000 +0100 +@@ -22,7 +22,7 @@ + + #include "FileSystem.h" + +-#include ++#include "mntent.h" + #include + + #include "Event.h" Copied: branches/2014Q1/devel/fam/files/patch-fam__FileSystemTable.c++ (from r338514, head/devel/fam/files/patch-fam__FileSystemTable.c++) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/fam/files/patch-fam__FileSystemTable.c++ Wed Jan 8 12:38:14 2014 (r339114, copy of r338514, head/devel/fam/files/patch-fam__FileSystemTable.c++) @@ -0,0 +1,10 @@ +--- ./fam/FileSystemTable.c++.orig 2003-04-15 06:21:31.000000000 +0200 ++++ ./fam/FileSystemTable.c++ 2014-01-03 02:35:10.000000000 +0100 +@@ -255,7 +255,6 @@ + // create_fs_by_name initializes our "root" member variable. + if (!fs_by_name) + { create_fs_by_name(); +- mtab_watcher = new InternalClient(mtab_name, mtab_event_handler, NULL); + } + + cr.become_user(); Copied: branches/2014Q1/devel/fam/files/patch-fam__IMon.c++ (from r338514, head/devel/fam/files/patch-fam__IMon.c++) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/fam/files/patch-fam__IMon.c++ Wed Jan 8 12:38:14 2014 (r339114, copy of r338514, head/devel/fam/files/patch-fam__IMon.c++) @@ -0,0 +1,11 @@ +--- ./fam/IMon.c++.orig 2003-04-15 06:21:31.000000000 +0200 ++++ ./fam/IMon.c++ 2014-01-03 02:35:10.000000000 +0100 +@@ -42,7 +42,7 @@ + #include "Interest.h" + #include "Log.h" + #include "Scheduler.h" +-#include "alloc.h" ++// #include "alloc.h" + + int IMon::imonfd = -2; + IMon::EventHandler IMon::ehandler = NULL; Copied: branches/2014Q1/devel/fam/files/patch-fam__Listener.c++ (from r338514, head/devel/fam/files/patch-fam__Listener.c++) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/fam/files/patch-fam__Listener.c++ Wed Jan 8 12:38:14 2014 (r339114, copy of r338514, head/devel/fam/files/patch-fam__Listener.c++) @@ -0,0 +1,22 @@ +--- ./fam/Listener.c++.orig 2003-04-15 06:52:40.000000000 +0200 ++++ ./fam/Listener.c++ 2014-01-03 02:35:10.000000000 +0100 +@@ -36,6 +36,10 @@ + #include + #include + #include ++#ifdef __FreeBSD__ ++#include ++#include ++#endif // __FreeBSD__ + + #include + +@@ -203,7 +207,7 @@ + // requested user and pass the name back to the client. + + // Unset TMPDIR to ensure that tempnam() works as desired +- putenv("TMPDIR="); ++ unsetenv("TMPDIR"); + + char *tmpfile = tempnam("/tmp", ".fam"); + #if defined(__FreeBSD__) Copied: branches/2014Q1/devel/fam/files/patch-fam__Log.c++ (from r338514, head/devel/fam/files/patch-fam__Log.c++) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/fam/files/patch-fam__Log.c++ Wed Jan 8 12:38:14 2014 (r339114, copy of r338514, head/devel/fam/files/patch-fam__Log.c++) @@ -0,0 +1,13 @@ +--- ./fam/Log.c++.orig 2003-04-15 06:21:36.000000000 +0200 ++++ ./fam/Log.c++ 2014-01-03 02:35:10.000000000 +0100 +@@ -28,9 +28,9 @@ + #include + #include + #include ++#include + #include + #include +-#include + #include + #include + #ifdef HAVE_AUDIT Copied: branches/2014Q1/devel/fam/files/patch-fam__Makefile.am (from r338514, head/devel/fam/files/patch-fam__Makefile.am) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/fam/files/patch-fam__Makefile.am Wed Jan 8 12:38:14 2014 (r339114, copy of r338514, head/devel/fam/files/patch-fam__Makefile.am) @@ -0,0 +1,10 @@ +--- ./fam/Makefile.am.orig 2003-04-15 06:21:26.000000000 +0200 ++++ ./fam/Makefile.am 2014-01-03 02:35:10.000000000 +0100 +@@ -72,6 +72,7 @@ + main.c++ \ + timeval.c++ \ + timeval.h \ ++ mntent_compat.c++ \ + @IMON_FUNCS@.c++ + + EXTRA_fam_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++ Copied: branches/2014Q1/devel/fam/files/patch-fam__SmallTable.h (from r338514, head/devel/fam/files/patch-fam__SmallTable.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/fam/files/patch-fam__SmallTable.h Wed Jan 8 12:38:14 2014 (r339114, copy of r338514, head/devel/fam/files/patch-fam__SmallTable.h) @@ -0,0 +1,11 @@ +--- ./fam/SmallTable.h.orig 2003-04-15 06:21:43.000000000 +0200 ++++ ./fam/SmallTable.h 2014-01-03 02:35:10.000000000 +0100 +@@ -98,7 +98,7 @@ + } + + template +-SmallTable::Closure ++typename SmallTable::Closure + SmallTable::position(const Tkey& key) const + { + unsigned l = 0, r = n; Copied: branches/2014Q1/devel/fam/files/patch-fam__StringTable.h (from r338514, head/devel/fam/files/patch-fam__StringTable.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/fam/files/patch-fam__StringTable.h Wed Jan 8 12:38:14 2014 (r339114, copy of r338514, head/devel/fam/files/patch-fam__StringTable.h) @@ -0,0 +1,10 @@ +--- ./fam/StringTable.h.orig 2003-04-15 06:21:43.000000000 +0200 ++++ ./fam/StringTable.h 2014-01-03 02:35:10.000000000 +0100 +@@ -25,6 +25,7 @@ + + #include + #include ++#include "mntent.h" + + // A StringTable maps C strings onto values. It is a cheap O(n) + // implementation, suitable only for small tables that are Copied: branches/2014Q1/devel/fam/files/patch-include__BTree.h (from r338514, head/devel/fam/files/patch-include__BTree.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/fam/files/patch-include__BTree.h Wed Jan 8 12:38:14 2014 (r339114, copy of r338514, head/devel/fam/files/patch-include__BTree.h) @@ -0,0 +1,65 @@ +--- ./include/BTree.h.orig 2003-04-15 06:21:19.000000000 +0200 ++++ ./include/BTree.h 2014-01-03 02:35:37.000000000 +0100 +@@ -236,7 +236,7 @@ + // to the right and returns them. + + template +-BTree::Closure ++typename BTree::Closure + BTree::Node::remove(unsigned j) + { + Key k = key[j]; +@@ -318,7 +318,7 @@ + assert(root->n); + + Node *p, *q; +- for (p = root; q = p->link[0]; p = q) ++ for (p = root; (q = p->link[0]); p = q) + continue; + return p->key[0]; + } +@@ -348,7 +348,7 @@ + } + + template +-BTree::Closure ++typename BTree::Closure + BTree::Node::next(const Key& pred) const + { + if (!this) +@@ -404,7 +404,7 @@ + // nodes as necessary on the way back. + + template +-BTree::Closure ++typename BTree::Closure + BTree::insert(Node *p, const Key& key, const Value& value) + { + if (!p) return Closure(key, value, NULL); +@@ -499,7 +499,7 @@ + // Returns UNDER if node p is too small afterward, OK otherwise. + + template +-BTree::Status ++typename BTree::Status + BTree::underflow(Node *p, unsigned i) + { + assert(p); +@@ -557,7 +557,7 @@ + + + template +-BTree::Closure ++typename BTree::Closure + BTree::remove_rightmost(Node *p) + { + int i = p->n; +@@ -587,7 +587,7 @@ + // back up. + + template +-BTree::Status ++typename BTree::Status + BTree::remove(Node *p, const Key& key) + { + if (!p) Copied: branches/2014Q1/devel/fam/files/patch-libfam__Client.c++ (from r338514, head/devel/fam/files/patch-libfam__Client.c++) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/fam/files/patch-libfam__Client.c++ Wed Jan 8 12:38:14 2014 (r339114, copy of r338514, head/devel/fam/files/patch-libfam__Client.c++) @@ -0,0 +1,19 @@ +--- ./libfam/Client.c++.orig 2003-04-15 06:21:25.000000000 +0200 ++++ ./libfam/Client.c++ 2014-01-03 02:35:10.000000000 +0100 +@@ -34,7 +34,6 @@ + #include + #include + +-#include + + #include "fam.h" + #include "Client.h" +@@ -264,7 +263,7 @@ + { + char msg[100]; + snprintf(msg, sizeof(msg), +- "change info too long! (%d max)", sizeof(changeInfo)); ++ "change info too long! (%lu max)", (unsigned long)sizeof(changeInfo)); + croakConnection(msg); + return -1; + } From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 12:49:52 2014 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 132259AF; Wed, 8 Jan 2014 12:49: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 F2E561556; Wed, 8 Jan 2014 12:49:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s08Cnpit071011; Wed, 8 Jan 2014 12:49:51 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08Cnp0P071010; Wed, 8 Jan 2014 12:49:51 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081249.s08Cnp0P071010@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 12:49:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339115 - branches/2014Q1/mail/spamprobe 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, 08 Jan 2014 12:49:52 -0000 Author: bapt Date: Wed Jan 8 12:49:51 2014 New Revision: 339115 URL: http://svnweb.freebsd.org/changeset/ports/339115 Log: MFH: r338647 - Set USE_GCC=any to fix build on FreeBSD 10 and HEAD. - Drop maintainership since I lack the time to properly maintain this port. Modified: branches/2014Q1/mail/spamprobe/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/mail/spamprobe/Makefile ============================================================================== --- branches/2014Q1/mail/spamprobe/Makefile Wed Jan 8 12:38:14 2014 (r339114) +++ branches/2014Q1/mail/spamprobe/Makefile Wed Jan 8 12:49:51 2014 (r339115) @@ -3,15 +3,16 @@ PORTNAME= spamprobe PORTVERSION= 1.4d -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= mail MASTER_SITES= SF -MAINTAINER= stefan@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Spam detector using Bayesian analysis of word counts GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-default-8bit +USE_GCC= any PLIST_FILES= bin/spamprobe man/man1/spamprobe.1.gz From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 13:11:33 2014 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 3ADCDDD0; Wed, 8 Jan 2014 13:11: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 2607D1795; Wed, 8 Jan 2014 13:11: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 s08DBXsO081753; Wed, 8 Jan 2014 13:11:33 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08DBWOW081752; Wed, 8 Jan 2014 13:11:32 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081311.s08DBWOW081752@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 13:11:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339116 - in branches/2014Q1/sysutils/usrinfo: . 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, 08 Jan 2014 13:11:33 -0000 Author: bapt Date: Wed Jan 8 13:11:32 2014 New Revision: 339116 URL: http://svnweb.freebsd.org/changeset/ports/339116 Log: MFH: r338897 - Fix the build when g++ is not present. - Respect CXXFLAGS. - Unconditionally set MAINTAINER. - Set LICENSE. - Support staging. Added: branches/2014Q1/sysutils/usrinfo/files/ - copied from r338897, head/sysutils/usrinfo/files/ Modified: branches/2014Q1/sysutils/usrinfo/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/sysutils/usrinfo/Makefile ============================================================================== --- branches/2014Q1/sysutils/usrinfo/Makefile Wed Jan 8 12:49:51 2014 (r339115) +++ branches/2014Q1/sysutils/usrinfo/Makefile Wed Jan 8 13:11:32 2014 (r339116) @@ -6,19 +6,17 @@ PORTVERSION= .10 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} -MAINTAINER?= aaron@snaphat.com +MAINTAINER= aaron@snaphat.com COMMENT= Displays information about a user using either "
" or "\n" breaks -USE_BZIP2= yes +LICENSE= BSD2CLAUSE -PLIST_FILES= bin/usrinfo +USE_BZIP2= yes -MANCOMPRESSED= no -MAN1= usrinfo.1 +PLIST_FILES= bin/usrinfo man/man1/usrinfo.1.gz -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/usrinfo ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/usrinfo.1 ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/usrinfo ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/man/usrinfo.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 13:12:55 2014 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 5E788ED3; Wed, 8 Jan 2014 13:12:55 +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 4942A17B0; Wed, 8 Jan 2014 13:12:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s08DCtUQ082065; Wed, 8 Jan 2014 13:12:55 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08DCtCM082064; Wed, 8 Jan 2014 13:12:55 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081312.s08DCtCM082064@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 13:12:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339117 - in branches/2014Q1/net/net6: . 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, 08 Jan 2014 13:12:55 -0000 Author: bapt Date: Wed Jan 8 13:12:54 2014 New Revision: 339117 URL: http://svnweb.freebsd.org/changeset/ports/339117 Log: MFH: r338899 - Fix the build with clang/libc++. - Support staging. Added: branches/2014Q1/net/net6/files/ - copied from r338899, head/net/net6/files/ Modified: branches/2014Q1/net/net6/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net/net6/Makefile ============================================================================== --- branches/2014Q1/net/net6/Makefile Wed Jan 8 13:11:32 2014 (r339116) +++ branches/2014Q1/net/net6/Makefile Wed Jan 8 13:12:54 2014 (r339117) @@ -15,11 +15,10 @@ LICENSE= GPLv2 LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \ gnutls.26:${PORTSDIR}/security/gnutls -USES= pathfix pkgconfig +USES= pathfix pkgconfig USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -NO_STAGE= yes .include .if ${PORT_OPTIONS:MNLS} From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 13:15:37 2014 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 81B58FCF; Wed, 8 Jan 2014 13:15: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 6C67217C6; Wed, 8 Jan 2014 13:15: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 s08DFb93082596; Wed, 8 Jan 2014 13:15:37 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08DFaHj082592; Wed, 8 Jan 2014 13:15:36 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081315.s08DFaHj082592@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 13:15:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339118 - in branches/2014Q1/security/bro: . 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, 08 Jan 2014 13:15:37 -0000 Author: bapt Date: Wed Jan 8 13:15:36 2014 New Revision: 339118 URL: http://svnweb.freebsd.org/changeset/ports/339118 Log: MFH: r338927 - Fix the build with libc++. - Convert to new-new OPTIONS framework. - Use new *_DEPENDS formats. - Fix LICENSE. PR: ports/185455 Submitted by: Craig Leres (maintainer) Added: branches/2014Q1/security/bro/files/patch-src-input-readers-Raw.cc - copied unchanged from r338927, head/security/bro/files/patch-src-input-readers-Raw.cc branches/2014Q1/security/bro/files/patch-src-input-readers-SQLite.cc - copied unchanged from r338927, head/security/bro/files/patch-src-input-readers-SQLite.cc branches/2014Q1/security/bro/files/patch-src-logging-writers-SQLite.cc - copied unchanged from r338927, head/security/bro/files/patch-src-logging-writers-SQLite.cc Modified: branches/2014Q1/security/bro/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/bro/Makefile ============================================================================== --- branches/2014Q1/security/bro/Makefile Wed Jan 8 13:12:54 2014 (r339117) +++ branches/2014Q1/security/bro/Makefile Wed Jan 8 13:15:36 2014 (r339118) @@ -3,16 +3,17 @@ PORTNAME= bro PORTVERSION= 2.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://www.bro.org/downloads/release/ MAINTAINER= leres@ee.lbl.gov COMMENT= System for detecting network intruders in real-time -LICENSE= BSD +LICENSE= BSD3CLAUSE -BUILD_DEPENDS= bison:${PORTSDIR}/devel/bison \ - swig:${PORTSDIR}/devel/swig13 +BUILD_DEPENDS= ${LOCALBASE}/bin/bison:${PORTSDIR}/devel/bison \ + ${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13 LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP USES= cmake:outsource perl5 @@ -24,7 +25,10 @@ NO_MTREE= yes .if defined(BRO_PREFIX) PREFIX=${BRO_PREFIX} PLIST_SUB+= CLEANUP_PREFIX="" -NEED_ROOT= yes +.if ! defined(WITH_PKGNG) && ! exists(${BRO_PREFIX}) +NEED_ROOT= yes +.endif +NO_MTREE= yes .else PLIST_SUB+= CLEANUP_PREFIX="@comment " .endif @@ -74,35 +78,35 @@ IGNORE= the BROCTL option requires BROC .if empty(PORT_OPTIONS:MIPSUMDUMP) IGNORE= the BROCTL option requires IPSUMDUMP .endif -BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash -RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash -PLIST_SUB+= BROCTL="" -USE_LDCONFIG= yes -CMAKE_ARGS+= -D INSTALL_BROCTL:BOOL=true +BUILD_DEPENDS+= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash +RUN_DEPENDS+= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash +PLIST_SUB+= BROCTL="" +USE_LDCONFIG= yes +CMAKE_ARGS+= -D INSTALL_BROCTL:BOOL=true .else -CMAKE_ARGS+= -D INSTALL_BROCTL:BOOL=false -PLIST_SUB+= BROCTL="@comment " +CMAKE_ARGS+= -D INSTALL_BROCTL:BOOL=false +PLIST_SUB+= BROCTL="@comment " .endif .if ${PORT_OPTIONS:MDEBUG} -CMAKE_ARGS+= -D ENABLE_DEBUG:BOOL=true +CMAKE_ARGS+= -D ENABLE_DEBUG:BOOL=true .else -CMAKE_ARGS+= -D ENABLE_DEBUG:BOOL=false +CMAKE_ARGS+= -D ENABLE_DEBUG:BOOL=false .endif .if ${PORT_OPTIONS:MLBL_HF} -RUN_DEPENDS+= hf:${PORTSDIR}/sysutils/lbl-hf +RUN_DEPENDS+= ${LOCALBASE}/bin/hf:${PORTSDIR}/sysutils/lbl-hf .endif .if ${PORT_OPTIONS:MLBL_CF} -RUN_DEPENDS+= cf:${PORTSDIR}/sysutils/lbl-cf +RUN_DEPENDS+= ${LOCALBASE}/bin/cf:${PORTSDIR}/sysutils/lbl-cf .endif .if ${PORT_OPTIONS:MPERFTOOLS} -CMAKE_ARGS+= -D ENABLE_PERFTOOLS:BOOL=true -RUN_DEPENDS+= pprof:${PORTSDIR}/devel/google-perftools +CMAKE_ARGS+= -D ENABLE_PERFTOOLS:BOOL=true +RUN_DEPENDS+= ${LOCALBASE}/bin/pprof:${PORTSDIR}/devel/google-perftools .else -CMAKE_ARGS+= -D ENABLE_PERFTOOLS:BOOL=false +CMAKE_ARGS+= -D ENABLE_PERFTOOLS:BOOL=false .endif .if ${PORT_OPTIONS:MIPSUMDUMP} @@ -111,8 +115,9 @@ RUN_DEPENDS+= ipsumdump:${PORTSDIR}/net/ .endif .if ${PORT_OPTIONS:MBROCTL} -post-stage:: -.if defined(BRO_PREFIX) +post-install: +.if defined(BRO_PREFIX) && !defined(WITH_PKGNG) && !exists(${BRO_PREFIX}) + # pkg_install needs PREFIX in order to make a package from STAGEDIR/PREFIX @${MKDIR} ${PREFIX} .endif @${MKDIR} ${STAGEDIR}${PREFIX}/spool/installed-scripts-do-not-touch/auto @@ -121,7 +126,7 @@ post-stage:: @${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/aux/broctl/etc/${F} ${STAGEDIR}${PREFIX}/etc/${F}.example .endfor .for F in networks.cfg node.cfg - @${INSTALL_SCRIPT} ${WRKSRC}/aux/broctl/etc/${F} ${STAGEDIR}${PREFIX}/etc/${F}.example + @${MV} ${WRKSRC}/aux/broctl/etc/${F} ${STAGEDIR}${PREFIX}/etc/${F}.example .endfor .endif Copied: branches/2014Q1/security/bro/files/patch-src-input-readers-Raw.cc (from r338927, head/security/bro/files/patch-src-input-readers-Raw.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/security/bro/files/patch-src-input-readers-Raw.cc Wed Jan 8 13:15:36 2014 (r339118, copy of r338927, head/security/bro/files/patch-src-input-readers-Raw.cc) @@ -0,0 +1,11 @@ +--- src/input/readers/Raw.cc.orig 2014-01-06 21:04:06.000000000 +0200 ++++ src/input/readers/Raw.cc 2014-01-06 21:04:13.000000000 +0200 +@@ -352,7 +352,7 @@ + fname = source.substr(0, fname.length() - 1); + } + +- map::const_iterator it = info.config.find("stdin"); // data that is sent to the child process ++ ReaderInfo::config_map::const_iterator it = info.config.find("stdin"); // data that is sent to the child process + if ( it != info.config.end() ) + { + stdin_string = it->second; Copied: branches/2014Q1/security/bro/files/patch-src-input-readers-SQLite.cc (from r338927, head/security/bro/files/patch-src-input-readers-SQLite.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/security/bro/files/patch-src-input-readers-SQLite.cc Wed Jan 8 13:15:36 2014 (r339118, copy of r338927, head/security/bro/files/patch-src-input-readers-SQLite.cc) @@ -0,0 +1,11 @@ +--- src/input/readers/SQLite.cc.orig 2014-01-06 21:07:44.000000000 +0200 ++++ src/input/readers/SQLite.cc 2014-01-06 21:08:00.000000000 +0200 +@@ -85,7 +85,7 @@ + fullpath.append(".sqlite"); + + string query; +- map::const_iterator it = info.config.find("query"); ++ ReaderInfo::config_map::const_iterator it = info.config.find("query"); + if ( it == info.config.end() ) + { + Error(Fmt("No query specified when setting up SQLite data source. Aborting.", info.source)); Copied: branches/2014Q1/security/bro/files/patch-src-logging-writers-SQLite.cc (from r338927, head/security/bro/files/patch-src-logging-writers-SQLite.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/security/bro/files/patch-src-logging-writers-SQLite.cc Wed Jan 8 13:15:36 2014 (r339118, copy of r338927, head/security/bro/files/patch-src-logging-writers-SQLite.cc) @@ -0,0 +1,11 @@ +--- src/logging/writers/SQLite.cc.orig 2014-01-06 21:08:34.000000000 +0200 ++++ src/logging/writers/SQLite.cc 2014-01-06 21:08:45.000000000 +0200 +@@ -126,7 +126,7 @@ + fullpath.append(".sqlite"); + string tablename; + +- map::const_iterator it = info.config.find("tablename"); ++ WriterInfo::config_map::const_iterator it = info.config.find("tablename"); + if ( it == info.config.end() ) + { + MsgThread::Info(Fmt("tablename configuration option not found. Defaulting to path %s", info.path)); From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 13:26:22 2014 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 4BA675A8; Wed, 8 Jan 2014 13:26: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 3662618A3; Wed, 8 Jan 2014 13:26: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 s08DQMcx086550; Wed, 8 Jan 2014 13:26:22 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08DQLtn086548; Wed, 8 Jan 2014 13:26:21 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081326.s08DQLtn086548@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 13:26:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339121 - in branches/2014Q1/www/tikiwiki: . 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, 08 Jan 2014 13:26:22 -0000 Author: bapt Date: Wed Jan 8 13:26:21 2014 New Revision: 339121 URL: http://svnweb.freebsd.org/changeset/ports/339121 Log: MFH: r338955 Do not show colored output for pkg-message this is wrong because 1/ the code will depend on the terminal running it 2/ pkgng does not like it at all (this bug should be fixed in pkgng anyway) Reported by: antoine Modified: branches/2014Q1/www/tikiwiki/Makefile branches/2014Q1/www/tikiwiki/files/pkg-message.in Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/tikiwiki/Makefile ============================================================================== --- branches/2014Q1/www/tikiwiki/Makefile Wed Jan 8 13:24:28 2014 (r339120) +++ branches/2014Q1/www/tikiwiki/Makefile Wed Jan 8 13:26:21 2014 (r339121) @@ -3,6 +3,7 @@ PORTNAME= tikiwiki PORTVERSION= 11.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/Tiki_11.x_Vega/${PORTVERSION}/ DISTNAME= tiki-${PORTVERSION} Modified: branches/2014Q1/www/tikiwiki/files/pkg-message.in ============================================================================== --- branches/2014Q1/www/tikiwiki/files/pkg-message.in Wed Jan 8 13:24:28 2014 (r339120) +++ branches/2014Q1/www/tikiwiki/files/pkg-message.in Wed Jan 8 13:26:21 2014 (r339121) @@ -1,13 +1,13 @@ ================================================================= **** NOTE **** 1) Please add the following to your apache config, and restart. - # + # # Directives to allow use of tikiwiki # - Alias /%%PORTNAME%% "%%PREFIX%%/%%TIKIWIKI_DIR%%/" + Alias /%%PORTNAME%% "%%PREFIX%%/%%TIKIWIKI_DIR%%/" 2) Open the following page in your browser and follow the instructions: - http://www.your.host/tikiwiki/ + http://www.your.host/tikiwiki/ For FULL configuration instructions see http://http://doc.tiki.org/Tiki+Installation+Guide From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 13:27:29 2014 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 2FE71689; Wed, 8 Jan 2014 13:27: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 01B5518AE; Wed, 8 Jan 2014 13:27: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 s08DRSkj086772; Wed, 8 Jan 2014 13:27:28 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08DRSc6086770; Wed, 8 Jan 2014 13:27:28 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081327.s08DRSc6086770@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 13:27:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339122 - in branches/2014Q1/Mk: . 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: Wed, 08 Jan 2014 13:27:29 -0000 Author: bapt Date: Wed Jan 8 13:27:28 2014 New Revision: 339122 URL: http://svnweb.freebsd.org/changeset/ports/339122 Log: MFH: r338956 pkgng expect all non ascii code and '%' to be urlencoded in the comment Reported by: antoine Tested by: antoine Added: branches/2014Q1/Mk/Scripts/pkgencode.awk - copied unchanged from r338956, head/Mk/Scripts/pkgencode.awk Modified: branches/2014Q1/Mk/bsd.pkgng.mk Directory Properties: branches/2014Q1/ (props changed) Copied: branches/2014Q1/Mk/Scripts/pkgencode.awk (from r338956, head/Mk/Scripts/pkgencode.awk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/Mk/Scripts/pkgencode.awk Wed Jan 8 13:27:28 2014 (r339122, copy of r338956, head/Mk/Scripts/pkgencode.awk) @@ -0,0 +1,23 @@ +# $FreeBSD$ + +BEGIN { + for (i = 0; i <= 255; i++) + ord[sprintf("%c", i)] = i + for (i = 0; i < 128; i++) { + if (i != 37) + ascii = sprintf("%s%c", ascii, i) + } +} +function encode(str, c, len, res) { + len = length(str) + res = "" + for (i = 1; i <= len; i++) { + c = substr(str, i, 1); + if (index(ascii, c) != 0) + res = res c + else + res = res "%" sprintf("%02X", ord[c]) + } + return res +} +{ print encode($0); } Modified: branches/2014Q1/Mk/bsd.pkgng.mk ============================================================================== --- branches/2014Q1/Mk/bsd.pkgng.mk Wed Jan 8 13:26:21 2014 (r339121) +++ branches/2014Q1/Mk/bsd.pkgng.mk Wed Jan 8 13:27:28 2014 (r339122) @@ -42,7 +42,7 @@ create-manifest: @${ECHO_CMD} "version: ${PKGVERSION}" >> ${MANIFESTF} @${ECHO_CMD} "origin: ${PKGORIGIN}" >> ${MANIFESTF} @${ECHO_CMD} "comment: |" >> ${MANIFESTF} - @${ECHO_CMD} " "${COMMENT:Q} >> ${MANIFESTF} + @${ECHO_CMD} " "${COMMENT:Q} | ${AWK} -f ${SCRIPTSDIR}/pkgencode.awk >> ${MANIFESTF} @${ECHO_CMD} "maintainer: ${MAINTAINER}" >> ${MANIFESTF} @${ECHO_CMD} "prefix: ${PREFIX}" >> ${MANIFESTF} #.if defined(NO_ARCH) From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 13:33:02 2014 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 304F8BF9; Wed, 8 Jan 2014 13:33:02 +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 1C61F1961; Wed, 8 Jan 2014 13:33:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s08DX1sH090100; Wed, 8 Jan 2014 13:33:01 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08DX1Xb090095; Wed, 8 Jan 2014 13:33:01 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081333.s08DX1Xb090095@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 13:33:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339123 - branches/2014Q1/chinese/gcin 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, 08 Jan 2014 13:33:02 -0000 Author: bapt Date: Wed Jan 8 13:33:01 2014 New Revision: 339123 URL: http://svnweb.freebsd.org/changeset/ports/339123 Log: MFH: r338958 Remove color code from pkg-message this is terminal dependant Modified: branches/2014Q1/chinese/gcin/Makefile branches/2014Q1/chinese/gcin/pkg-message Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/chinese/gcin/Makefile ============================================================================== --- branches/2014Q1/chinese/gcin/Makefile Wed Jan 8 13:27:28 2014 (r339122) +++ branches/2014Q1/chinese/gcin/Makefile Wed Jan 8 13:33:01 2014 (r339123) @@ -3,7 +3,7 @@ PORTNAME= gcin PORTVERSION= 2.8.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= chinese textproc gnome MASTER_SITES= http://www.csie.nctu.edu.tw/~cp76/gcin/download/:main DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:main Modified: branches/2014Q1/chinese/gcin/pkg-message ============================================================================== --- branches/2014Q1/chinese/gcin/pkg-message Wed Jan 8 13:27:28 2014 (r339122) +++ branches/2014Q1/chinese/gcin/pkg-message Wed Jan 8 13:33:01 2014 (r339123) @@ -1,10 +1,10 @@ -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -Remember to set these environment varibles (such as your ~/.xinitrc): - +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +Remember to set these environment varibles (such as your ~/.xinitrc): + export XMODIFIERS='@im=gcin' export GTK_IM_MODULE=xim # Finally, to start the GCIN input method daemon, use command: exec gcin & -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 13:33:54 2014 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 540FDCE1; Wed, 8 Jan 2014 13:33: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 3F454196D; Wed, 8 Jan 2014 13:33: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 s08DXs2Q090287; Wed, 8 Jan 2014 13:33:54 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08DXsIJ090286; Wed, 8 Jan 2014 13:33:54 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081333.s08DXsIJ090286@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 13:33:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339124 - branches/2014Q1/devel/p5-MooseX-Attribute-ENV 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, 08 Jan 2014 13:33:54 -0000 Author: bapt Date: Wed Jan 8 13:33:53 2014 New Revision: 339124 URL: http://svnweb.freebsd.org/changeset/ports/339124 Log: MFH: r338959 Bump portrevision to make sure it is properly rebuild with the '%' in comment encoded as expected by pkgng Modified: branches/2014Q1/devel/p5-MooseX-Attribute-ENV/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/p5-MooseX-Attribute-ENV/Makefile ============================================================================== --- branches/2014Q1/devel/p5-MooseX-Attribute-ENV/Makefile Wed Jan 8 13:33:01 2014 (r339123) +++ branches/2014Q1/devel/p5-MooseX-Attribute-ENV/Makefile Wed Jan 8 13:33:53 2014 (r339124) @@ -3,6 +3,7 @@ PORTNAME= MooseX-Attribute-ENV PORTVERSION= 0.02 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 13:35:39 2014 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 306ECDD8; Wed, 8 Jan 2014 13:35: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 0250A197E; Wed, 8 Jan 2014 13:35: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 s08DZcg1090607; Wed, 8 Jan 2014 13: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 s08DZcUJ090605; Wed, 8 Jan 2014 13:35:38 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081335.s08DZcUJ090605@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 13:35:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339125 - in branches/2014Q1/www/dokuwiki: . 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, 08 Jan 2014 13:35:39 -0000 Author: bapt Date: Wed Jan 8 13:35:38 2014 New Revision: 339125 URL: http://svnweb.freebsd.org/changeset/ports/339125 Log: MFH: r338960 Remove colors they are terminal dependant Modified: branches/2014Q1/www/dokuwiki/Makefile branches/2014Q1/www/dokuwiki/files/pkg-message.in Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/dokuwiki/Makefile ============================================================================== --- branches/2014Q1/www/dokuwiki/Makefile Wed Jan 8 13:33:53 2014 (r339124) +++ branches/2014Q1/www/dokuwiki/Makefile Wed Jan 8 13:35:38 2014 (r339125) @@ -3,16 +3,16 @@ PORTNAME= dokuwiki PORTVERSION= ${DIST_VER:S/${PORTNAME}//:S/-//g} +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://download.dokuwiki.org/src/dokuwiki/ DISTNAME= ${DIST_VER} EXTRACT_SUFX= .tgz MAINTAINER= delphij@FreeBSD.org -COMMENT= A simple and easy to use wiki, no database required +COMMENT= Simple and easy to use wiki, no database required LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING DIST_VER= ${PORTNAME}-2013-12-08 USE_PHP= gd mbstring openssl pcre session xml zlib Modified: branches/2014Q1/www/dokuwiki/files/pkg-message.in ============================================================================== --- branches/2014Q1/www/dokuwiki/files/pkg-message.in Wed Jan 8 13:33:53 2014 (r339124) +++ branches/2014Q1/www/dokuwiki/files/pkg-message.in Wed Jan 8 13:35:38 2014 (r339125) @@ -1,13 +1,13 @@ ================================================================= **** NOTE **** 1) Please add the following to your apache config, and restart. - # + # Directives to allow use of dokuwiki # - Alias /%%PORTNAME%% "%%WWWDIR%%/" + Alias /%%PORTNAME%% "%%WWWDIR%%/ 2) Open the following page in your browser and follow the instructions: - http://www.your.host/dokuwiki/install.php + http://www.your.host/dokuwiki/install.php For FULL configuration instructions see http://wiki.splitbrain.org/wiki:config From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 13:37:39 2014 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 83E51EC1; Wed, 8 Jan 2014 13:37: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 63B03198F; Wed, 8 Jan 2014 13:37: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 s08Dbd3j090931; Wed, 8 Jan 2014 13:37:39 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08Dbcrb090928; Wed, 8 Jan 2014 13:37:38 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081337.s08Dbcrb090928@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 13:37:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339126 - in branches/2014Q1/sysutils/zidrav: . 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, 08 Jan 2014 13:37:39 -0000 Author: bapt Date: Wed Jan 8 13:37:38 2014 New Revision: 339126 URL: http://svnweb.freebsd.org/changeset/ports/339126 Log: MFH: r338974 - fix crc problems on 64bit - fix crc problems on big endian systems Added: branches/2014Q1/sysutils/zidrav/files/patch-core.cpp - copied unchanged from r338974, head/sysutils/zidrav/files/patch-core.cpp branches/2014Q1/sysutils/zidrav/files/patch-core.h - copied unchanged from r338974, head/sysutils/zidrav/files/patch-core.h Modified: branches/2014Q1/sysutils/zidrav/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/sysutils/zidrav/Makefile ============================================================================== --- branches/2014Q1/sysutils/zidrav/Makefile Wed Jan 8 13:35:38 2014 (r339125) +++ branches/2014Q1/sysutils/zidrav/Makefile Wed Jan 8 13:37:38 2014 (r339126) @@ -3,6 +3,7 @@ PORTNAME= zidrav PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}4unix/${PORTVERSION} DISTNAME= zidrav4unix-${PORTVERSION} @@ -19,4 +20,18 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/zidrav ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/zidrav.1 ${STAGEDIR}${MANPREFIX}/man/man1/ +.include + +.if ${ARCH} == "i386" +CFLAGS+= -Dcrc32_type=long +.else +CFLAGS+= -Dcrc32_type=int +.endif + +.if ${ARCH} == "amd64" || ${ARCH} == "arm" || ${ARCH} == "i386" || ${ARCH} == "ia64" +.else +# mips*eb, powerpc, powerpc64 and sparc +CFLAGS+= -DCPU_BIGENDIAN +.endif + .include Copied: branches/2014Q1/sysutils/zidrav/files/patch-core.cpp (from r338974, head/sysutils/zidrav/files/patch-core.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/sysutils/zidrav/files/patch-core.cpp Wed Jan 8 13:37:38 2014 (r339126, copy of r338974, head/sysutils/zidrav/files/patch-core.cpp) @@ -0,0 +1,105 @@ +--- core.cpp.orig 2005-05-21 22:16:50.000000000 +0200 ++++ core.cpp 2014-01-07 06:41:30.000000000 +0100 +@@ -38,7 +38,7 @@ + + void be_write32le(iostream &output, char *buf) + { +- int data; ++ int data = 0; + data = *(int*)buf; + + data = SwapBO32(data); +@@ -48,7 +48,7 @@ + + void be_read32le(istream &input, char *buf) + { +- int data; ++ int data = 0; + input.read((char *)&data, 4); + + data = SwapBO32(data); +@@ -59,7 +59,7 @@ + + char *buffer; + int i; +- long crc; ++ crc32_type crc; + short oldprc = 0; + + output.write( ZC, 8 ); +@@ -105,11 +105,11 @@ + + void MakePatchCore( istream &cdti, istream &vstr, iostream &output, int cdtlen, int vstrlen, int * efound) { + +- long filesize; +- long blocksize; ++ long filesize = 0; // reset all 64bit ++ long blocksize = 0; // reset all 64bit + +- long crc; +- long cdtcrc; ++ crc32_type crc; ++ crc32_type cdtcrc = 0; // reset all 64bit + + long curbs; + +@@ -207,12 +207,12 @@ + + void ApplyPatchCore( istream &cdpi, iostream &pstr, int cdplen, int pstrlen) { + +- long filesize; +- long blocksize; ++ long filesize = 0; // reset all 64bit ++ long blocksize = 0; // reset all 64bit + + long curbs = 0; + +- long offset; ++ long offset = 0; // reset all 64bit + + char *buffer = NULL; + +@@ -266,7 +266,8 @@ + + char minibuff[9]; + +- long crc; ++ crc32_type crc; ++ crc32_type filecrc = 0; // reset all 64bit + + buffer = new char[10]; + +@@ -317,12 +318,12 @@ + } + + input.seekg( 0 ); // go to the beginning +- input.read( buffer, datalen ); // and pull it all ++ input.read( buffer, datalen - 4 ); // and pull it all ++ read32le(input, (char *)&filecrc); + + CreateChecksum( buffer, datalen - 4, &crc ); + +- if( crc != int32tole(*(int *)&buffer[ datalen - 4 ]) ) { +- delete [] buffer; ++ if( crc != filecrc ) { + switch(emsg) + { + case IDS_UPT_INVCDT: +@@ -342,7 +343,7 @@ + void MakeOverallChecksum( iostream &st, long size ) { + + char *buffer; +- long crc; ++ crc32_type crc; + + // FIXME: trying to load whole file... again... :( + buffer = new char[size]; +@@ -367,7 +368,7 @@ + #define DO8( buffer ) DO4( buffer ); DO4( buffer ); + #define DO16( buffer ) DO8( buffer ); DO8( buffer ); + +-void CreateChecksum( char *buffer, long size, long *crc ) { ++void CreateChecksum( char *buffer, long size, crc32_type *crc ) { + + *crc = 0; + Copied: branches/2014Q1/sysutils/zidrav/files/patch-core.h (from r338974, head/sysutils/zidrav/files/patch-core.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/sysutils/zidrav/files/patch-core.h Wed Jan 8 13:37:38 2014 (r339126, copy of r338974, head/sysutils/zidrav/files/patch-core.h) @@ -0,0 +1,20 @@ +--- core.h.orig 2005-05-19 22:58:40.000000000 +0200 ++++ core.h 2014-01-07 06:40:24.000000000 +0100 +@@ -48,7 +48,7 @@ + #define QSV KSigver( ZQ, QVER ) + + +-const long crc_table[256] = { // it's just easier this way, alright? It's one K of data, I'm allowed a global if I want one ++const crc32_type crc_table[256] = { // it's just easier this way, alright? It's one K of data, I'm allowed a global if I want one + 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, + 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, + 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, +@@ -111,7 +111,6 @@ + int VerifyStream( istream &input, int datalen, int emsg, KSigver sigver ); + + void MakeOverallChecksum( iostream &st, long size ); +-void CreateChecksum( char *buffer, long size, unsigned long *crc ); +-void CreateChecksum( char *buffer, long size, signed long *crc ); ++void CreateChecksum( char *buffer, long size, crc32_type *crc ); + + #endif From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 13:44:07 2014 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 377DF119; Wed, 8 Jan 2014 13:44: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 16E191A28; Wed, 8 Jan 2014 13:44: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 s08Di6fW094387; Wed, 8 Jan 2014 13:44:06 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08Di617094384; Wed, 8 Jan 2014 13:44:06 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081344.s08Di617094384@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 13:44:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339127 - in branches/2014Q1/security/openssl: . 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, 08 Jan 2014 13:44:07 -0000 Author: bapt Date: Wed Jan 8 13:44:06 2014 New Revision: 339127 URL: http://svnweb.freebsd.org/changeset/ports/339127 Log: MFH: r339031 - Security update to openssl-1.0.1f - remove broken patches - new fix for perl5.18 - fix option GMP Security: http://www.openssl.org/news/vulnerabilities.html Security: CVE-2013-4353 Security: CVE-2013-6449 Security: CVE-2013-6450 Security: 5aaa257e-772d-11e3-a65a-3c970e169bc2 Modified: branches/2014Q1/security/openssl/Makefile branches/2014Q1/security/openssl/distinfo branches/2014Q1/security/openssl/files/patch-config Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/openssl/Makefile ============================================================================== --- branches/2014Q1/security/openssl/Makefile Wed Jan 8 13:37:38 2014 (r339126) +++ branches/2014Q1/security/openssl/Makefile Wed Jan 8 13:44:06 2014 (r339127) @@ -3,22 +3,18 @@ PORTNAME= openssl PORTVERSION= 1.0.1 -DISTVERSIONSUFFIX= e -PORTREVISION= 8 +DISTVERSIONSUFFIX= f +PORTREVISION= 9 CATEGORIES= security devel MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \ ftp://ftp.openssl.org/%SUBDIR%/ \ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/%SUBDIR%/ MASTER_SITE_SUBDIR= source -DIST_SUBDIR= ${DISTNAME}2 +DIST_SUBDIR= ${DISTNAME} MAINTAINER= dinoex@FreeBSD.org COMMENT= SSL and crypto library -PATCH_SITES+= http://www.linuxfromscratch.org/patches/blfs/svn/:pod -PATCHFILES+= openssl-1.0.1e-fix_pod_syntax-1.patch:pod -PATCH_DIST_STRIP= -p1 - .ifdef USE_OPENSSL .error You have `USE_OPENSSL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif @@ -60,6 +56,24 @@ SUB_FILES= pkg-message OPENSSLDIR= ${PREFIX}/openssl MANPREFIX= ${PREFIX} +FIX_POD=apps/cms.pod \ + apps/smime.pod \ + ssl/SSL_accept.pod \ + ssl/SSL_clear.pod \ + ssl/SSL_COMP_add_compression_method.pod ssl/SSL_connect.pod \ + ssl/SSL_CTX_add_session.pod ssl/SSL_CTX_load_verify_locations.pod \ + ssl/SSL_CTX_set_client_CA_list.pod \ + ssl/SSL_CTX_set_session_id_context.pod \ + ssl/SSL_CTX_set_ssl_version.pod \ + ssl/SSL_CTX_use_psk_identity_hint.pod \ + ssl/SSL_do_handshake.pod \ + ssl/SSL_read.pod \ + ssl/SSL_session_reused.pod \ + ssl/SSL_set_fd.pod \ + ssl/SSL_set_session.pod \ + ssl/SSL_shutdown.pod \ + ssl/SSL_write.pod + MAN1= CA.pl.1 asn1parse.1 ca.1 ciphers.1 cms.1 crl.1 crl2pkcs7.1 dgst.1 \ dhparam.1 dsa.1 dsaparam.1 ec.1 ecparam.1 enc.1 errstr.1 gendsa.1 \ genpkey.1 genrsa.1 nseq.1 ocsp.1 openssl.1 passwd.1 pkcs12.1 pkcs7.1 \ @@ -1123,6 +1137,8 @@ PLIST_SUB+= WITH_RC5="@comment " .endif .if ${PORT_OPTIONS:MPADLOCK} +BROKEN= does not build with openssl-1.0.1f +PATCH_DIST_STRIP= -p1 PATCH_SITES+= http://git.alpinelinux.org/cgit/aports/plain/main/openssl/:padlock PATCHFILES+= 0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch:padlock \ 0002-engines-e_padlock-backport-cvs-head-changes.patch:padlock \ @@ -1131,7 +1147,7 @@ PATCHFILES+= 0001-crypto-hmac-support-EV .endif .if ${PORT_OPTIONS:MGMP} -EXTRACONFIGURE+= enable-gmp +EXTRACONFIGURE+= enable-gmp -I${LOCALBASE}/include IGNORE= GMP is LGPLv3 and can not be linked .else EXTRACONFIGURE+= no-gmp @@ -1160,6 +1176,10 @@ pre-everything:: .endif +pre-patch: + ${REINPLACE_CMD} -e 's|^=item \([0-9]\)$$|=item C<\1>|' \ + ${FIX_POD:S,^,${WRKSRC}/doc/,} + post-patch: @${REINPLACE_CMD} -e 's|m4 -B 8192|m4|g' \ ${WRKSRC}/crypto/des/Makefile Modified: branches/2014Q1/security/openssl/distinfo ============================================================================== --- branches/2014Q1/security/openssl/distinfo Wed Jan 8 13:37:38 2014 (r339126) +++ branches/2014Q1/security/openssl/distinfo Wed Jan 8 13:44:06 2014 (r339127) @@ -1,12 +1,2 @@ -SHA256 (openssl-1.0.1e2/openssl-1.0.1e.tar.gz) = f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 -SIZE (openssl-1.0.1e2/openssl-1.0.1e.tar.gz) = 4459777 -SHA256 (openssl-1.0.1e2/openssl-1.0.1e-fix_pod_syntax-1.patch) = 748fd906d6d50b0183d4795aec4857c5b1e53de1155aaa8512fc775f2c04dbe9 -SIZE (openssl-1.0.1e2/openssl-1.0.1e-fix_pod_syntax-1.patch) = 11743 -SHA256 (openssl-1.0.1e2/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 18dd81fefb39b3328a444774ed10871ed50348ca171d2da9f826f916127b2dae -SIZE (openssl-1.0.1e2/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3512 -SHA256 (openssl-1.0.1e2/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 39c31c2e33cded09543a2d1fd2e3238e9d11c672ba71a14d13095baad3ec9696 -SIZE (openssl-1.0.1e2/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 5867 -SHA256 (openssl-1.0.1e2/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = cbb2493ec9157e78035e9cc02be17655996ee9cd0a71b79507fc19f3862f452b -SIZE (openssl-1.0.1e2/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = 20625 -SHA256 (openssl-1.0.1e2/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 157ec6d17add25b96956abc7c44259c91eebe8a6c1026cdb976b895bf42ec56f -SIZE (openssl-1.0.1e2/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 777 +SHA256 (openssl-1.0.1f/openssl-1.0.1f.tar.gz) = 6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +SIZE (openssl-1.0.1f/openssl-1.0.1f.tar.gz) = 4509212 Modified: branches/2014Q1/security/openssl/files/patch-config ============================================================================== --- branches/2014Q1/security/openssl/files/patch-config Wed Jan 8 13:37:38 2014 (r339126) +++ branches/2014Q1/security/openssl/files/patch-config Wed Jan 8 13:44:06 2014 (r339127) @@ -9,7 +9,7 @@ - libc=/usr/lib/libc.so - else # OpenBSD - # ld searches for highest libc.so.* and so do we -- libc=`(ls /usr/lib/libc.so.* | tail -1) 2>/dev/null` +- libc=`(ls /usr/lib/libc.so.* /lib/libc.so.* | tail -1) 2>/dev/null` - fi - case "`(file -L $libc) 2>/dev/null`" in + *86*-*-*bsd*) From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 13:47:48 2014 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 6A8ED25D; Wed, 8 Jan 2014 13:47:48 +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 5613C1A66; Wed, 8 Jan 2014 13:47:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s08Dlm2C094961; Wed, 8 Jan 2014 13:47:48 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08Dllxk094958; Wed, 8 Jan 2014 13:47:47 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081347.s08Dllxk094958@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 13:47:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339128 - in branches/2014Q1/sysutils/busybox-unstable: . 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, 08 Jan 2014 13:47:48 -0000 Author: bapt Date: Wed Jan 8 13:47:47 2014 New Revision: 339128 URL: http://svnweb.freebsd.org/changeset/ports/339128 Log: MFH: r339047 Fix build on FreeBSD 10+. Use more system features on all supported FreeBSD versions (8.3+), and bump PORTREVISION. Regenerate files/patch-archival__unzip.c. Modified: branches/2014Q1/sysutils/busybox-unstable/Makefile branches/2014Q1/sysutils/busybox-unstable/files/patch-archival__unzip.c (contents, props changed) branches/2014Q1/sysutils/busybox-unstable/files/patch-include__platform.h Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/sysutils/busybox-unstable/Makefile ============================================================================== --- branches/2014Q1/sysutils/busybox-unstable/Makefile Wed Jan 8 13:44:06 2014 (r339127) +++ branches/2014Q1/sysutils/busybox-unstable/Makefile Wed Jan 8 13:47:47 2014 (r339128) @@ -4,6 +4,7 @@ PORTNAME= busybox PORTVERSION= 1.21.0 PORTREVISION= 2 +PORTREVISION= 1 CATEGORIES= sysutils misc shells MASTER_SITES= http://www.busybox.net/downloads/ PKGNAMESUFFIX= -unstable Modified: branches/2014Q1/sysutils/busybox-unstable/files/patch-archival__unzip.c ============================================================================== --- branches/2014Q1/sysutils/busybox-unstable/files/patch-archival__unzip.c Wed Jan 8 13:44:06 2014 (r339127) +++ branches/2014Q1/sysutils/busybox-unstable/files/patch-archival__unzip.c Wed Jan 8 13:47:47 2014 (r339128) @@ -1,6 +1,6 @@ ---- ./archival/unzip.c.orig 2012-07-02 14:08:25.000000000 +0000 -+++ ./archival/unzip.c 2012-07-17 02:08:37.000000000 +0000 -@@ -34,6 +34,8 @@ +--- ./archival/unzip.c.orig 2014-01-01 00:45:23.000000000 +0100 ++++ ./archival/unzip.c 2014-01-08 00:00:07.000000000 +0100 +@@ -45,6 +45,8 @@ #include "libbb.h" #include "bb_archive.h" Modified: branches/2014Q1/sysutils/busybox-unstable/files/patch-include__platform.h ============================================================================== --- branches/2014Q1/sysutils/busybox-unstable/files/patch-include__platform.h Wed Jan 8 13:44:06 2014 (r339127) +++ branches/2014Q1/sysutils/busybox-unstable/files/patch-include__platform.h Wed Jan 8 13:47:47 2014 (r339128) @@ -1,18 +1,50 @@ ---- ./include/platform.h.orig 2013-01-14 05:19:43.000000000 +0100 -+++ ./include/platform.h 2013-01-21 21:26:34.000000000 +0100 -@@ -433,6 +433,15 @@ +--- ./include/platform.h.orig 2014-01-01 00:45:23.000000000 +0100 ++++ ./include/platform.h 2014-01-08 00:06:24.000000000 +0100 +@@ -385,10 +385,6 @@ + # undef HAVE_STRVERSCMP + #endif + +-#if defined(__dietlibc__) +-# undef HAVE_STRCHRNUL +-#endif +- + #if defined(__WATCOMC__) + # undef HAVE_DPRINTF + # undef HAVE_GETLINE +@@ -419,7 +415,7 @@ + /* These BSD-derived OSes share many similarities */ + #if (defined __digital__ && defined __unix__) \ + || defined __APPLE__ \ +- || defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__ ++ || defined __OpenBSD__ || defined __NetBSD__ + # undef HAVE_CLEARENV + # undef HAVE_FDATASYNC + # undef HAVE_GETLINE +@@ -434,10 +430,26 @@ + # undef HAVE_UNLOCKED_LINE_OPS + #endif - #if defined(__FreeBSD__) +-#if defined(__FreeBSD__) || defined(__APPLE__) ++#if defined(__dietlibc__) # undef HAVE_STRCHRNUL -+ -+# if __FreeBSD__ + 0 >= 2 -+# include -+# if __FreeBSD_version >= 800067 -+# define HAVE_GETLINE 1 /* FreeBSD added getdelim(), getline(), -+ stpncpy(), strnlen(), wcsnlen(), -+ wcscasecmp(), and wcsncasecmp() in 800067 */ -+# endif -+# endif #endif ++#if defined __FreeBSD__ ++# undef HAVE_CLEARENV ++# undef HAVE_FDATASYNC ++# undef HAVE_MNTENT_H ++# undef HAVE_PTSNAME_R ++# undef HAVE_SYS_STATFS_H ++# undef HAVE_SIGHANDLER_T ++# undef HAVE_STRVERSCMP ++# undef HAVE_XTABS ++# undef HAVE_UNLOCKED_LINE_OPS ++# include ++# if __FreeBSD_version < 1000029 ++# undef HAVE_STRCHRNUL /* FreeBSD added strchrnul() between 1000028 and 1000029 */ ++# endif ++#endif ++ #if defined(__NetBSD__) + # define HAVE_GETLINE 1 /* Recent NetBSD versions have getline() */ + #endif From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 13:49:16 2014 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 0AC1B368; Wed, 8 Jan 2014 13:49: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 D0EFC1A83; Wed, 8 Jan 2014 13:49: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 s08DnFgw095215; Wed, 8 Jan 2014 13:49:15 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08DnFoO095214; Wed, 8 Jan 2014 13:49:15 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081349.s08DnFoO095214@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 13:49:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339129 - branches/2014Q1/sysutils/busybox-unstable/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, 08 Jan 2014 13:49:16 -0000 Author: bapt Date: Wed Jan 8 13:49:15 2014 New Revision: 339129 URL: http://svnweb.freebsd.org/changeset/ports/339129 Log: MFH: r339051 Remove patch no longer required on any supported FreeBSD version (8.3+). Deleted: branches/2014Q1/sysutils/busybox-unstable/files/patch-sysklogd__logread.c Modified: Directory Properties: branches/2014Q1/ (props changed) From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 13:50:16 2014 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 3D3074B0; Wed, 8 Jan 2014 13:50: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 293C41A9C; Wed, 8 Jan 2014 13:50: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 s08DoFrY095739; Wed, 8 Jan 2014 13:50:15 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08DoFDO095738; Wed, 8 Jan 2014 13:50:15 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081350.s08DoFDO095738@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 13:50:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339130 - branches/2014Q1/sysutils/busybox-unstable 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, 08 Jan 2014 13:50:16 -0000 Author: bapt Date: Wed Jan 8 13:50:15 2014 New Revision: 339130 URL: http://svnweb.freebsd.org/changeset/ports/339130 Log: MFH: r339052 Bump portrevision after removal of patch. Modified: branches/2014Q1/sysutils/busybox-unstable/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/sysutils/busybox-unstable/Makefile ============================================================================== --- branches/2014Q1/sysutils/busybox-unstable/Makefile Wed Jan 8 13:49:15 2014 (r339129) +++ branches/2014Q1/sysutils/busybox-unstable/Makefile Wed Jan 8 13:50:15 2014 (r339130) @@ -4,7 +4,7 @@ PORTNAME= busybox PORTVERSION= 1.21.0 PORTREVISION= 2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils misc shells MASTER_SITES= http://www.busybox.net/downloads/ PKGNAMESUFFIX= -unstable From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 13:51:13 2014 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 869A067F; Wed, 8 Jan 2014 13:51: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 689741B00; Wed, 8 Jan 2014 13:51: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 s08DpDLC098258; Wed, 8 Jan 2014 13:51:13 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08DpDER098257; Wed, 8 Jan 2014 13:51:13 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081351.s08DpDER098257@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 13:51:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339132 - branches/2014Q1/security/openssl 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, 08 Jan 2014 13:51:13 -0000 Author: bapt Date: Wed Jan 8 13:51:12 2014 New Revision: 339132 URL: http://svnweb.freebsd.org/changeset/ports/339132 Log: MFH: r339068 - better fix for perl5.18 Submitted by: Jung-uk Kim - clean up Modified: branches/2014Q1/security/openssl/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/openssl/Makefile ============================================================================== --- branches/2014Q1/security/openssl/Makefile Wed Jan 8 13:50:36 2014 (r339131) +++ branches/2014Q1/security/openssl/Makefile Wed Jan 8 13:51:12 2014 (r339132) @@ -58,14 +58,16 @@ MANPREFIX= ${PREFIX} FIX_POD=apps/cms.pod \ apps/smime.pod \ - ssl/SSL_accept.pod \ - ssl/SSL_clear.pod \ - ssl/SSL_COMP_add_compression_method.pod ssl/SSL_connect.pod \ - ssl/SSL_CTX_add_session.pod ssl/SSL_CTX_load_verify_locations.pod \ + ssl/SSL_COMP_add_compression_method.pod \ + ssl/SSL_CTX_add_session.pod \ + ssl/SSL_CTX_load_verify_locations.pod \ ssl/SSL_CTX_set_client_CA_list.pod \ ssl/SSL_CTX_set_session_id_context.pod \ ssl/SSL_CTX_set_ssl_version.pod \ ssl/SSL_CTX_use_psk_identity_hint.pod \ + ssl/SSL_accept.pod \ + ssl/SSL_clear.pod \ + ssl/SSL_connect.pod \ ssl/SSL_do_handshake.pod \ ssl/SSL_read.pod \ ssl/SSL_session_reused.pod \ @@ -1176,18 +1178,16 @@ pre-everything:: .endif -pre-patch: - ${REINPLACE_CMD} -e 's|^=item \([0-9]\)$$|=item C<\1>|' \ - ${FIX_POD:S,^,${WRKSRC}/doc/,} - post-patch: - @${REINPLACE_CMD} -e 's|m4 -B 8192|m4|g' \ + ${REINPLACE_CMD} -E -e 's|^=item ([0-9])[[:blank:]]*$$|=item Z<>\1|' \ + ${FIX_POD:S,^,${WRKSRC}/doc/,} + ${REINPLACE_CMD} -e 's|m4 -B 8192|m4|g' \ ${WRKSRC}/crypto/des/Makefile ${REINPLACE_CMD} -e 's|SHLIB_VERSION_NUMBER "1.0.0"|SHLIB_VERSION_NUMBER "${OPENSSL_SHLIBVER}"|' \ ${WRKSRC}/crypto/opensslv.h do-configure: - @${REINPLACE_CMD} -e "s|options 386|options|" \ + ${REINPLACE_CMD} -e "s|options 386|options|" \ ${WRKSRC}/config .if ${PORT_OPTIONS:MTHREADS} cd ${WRKSRC} \ @@ -1201,7 +1201,7 @@ do-configure: ./config --prefix=${PREFIX} --openssldir=${OPENSSLDIR} \ -L${PREFIX}/lib ${EXTRACONFIGURE} .endif - @${REINPLACE_CMD} \ + ${REINPLACE_CMD} \ -e 's|^MANDIR=.*$$|MANDIR=$$(MANPREFIX)/man|' \ -e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \ -e 's|LIBVERSION=[^ ]* |LIBVERSION=$(OPENSSL_SHLIBVER) |' \ @@ -1210,15 +1210,15 @@ do-configure: post-install: .if ${PORT_OPTIONS:MSHARED} .for i in libcrypto libssl - @${INSTALL_DATA} ${WRKSRC}/$i.so.${OPENSSL_SHLIBVER} ${PREFIX}/lib - @${LN} -sf $i.so.${OPENSSL_SHLIBVER} ${PREFIX}/lib/$i.so + ${INSTALL_DATA} ${WRKSRC}/$i.so.${OPENSSL_SHLIBVER} ${PREFIX}/lib + ${LN} -sf $i.so.${OPENSSL_SHLIBVER} ${PREFIX}/lib/$i.so .endfor .endif .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/openssl.txt ${DOCSDIR}/ + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/openssl.txt ${DOCSDIR}/ .endif - @${SED} -e 's#/usr/local#${PREFIX}#g' ${PKGMESSAGE} + @${SED} -e 's|/usr/local|${PREFIX}|g' ${PKGMESSAGE} test: build cd ${WRKSRC} && ${MAKE} test From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 14:44:31 2014 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 AEBD87B; Wed, 8 Jan 2014 14:44: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 9A58C10BC; Wed, 8 Jan 2014 14:44: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 s08EiVuc018726; Wed, 8 Jan 2014 14:44:31 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08EiVD9018725; Wed, 8 Jan 2014 14:44:31 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401081444.s08EiVD9018725@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 8 Jan 2014 14:44:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339141 - branches/2014Q1/net-mgmt/snmp++ 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, 08 Jan 2014 14:44:31 -0000 Author: bapt Date: Wed Jan 8 14:44:31 2014 New Revision: 339141 URL: http://svnweb.freebsd.org/changeset/ports/339141 Log: MFH: r339140 Do not assume the compiler is g++ While here stage Modified: branches/2014Q1/net-mgmt/snmp++/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net-mgmt/snmp++/Makefile ============================================================================== --- branches/2014Q1/net-mgmt/snmp++/Makefile Wed Jan 8 14:39:51 2014 (r339140) +++ branches/2014Q1/net-mgmt/snmp++/Makefile Wed Jan 8 14:44:31 2014 (r339141) @@ -13,14 +13,15 @@ COMMENT= SNMP C++ library with V3 suppor MAKEFILE= Makefile.FreeBSD WRKSRC= ${WRKDIR}/${PORTNAME}/src -USE_GMAKE= yes +USES= gmake USE_LDCONFIG= yes +MAKE_ARGS= CC="${CXX}" -NO_STAGE= yes post-extract: ${CP} ${FILESDIR}/Makefile.FreeBSD ${WRKSRC} post-install: - ${LN} -sf ${PREFIX}/lib/libsnmp++.so.2.0.0 ${PREFIX}/lib/libsnmp++.so + ${LN} -sf ${PREFIX}/lib/libsnmp++.so.2.0.0 ${STAGEDIR}${PREFIX}/lib/libsnmp++.so + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsnmp++.so.2.0.0 .include From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 15:25:18 2014 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 37ED5BE; Wed, 8 Jan 2014 15:25: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 2383C13E2; Wed, 8 Jan 2014 15:25: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 s08FPIxF034655; Wed, 8 Jan 2014 15:25:18 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08FPH4V034654; Wed, 8 Jan 2014 15:25:17 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201401081525.s08FPH4V034654@svn.freebsd.org> From: Pietro Cerutti Date: Wed, 8 Jan 2014 15:25:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339149 - branches/2014Q1/lang/otcl 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, 08 Jan 2014 15:25:18 -0000 Author: gahr Date: Wed Jan 8 15:25:17 2014 New Revision: 339149 URL: http://svnweb.freebsd.org/changeset/ports/339149 Log: MFH: r339147 - Fix CONFIGURE Approved by: portmgr Modified: branches/2014Q1/lang/otcl/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/lang/otcl/Makefile ============================================================================== --- branches/2014Q1/lang/otcl/Makefile Wed Jan 8 15:20:21 2014 (r339148) +++ branches/2014Q1/lang/otcl/Makefile Wed Jan 8 15:25:17 2014 (r339149) @@ -31,7 +31,8 @@ NO_STAGE= yes .include CFLAGS+= -DHAVE_UNISTD_H -CONFIGURE_ARGS+=--with-tcl-ver=${TCL_SHLIB_VER} --with-tk-ver=${TK_SHLIB_VER} +CONFIGURE_ARGS+=--with-tcl=${LOCALBASE} \ + --with-tk=${LOCALBASE} .if ${TCL_SHLIB_VER} > 85 CFLAGS+= -DUSE_INTERP_ERRORLINE -DUSE_INTERP_RESULT From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 18:34:20 2014 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 1A0011D1; Wed, 8 Jan 2014 18:34: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 05DF914D2; Wed, 8 Jan 2014 18:34: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 s08IYJ4l008770; Wed, 8 Jan 2014 18:34:19 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08IYJ4R008769; Wed, 8 Jan 2014 18:34:19 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201401081834.s08IYJ4R008769@svn.freebsd.org> From: Antoine Brodin Date: Wed, 8 Jan 2014 18:34:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339164 - branches/2014Q1/graphics/lfview 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, 08 Jan 2014 18:34:20 -0000 Author: antoine Date: Wed Jan 8 18:34:19 2014 New Revision: 339164 URL: http://svnweb.freebsd.org/changeset/ports/339164 Log: MFH: r339163 - Remove NO_INSTALL_MANPAGES, it's useless with custom do-install target - Stage support - Fix build on head amd64 (MAKE_ENV was overriden) - Add missing OPTIONS_DEFINE PR: ports/185514 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Modified: branches/2014Q1/graphics/lfview/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/lfview/Makefile ============================================================================== --- branches/2014Q1/graphics/lfview/Makefile Wed Jan 8 18:31:40 2014 (r339163) +++ branches/2014Q1/graphics/lfview/Makefile Wed Jan 8 18:34:19 2014 (r339164) @@ -14,23 +14,24 @@ COMMENT= Graphic viewer for Leaf product USES= imake USE_XORG= x11 xext USE_LDCONFIG= yes -NO_INSTALL_MANPAGES= yes -NO_STAGE= yes -.include +OPTIONS_DEFINE= DOCS +DOCSDIR= ${PREFIX}/share/doc/ja/lfview -.if ${ARCH} == "amd64" +.include + +.if ${ARCH} != i386 CFLAGS+= -fPIC -MAKE_ENV= "SHLIBGLOBALSFLAGS=-fPIC" +MAKE_ENV+= SHLIBGLOBALSFLAGS=-fPIC .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/lfview ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/plugins/liblfv_leaf.so.1 ${PREFIX}/lib - ${LN} -s ${PREFIX}/lib/liblfv_leaf.so.1 ${PREFIX}/lib/liblfv_leaf.so + ${INSTALL_PROGRAM} ${WRKSRC}/lfview ${STAGEDIR}${PREFIX}/bin + ${INSTALL_LIB} ${WRKSRC}/plugins/liblfv_leaf.so.1 ${STAGEDIR}${PREFIX}/lib + ${LN} -sf liblfv_leaf.so.1 ${STAGEDIR}${PREFIX}/lib/liblfv_leaf.so .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${PREFIX}/share/doc/ja/lfview - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ja/lfview + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .endif -.include +.include From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 19:30:38 2014 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 9565119F; Wed, 8 Jan 2014 19:30: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 8074A1991; Wed, 8 Jan 2014 19:30: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 s08JUcMc028787; Wed, 8 Jan 2014 19:30:38 GMT (envelope-from lme@svn.freebsd.org) Received: (from lme@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08JUcpx028785; Wed, 8 Jan 2014 19:30:38 GMT (envelope-from lme@svn.freebsd.org) Message-Id: <201401081930.s08JUcpx028785@svn.freebsd.org> From: Lars Engels Date: Wed, 8 Jan 2014 19:30:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339166 - branches/2014Q1/sysutils/bsdstats 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, 08 Jan 2014 19:30:38 -0000 Author: lme Date: Wed Jan 8 19:30:37 2014 New Revision: 339166 URL: http://svnweb.freebsd.org/changeset/ports/339166 Log: MFH: r339133 - Add DIG command to SUB_LIST, not overwrite the list - Use correct OSVERSION for the dig(1) / drill(1) change - Don't add anything to rc.conf and periodic.conf when WITH_PACKAGE_BUILDING is set to pet poudriere and tinderbox - Re-word pkg-message - Bump PORTREVISION PR: ports/175879 Submitted by: Alex Keda Approved by: maintainer Reported by: Alex Keda, 2A, and dvl Patched by: A.J. Kehoe and me Approved by: portmgr (bapt) Modified: branches/2014Q1/sysutils/bsdstats/Makefile branches/2014Q1/sysutils/bsdstats/pkg-install Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/sysutils/bsdstats/Makefile ============================================================================== --- branches/2014Q1/sysutils/bsdstats/Makefile Wed Jan 8 19:19:53 2014 (r339165) +++ branches/2014Q1/sysutils/bsdstats/Makefile Wed Jan 8 19:30:37 2014 (r339166) @@ -3,7 +3,7 @@ PORTNAME= bsdstats PORTVERSION= 5.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils DISTFILES= @@ -13,11 +13,11 @@ COMMENT= Monthly script for reporting an NO_BUILD= yes USE_RC_SUBR= bsdstats SUB_FILES= 300.statistics pkg-message -SUB_LIST= DIG=${DIG} +SUB_LIST+= DIG=${DIG} -.include +.include -.if ${OSVERSION} >= 1000100 +.if ${OSVERSION} >= 1000500 DIG= drill .else DIG= dig @@ -28,4 +28,9 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/300.statistics \ ${STAGEDIR}${PREFIX}/etc/periodic/monthly -.include +post-install: +.if ! defined(BATCH) && ! defined(PACKAGE_BUILDING) + @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL +.endif + +.include Modified: branches/2014Q1/sysutils/bsdstats/pkg-install ============================================================================== --- branches/2014Q1/sysutils/bsdstats/pkg-install Wed Jan 8 19:19:53 2014 (r339165) +++ branches/2014Q1/sysutils/bsdstats/pkg-install Wed Jan 8 19:30:37 2014 (r339166) @@ -1,86 +1,84 @@ #!/bin/sh -# # pkg-install : based off ${PORTSDIR}/mail/courier/files/pkg-install.in -# -# The default answer to "Would you like to enable monthly reporting in -# /etc/periodic.conf?" is "yes", which you can override by setting the -# BSDSTATS_MONTHLY_ENABLE environment variable to "no". -# -# The default answer to "Would you like to send a list of installed hardware -# as well?" is "yes", which you can override by setting the -# BSDSTATS_MONTHLY_DEVICES environment variable to "no". -# -# The default answer to "Would you like to send a list of installed ports as -# well?" is "yes", which you can override by setting the BSDSTATS_MONTHLY_PORTS -# environment variable to "no". -# -# The default answer to "Would you like to run it now?" is "yes", which you can -# override by setting the BSDSTATS_MONTHLY_NOW environment variable to "no". -# -# The default answer to "Would you like to enable reporting on bootup in -# /etc/rc.conf?" is "yes", which you can override by setting the -# BSDSTATS_REBOOT_REPORTING environment variable to "no". - -BSDSTATS_MONTHLY_ENABLE=${BSDSTATS_MONTHLY_ENABLE:=yes} -BSDSTATS_MONTHLY_DEVICES=${BSDSTATS_MONTHLY_DEVICES:=yes} -BSDSTATS_MONTHLY_PORTS=${BSDSTATS_MONTHLY_PORTS:=yes} -BSDSTATS_MONTHLY_NOW=${BSDSTATS_MONTHLY_NOW:=yes} -BSDSTATS_REBOOT_REPORTING=${BSDSTATS_REBOOT_REPORTING:=yes} +# The default answer to each of the installation questions is "yes". You can +# override a questions's default by setting its environment variable to "no". +# +# Environment Variable | Question +# --------------------------+------------------------------------------------------------------ +# BSDSTATS_MONTHLY_ENABLE | Would you like to enable monthly reporting in /etc/periodic.conf? +# BSDSTATS_MONTHLY_DEVICES | Would you like to send a list of installed hardware as well? +# BSDSTATS_MONTHLY_PORTS | Would you like to send a list of installed ports as well? +# BSDSTATS_MONTHLY_NOW | Would you like to run it now? +# BSDSTATS_REBOOT_REPORTING | Would you like to enable reporting on bootup in /etc/rc.conf? + +if [ -n "$PACKAGE_BUILDING" ]; then + BSDSTATS_MONTHLY_ENABLE=${BSDSTATS_MONTHLY_ENABLE:=no} + BSDSTATS_MONTHLY_DEVICES=${BSDSTATS_MONTHLY_DEVICES:=no} + BSDSTATS_MONTHLY_PORTS=${BSDSTATS_MONTHLY_PORTS:=no} + BSDSTATS_MONTHLY_NOW=${BSDSTATS_MONTHLY_NOW:=no} + BSDSTATS_REBOOT_REPORTING=${BSDSTATS_REBOOT_REPORTING:=no} +else + BSDSTATS_MONTHLY_ENABLE=${BSDSTATS_MONTHLY_ENABLE:=yes} + BSDSTATS_MONTHLY_DEVICES=${BSDSTATS_MONTHLY_DEVICES:=yes} + BSDSTATS_MONTHLY_PORTS=${BSDSTATS_MONTHLY_PORTS:=yes} + BSDSTATS_MONTHLY_NOW=${BSDSTATS_MONTHLY_NOW:=yes} + BSDSTATS_REBOOT_REPORTING=${BSDSTATS_REBOOT_REPORTING:=yes} +fi ask() { - local question default answer + local question default answer - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then - read -p "${question} [${default}]? " answer - fi - if [ -z "${answer}" ]; then - answer=${default} - fi - echo ${answer} + question=$1 + default=$2 + if [ -z "$BATCH" -a -z "$PACKAGE_BUILDING" ]; then + read -p "$question [$default]? " answer + fi + if [ -z "$answer" ]; then + answer=$default + fi + echo $answer } yesno() { - local question default answer + local question default answer - question=$1 - default=$2 - while :; do - answer=$(ask "${question}" "${default}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - echo "Please answer yes or no." - done + question=$1 + default=$2 + while :; do + answer=$(ask "$question" "$default") + case "$answer" in + [Yy]*) return 0;; + [Nn]*) return 1;; + esac + echo "Please answer yes or no." + done } if [ "$2" = "POST-INSTALL" ]; then - if [ ! -f "/etc/periodic.conf" ] || [ -z "`grep monthly_statistics /etc/periodic.conf`" ]; then - if yesno "Would you like to enable monthly reporting in /etc/periodic.conf" ${BSDSTATS_MONTHLY_ENABLE}; then - echo "monthly_statistics_enable=\"YES\"" >> /etc/periodic.conf - if yesno "Would you like to send a list of installed hardware as well" ${BSDSTATS_MONTHLY_DEVICES}; then - echo "monthly_statistics_report_devices=\"YES\"" >> /etc/periodic.conf - fi - if yesno "Would you like to send a list of installed ports as well" ${BSDSTATS_MONTHLY_PORTS}; then - echo "monthly_statistics_report_ports=\"YES\"" >> /etc/periodic.conf - fi - if yesno "Would you like to run it now" ${BSDSTATS_MONTHLY_NOW}; then - ${PKG_PREFIX}/etc/periodic/monthly/300.statistics -nodelay - fi - fi - fi - if [ ! -f "/etc/rc.conf" ] || [ -z "`grep bsdstats_enable /etc/rc.conf`" ]; then - echo "" - echo "If you're installing BSDstats on a system that won't always be on, such as a" - echo "desktop or a laptop, it is recommended that you enable it in /etc/rc.conf so" - echo "that it will run on bootup. This will ensure that, even if your computer is" - echo "off when \"monthly\" runs, your computer will be counted properly." - echo "" - if yesno "Would you like to enable reporting on bootup in /etc/rc.conf" ${BSDSTATS_REBOOT_REPORTING}; then - echo "bsdstats_enable=\"YES\"" >> /etc/rc.conf - fi - fi + if [ ! -f "/etc/periodic.conf" ] || [ -z "`grep monthly_statistics /etc/periodic.conf`" ]; then + if yesno "Would you like to enable monthly reporting in /etc/periodic.conf" $BSDSTATS_MONTHLY_ENABLE; then + echo "monthly_statistics_enable=\"YES\"" >> /etc/periodic.conf + if yesno "Would you like to send a list of installed hardware as well" $BSDSTATS_MONTHLY_DEVICES; then + echo "monthly_statistics_report_devices=\"YES\"" >> /etc/periodic.conf + fi + if yesno "Would you like to send a list of installed ports as well" $BSDSTATS_MONTHLY_PORTS; then + echo "monthly_statistics_report_ports=\"YES\"" >> /etc/periodic.conf + fi + if yesno "Would you like to run it now" $BSDSTATS_MONTHLY_NOW; then + ${PKG_PREFIX}/etc/periodic/monthly/300.statistics -nodelay + fi + fi + fi + if [ ! -f "/etc/rc.conf" ] || [ -z "`grep bsdstats_enable /etc/rc.conf`" ]; then + echo + echo "If you're installing BSDstats on a system that won't always be on, such as a" + echo "desktop or a laptop, it is recommended that you enable it in /etc/rc.conf so" + echo "that it will run on bootup. This will ensure that, even if your computer is" + echo "off when \"monthly\" runs, your computer will be counted properly." + echo + if yesno "Would you like to enable reporting on bootup in /etc/rc.conf" $BSDSTATS_REBOOT_REPORTING; then + echo "bsdstats_enable=\"YES\"" >> /etc/rc.conf + fi + fi fi From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 19:31:25 2014 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 856F628B; Wed, 8 Jan 2014 19:31: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 7177219A4; Wed, 8 Jan 2014 19:31: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 s08JVPLK031193; Wed, 8 Jan 2014 19:31:25 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08JVPWY031192; Wed, 8 Jan 2014 19:31:25 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201401081931.s08JVPWY031192@svn.freebsd.org> From: Antoine Brodin Date: Wed, 8 Jan 2014 19:31:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339167 - branches/2014Q1/net/latd 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, 08 Jan 2014 19:31:25 -0000 Author: antoine Date: Wed Jan 8 19:31:24 2014 New Revision: 339167 URL: http://svnweb.freebsd.org/changeset/ports/339167 Log: MFH: r339165 - Stage support - Fix build with libc++ PR: ports/185507 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Modified: branches/2014Q1/net/latd/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net/latd/Makefile ============================================================================== --- branches/2014Q1/net/latd/Makefile Wed Jan 8 19:30:37 2014 (r339166) +++ branches/2014Q1/net/latd/Makefile Wed Jan 8 19:31:24 2014 (r339167) @@ -7,23 +7,24 @@ CATEGORIES= net MASTER_SITES= SF/linux-decnet/${PORTNAME}/${PORTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= The Linux-DECnet project LAT protocol suite +COMMENT= Linux-DECnet project LAT protocol suite LICENSE= GPLv2 GNU_CONFIGURE= yes -MAN1= llogin.1 -MAN5= latd.conf.5 -MAN8= latd.8 latcp.8 moprc.8 -PLIST_FILES= bin/llogin etc/latd.conf.sample sbin/latcp sbin/latd sbin/moprc +PLIST_FILES= bin/llogin etc/latd.conf.sample \ + man/man1/llogin.1.gz man/man5/latd.conf.5.gz \ + man/man8/latd.8.gz man/man8/latcp.8.gz man/man8/moprc.8.gz \ + sbin/latcp sbin/latd sbin/moprc -NO_STAGE= yes post-extract: @${CHMOD} ${BINMODE} ${WRKSRC}/install-sh post-patch: @${FIND} ${WRKSRC} -name "*.cc" | ${XARGS} ${REINPLACE_CMD} -e \ - '//s|^|// |' + '//s|^|// | ; \ + s| \(setiosflags\)| std::\1| ; \ + s| \(resetiosflags\)| std::\1|' .include From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 20:25:51 2014 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 0AFFD6A6; Wed, 8 Jan 2014 20:25:51 +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 EA9B71EC2; Wed, 8 Jan 2014 20:25: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 s08KPoWD051200; Wed, 8 Jan 2014 20:25:50 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08KPopv051199; Wed, 8 Jan 2014 20:25:50 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201401082025.s08KPopv051199@svn.freebsd.org> From: Antoine Brodin Date: Wed, 8 Jan 2014 20:25:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339171 - branches/2014Q1/net/aget 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, 08 Jan 2014 20:25:51 -0000 Author: antoine Date: Wed Jan 8 20:25:50 2014 New Revision: 339171 URL: http://svnweb.freebsd.org/changeset/ports/339171 Log: MFH: r339170 - Add LICENSE - Stage support - Fix build with clang PR: ports/185501 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Modified: branches/2014Q1/net/aget/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net/aget/Makefile ============================================================================== --- branches/2014Q1/net/aget/Makefile Wed Jan 8 20:22:53 2014 (r339170) +++ branches/2014Q1/net/aget/Makefile Wed Jan 8 20:25:50 2014 (r339171) @@ -7,15 +7,18 @@ CATEGORIES= net MASTER_SITES= http://www.enderunix.org/aget/ MAINTAINER= ports@FreeBSD.org -COMMENT= A multithreaded HTTP download accelerator +COMMENT= Multithreaded HTTP download accelerator -PLIST_FILES= bin/aget -MAN1= aget.1 +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING -NO_STAGE= yes -post-patch: -# fix man prefix and make portlint happy :) - @${REINPLACE_CMD} -e 's|/usr/share/man/man1/|${MANPREFIX}/man/man1/|g' -e \ - 's|/usr/local/bin/|${PREFIX}/bin/|g' ${WRKSRC}/Makefile +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +LDFLAGS+= -pthread + +PLIST_FILES= bin/aget man/man1/aget.1.gz + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/aget ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/aget.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 8 20:55:52 2014 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 82F09435; Wed, 8 Jan 2014 20:55: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 6E9CE115B; Wed, 8 Jan 2014 20:55: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 s08KtqbL062644; Wed, 8 Jan 2014 20:55:52 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08KtqHc062643; Wed, 8 Jan 2014 20:55:52 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201401082055.s08KtqHc062643@svn.freebsd.org> From: Antoine Brodin Date: Wed, 8 Jan 2014 20:55:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339176 - branches/2014Q1/x11-clocks/wmtime 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, 08 Jan 2014 20:55:52 -0000 Author: antoine Date: Wed Jan 8 20:55:51 2014 New Revision: 339176 URL: http://svnweb.freebsd.org/changeset/ports/339176 Log: MFH: r339175 - Fix build with clang - Stage support PR: ports/185311 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Modified: branches/2014Q1/x11-clocks/wmtime/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/x11-clocks/wmtime/Makefile ============================================================================== --- branches/2014Q1/x11-clocks/wmtime/Makefile Wed Jan 8 20:54:35 2014 (r339175) +++ branches/2014Q1/x11-clocks/wmtime/Makefile Wed Jan 8 20:55:51 2014 (r339176) @@ -12,12 +12,13 @@ MASTER_SITES= http://web.cs.mun.ca/~gsta MAINTAINER= ports@FreeBSD.org COMMENT= Time/Date applet for WindowMaker -PLIST_FILES= bin/wmtime WRKSRC= ${WRKDIR}/wmtime.app/wmtime USES= imake USE_XORG= xpm +USE_CSTD= gnu89 + +PLIST_FILES= bin/wmtime -NO_STAGE= yes post-extract: ${CP} ${WRKSRC}/../Imakefile ${WRKSRC}/Imakefile From owner-svn-ports-branches@FreeBSD.ORG Thu Jan 9 09:09:42 2014 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 D7B42BE1; Thu, 9 Jan 2014 09:09:42 +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 C39911DCC; Thu, 9 Jan 2014 09:09:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0999giR043613; Thu, 9 Jan 2014 09:09:42 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0999gp5043610; Thu, 9 Jan 2014 09:09:42 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201401090909.s0999gp5043610@svn.freebsd.org> From: Pietro Cerutti Date: Thu, 9 Jan 2014 09:09:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339212 - in branches/2014Q1/x11/tkXwin: . 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, 09 Jan 2014 09:09:43 -0000 Author: gahr Date: Thu Jan 9 09:09:41 2014 New Revision: 339212 URL: http://svnweb.freebsd.org/changeset/ports/339212 Log: MFH: r339205 - Convert to USES=tk, and fix required Tk version - STAGE-clean - PREFIX-clean Approved by: portmgr (mat) Modified: branches/2014Q1/x11/tkXwin/Makefile (contents, props changed) branches/2014Q1/x11/tkXwin/files/patch-Makefile.in (contents, props changed) branches/2014Q1/x11/tkXwin/files/patch-configure (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/x11/tkXwin/Makefile ============================================================================== --- branches/2014Q1/x11/tkXwin/Makefile Thu Jan 9 08:59:44 2014 (r339211) +++ branches/2014Q1/x11/tkXwin/Makefile Thu Jan 9 09:09:41 2014 (r339212) @@ -11,16 +11,16 @@ EXTRACT_SUFX= .tgz MAINTAINER= dsh@vlink.ru COMMENT= Tcl/Tk library to detect idle periods of an X session +USES= tk:84 GNU_CONFIGURE= yes USE_XORG= xt xscrnsaver USE_LDCONFIG= yes -USE_TK= 84+ -CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \ +CONFIGURE_ARGS= --prefix=${PREFIX} \ + --with-tcl=${TCL_LIBDIR} \ --with-tclinclude=${TCL_INCLUDEDIR} \ --with-tk=${TK_LIBDIR} \ --with-tkinclude=${TK_INCLUDEDIR} CONFIGURE_ENV= INSTALL="${INSTALL_DATA}" -NO_STAGE= yes .include Modified: branches/2014Q1/x11/tkXwin/files/patch-Makefile.in ============================================================================== --- branches/2014Q1/x11/tkXwin/files/patch-Makefile.in Thu Jan 9 08:59:44 2014 (r339211) +++ branches/2014Q1/x11/tkXwin/files/patch-Makefile.in Thu Jan 9 09:09:41 2014 (r339212) @@ -1,5 +1,5 @@ ---- Makefile.in.orig Sun Aug 25 10:29:52 2002 -+++ Makefile.in Tue Aug 9 15:09:49 2005 +--- Makefile.in.orig 2002-08-25 08:29:52.000000000 +0200 ++++ Makefile.in 2014-01-09 09:33:06.000000000 +0100 @@ -14,8 +14,8 @@ # @@ -20,3 +20,22 @@ common_sources = tkXwin.c +@@ -432,14 +432,14 @@ + + + install-exec-hook: +- $(mkinstalldirs) @PKG_TCL@ ++ $(mkinstalldirs) $(DESTDIR)@PKG_TCL@ + echo "package ifneeded tkXwin" \ + `echo $(VERSION) | awk -F. '{ printf "%s.%s", $$1, $$2 }'` \ +- "[list load $(DESTDIR)$(libdir)/libtkXwin.so]" \ +- > @PKG_TCL@/pkgIndex.tcl ++ "[list load $(libdir)/libtkXwin.so]" \ ++ > $(DESTDIR)@PKG_TCL@/pkgIndex.tcl + sed -e 's%load .libs/libtkXwin.so%package require tkXwin%' \ + < test.tcl \ +- > @PKG_TCL@/test.tcl ++ > $(DESTDIR)@PKG_TCL@/test.tcl + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Modified: branches/2014Q1/x11/tkXwin/files/patch-configure ============================================================================== --- branches/2014Q1/x11/tkXwin/files/patch-configure Thu Jan 9 08:59:44 2014 (r339211) +++ branches/2014Q1/x11/tkXwin/files/patch-configure Thu Jan 9 09:09:41 2014 (r339212) @@ -1,5 +1,5 @@ ---- configure.orig 2002-08-25 10:29:53.000000000 +0400 -+++ configure 2007-10-14 20:44:46.000000000 +0400 +--- configure.orig 2002-08-25 08:29:53.000000000 +0200 ++++ configure 2014-01-09 09:46:12.000000000 +0100 @@ -1798,7 +1798,7 @@ AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \ objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \ @@ -14,7 +14,7 @@ -PKG_TCL=${TCL_PACKAGE_PATH}/tkXwin -+PKG_TCL=${TCL_PREFIX}/lib/tkXwin ++PKG_TCL=$prefix/lib/tkXwin From owner-svn-ports-branches@FreeBSD.ORG Fri Jan 10 21:13:00 2014 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 1E172E14; Fri, 10 Jan 2014 21:13: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 0A1EE1104; Fri, 10 Jan 2014 21:13: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 s0ALCxE6093265; Fri, 10 Jan 2014 21:12:59 GMT (envelope-from decke@svn.freebsd.org) Received: (from decke@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0ALCxXb093264; Fri, 10 Jan 2014 21:12:59 GMT (envelope-from decke@svn.freebsd.org) Message-Id: <201401102112.s0ALCxXb093264@svn.freebsd.org> From: Bernhard Froehlich Date: Fri, 10 Jan 2014 21:12:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339385 - branches/2014Q1/multimedia/tvheadend 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, 10 Jan 2014 21:13:00 -0000 Author: decke Date: Fri Jan 10 21:12:59 2014 New Revision: 339385 URL: http://svnweb.freebsd.org/changeset/ports/339385 Log: MFH: r339384 - Add missing DISTNAME which was forgotten in previous commit Submitted by: pkg-fallout Pointyhat to: decke Modified: branches/2014Q1/multimedia/tvheadend/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/multimedia/tvheadend/Makefile ============================================================================== --- branches/2014Q1/multimedia/tvheadend/Makefile Fri Jan 10 21:11:36 2014 (r339384) +++ branches/2014Q1/multimedia/tvheadend/Makefile Fri Jan 10 21:12:59 2014 (r339385) @@ -6,6 +6,7 @@ PORTVERSION= 3.4.0.20130726.3 PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= http://people.freebsd.org/~decke/distfiles/ +DISTNAME= decke-${PORTNAME}-8a8c1a8 DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} dvb-scan-tables-20130714.tar.gz MAINTAINER= decke@FreeBSD.org