Index: MOVED =================================================================== --- MOVED +++ MOVED @@ -8991,3 +8991,4 @@ emulators/doscmd||2017-01-15|Has expired: does not build (accesses field of opaque structure) sysutils/fusefs-kmod||2017-01-15|Has expired: integrated into base textproc/aiksaurus-gtk||2017-01-15|Has expired: does not link against GTK2 on FreeBSD 10+ +astro/boinc-setiathome-v7||2017-01-16|SETI@home project is on v8 now and not sending new WU's. Recompile net/boinc-client with LINUX option set. Index: astro/Makefile =================================================================== --- astro/Makefile +++ astro/Makefile @@ -7,7 +7,6 @@ SUBDIR += accrete SUBDIR += astrometry SUBDIR += boinc-astropulse - SUBDIR += boinc-setiathome-v7 SUBDIR += celestia SUBDIR += celestia-gnome SUBDIR += celestia-gtk Index: astro/boinc-setiathome-v7/Makefile =================================================================== --- astro/boinc-setiathome-v7/Makefile +++ /dev/null @@ -1,104 +0,0 @@ -# Created by: rene -# $FreeBSD$ - -PORTNAME= boinc-setiathome-v7 -PORTVERSION= 7.00 -PORTREVISION= 6 -CATEGORIES= astro -MASTER_SITES= LOCAL/rene -DISTNAME= setiathome-svn-1924 # modified archive, see leftout in top directory - -MAINTAINER= ports@FreeBSD.org -COMMENT= Setiathome Enhanced for BOINC - -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - -BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:math/fftw3 -RUN_DEPENDS= boinc_client:net/boinc-client -LIB_DEPENDS= libfftw3f.so:math/fftw3-float - -USES= tar:xz gmake pkgconfig -USE_AUTOTOOLS= autoconf:env automake:env -GNU_CONFIGURE= yes - -CFLAGS+= -O2 -I${LOCALBASE}/include/boinc -I${LOCALBASE}/include \ - -L${LOCALBASE}/lib -.if defined(CPUTYPE) -CFLAGS+= -march=${CPUTYPE} -.endif - -# these must match settings in ${PORTSDIR}/net/boinc-client/Makefile -BOINC_CLIENT_USER?= boinc -BOINC_CLIENT_GROUP?= boinc -BOINC_CLIENT_HOME?= /var/db/boinc - -OPTIONS_DEFINE= X11 - -X11_DESC= Build screensaver (requires net/boinc-client with X11) - -OPTIONS_SUB= yes - -X11_BUILD_DEPENDS= ${LOCALBASE}/lib/libboinc_graphics2.a:net/boinc-client -X11_USES= jpeg -X11_USE= GL=gl,glu,glut \ - XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm -X11_CONFIGURE_ENABLE= graphics - -X11_BUILD_DEPENDS_OFF= ${LOCALBASE}/include/boinc/std_fixes.h:net/boinc-client - -CFLAGS_i386= -mtune=native -CFLAGS_amd64= -mtune=native - -.if !empty(MACHINE_CPU:Maltivec) -CONFIGURE_ARGS+= --enable-altivec -.endif - -CONFIGURE_ENV+= BOINCDIR="${NONEXISTENT}" - -CONFIGURE_ARGS+= --disable-static-client --disable-server \ - --disable-tests \ - --with-boinc-platform=${ARCH}-portbld-freebsd - -SETI_SITE= setiathome.berkeley.edu -SETI_BINARY= setiathome-${PORTVERSION:S/.0/./}.${ARCH}-portbld-freebsd - -SUB_FILES= pkg-deinstall pkg-install pkg-message -SUB_LIST= SETI_BINARY=${SETI_BINARY} \ - SETI_SITE=${SETI_SITE} \ - SETI_VERSION=${PORTVERSION:S/.//} \ - BOINC_CLIENT_HOME=${BOINC_CLIENT_HOME} \ - BOINC_CLIENT_USER=${BOINC_CLIENT_USER} \ - BOINC_CLIENT_GROUP=${BOINC_CLIENT_GROUP} -PLIST_SUB+= PREFIX=${PREFIX} \ - SETI_BINARY=${SETI_BINARY} \ - SETI_SITE=${SETI_SITE} \ - BOINC_CLIENT_HOME=${BOINC_CLIENT_HOME} \ - BOINC_CLIENT_USER=${BOINC_CLIENT_USER} \ - BOINC_CLIENT_GROUP=${BOINC_CLIENT_GROUP} - -BROKEN_powerpc64= Does not build - -# str_replace.h is included in newer versions of net/boinc-client, -# but it is not needed on FreeBSD -post-patch: - ${REINPLACE_CMD} -E -e "s|#include \"str_replace.h\"||" \ - ${WRKSRC}/client/main.cpp \ - ${WRKSRC}/client/sah_gfx.cpp \ - ${WRKSRC}/client/seti.cpp \ - ${WRKSRC}/client/timecvt.cpp \ - ${WRKSRC}/db/xml_util.cpp - -pre-configure: - (cd ${WRKSRC} ; ./_autosetup) - -do-install: - ${INSTALL} -d ${STAGEDIR}${BOINC_CLIENT_HOME}/projects - ${INSTALL} -d ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE} - ${INSTALL_PROGRAM} ${WRKSRC}/client/${SETI_BINARY} \ - ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/ -do-install-X11-on: - ${INSTALL_PROGRAM} ${WRKSRC}/client/seti_graphics \ - ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/ - -.include Index: astro/boinc-setiathome-v7/distinfo =================================================================== --- astro/boinc-setiathome-v7/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (setiathome-svn-1924.tar.xz) = 8ef1164462dabe72574c504bcab74d8b0a168833c374872e9fa204737f376298 -SIZE (setiathome-svn-1924.tar.xz) = 992080 Index: astro/boinc-setiathome-v7/files/patch-client_Makefile.am =================================================================== --- astro/boinc-setiathome-v7/files/patch-client_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- client/Makefile.am.orig 2013-06-26 17:01:48 UTC -+++ client/Makefile.am -@@ -199,7 +199,7 @@ if PPC - seti_boinc-analyzeFuncs_altivec.o: vector/analyzeFuncs_altivec.cpp - if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(seti_boinc_CXXFLAGS) $(CXXFLAGS) -DUSE_ALTIVEC \ -- -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -faltivec \ -+ -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -maltivec -mabi=altivec \ - -c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ - else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi - seti_boinc-analyzeFuncs_vector.o: vector/analyzeFuncs_vector.cpp Index: astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__sse.cpp =================================================================== --- astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__sse.cpp +++ /dev/null @@ -1,35 +0,0 @@ ---- client/vector/analyzeFuncs_sse.cpp.orig 2013-06-26 16:56:49 UTC -+++ client/vector/analyzeFuncs_sse.cpp -@@ -191,7 +191,7 @@ inline void v_vsubTranspose4(float *in, - prefetcht0(out+3*yline); - // TODO: figure out why the intrinsic version crashes for MinGW build - // not critical, but shuffle-only _MM_TRANSPOSE4_PS is optimal on some --#if defined(USE_INTRINSICS) && defined(_MM_TRANSPOSE4_PS) && !defined(__GNUC__) -+#if defined(USE_INTRINSICS) && (defined(_MM_TRANSPOSE4_PS) && !defined(__GNUC__) || defined(__clang__)) - register float4 row0=*(__m128 *)in; - register float4 row1=*(__m128 *)(in+xline); - register float4 row2=*(__m128 *)(in+2*xline); -@@ -273,7 +273,7 @@ inline void v_vsubTranspose4np(float *in - - // TODO: figure out why the intrinsic version crashes for MinGW build - // not critical, but the shuffle-only _MM_TRANSPOSE4_PS is optimal on some --#if defined(USE_INTRINSICS) && defined(_MM_TRANSPOSE4_PS) && !defined(__GNUC__) -+#if defined(USE_INTRINSICS) && (defined(_MM_TRANSPOSE4_PS) && !defined(__GNUC__) || defined(__clang__)) - register float4 row0=*(__m128 *)in; - register float4 row1=*(__m128 *)(in+xline); - register float4 row2=*(__m128 *)(in+2*xline); -@@ -1592,8 +1592,14 @@ inline float s_maxp2f( __m128 max1 ) { - return ( tMax ); - } - -+#ifdef __clang__ -+#define s_getU( aaaa, ptr ) \ -+ aaaa = _mm_loadl_pi(aaaa, (__m64 *)ptr); \ -+ aaaa = _mm_loadh_pi(aaaa, ((__m64 *)(ptr))+1 ) -+#else - #define s_getU( aaaa, ptr ) \ - aaaa = _mm_loadh_pi( _mm_loadl_pi(aaaa, (__m64 *)ptr), ((__m64 *)(ptr))+1 ) -+#endif - - #define s_putU( ptr, aaaa ) \ - _mm_storel_pi((__m64 *)ptr, aaaa), _mm_storeh_pi( ((__m64 *)ptr)+1 , aaaa) Index: astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__vector.cpp =================================================================== --- astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__vector.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- client/vector/analyzeFuncs_vector.cpp.orig 2011-08-04 00:35:40 UTC -+++ client/vector/analyzeFuncs_vector.cpp -@@ -98,9 +98,7 @@ - - - #ifndef __APPLE_CC__ --#ifdef HAVE___ISNAN --#define isnotnan(x) (!__isnan(x)) --#elif defined(HAVE__ISNAN) -+#if defined(HAVE__ISNAN) - #define isnotnan(x) (!_isnan(x)) - #elif defined(HAVE_ISNAN) - #define isnotnan(x) (!isnan(x)) Index: astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__x86__64.cpp =================================================================== --- astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__x86__64.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- client/vector/analyzeFuncs_x86_64.cpp.orig 2011-04-03 05:25:53 UTC -+++ client/vector/analyzeFuncs_x86_64.cpp -@@ -61,8 +61,14 @@ int v_vChirpData_x86_64( - static const int as [4] __attribute__((aligned(16)))= {INT_MIN, 0, INT_MIN, 0} ; // {-, +, -, +} - char *cblock = (char *)alloca(11*16); - cblock+=(16-((ssize_t)cblock % 16)); -+#ifdef __clang__ -+ __m128 *fblock=reinterpret_cast<__m128 *>(cblock); -+ __m128d *dblock=reinterpret_cast<__m128d *>(cblock); -+#else - x86_m128 *fblock=reinterpret_cast(cblock); - x86_m128d *dblock=reinterpret_cast(cblock); -+#endif -+ - #define CC dblock[0] - #define DD dblock[1] - #define cc fblock[2] Index: astro/boinc-setiathome-v7/files/patch-client_vector_x86__float4.h =================================================================== --- astro/boinc-setiathome-v7/files/patch-client_vector_x86__float4.h +++ /dev/null @@ -1,25 +0,0 @@ ---- client/vector/x86_float4.h.orig 2011-05-22 19:08:50 UTC -+++ client/vector/x86_float4.h -@@ -58,11 +58,15 @@ extern const_float4 INDGEN[2]; - - ALIGNED(static const int sign_bits[4],16)={INT_MIN, INT_MIN, INT_MIN, INT_MIN}; - ALIGNED(static const int other_bits[4],16)={INT_MAX, INT_MAX, INT_MAX, INT_MAX}; -+ -+#ifdef __clang__ -+#ifndef __EMMINTRIN_H -+typedef long long __m128i __attribute__((__vector_size__(16))); -+#endif -+#endif - #define SIGN_BITS (*(__m128i *)sign_bits) - #define OTHER_BITS (*(__m128i *)other_bits) - -- -- - struct float4 { - float4() {}; - float4(const __m128 b) { m=b; }; -@@ -263,4 +267,3 @@ struct const_float4 : public float4 { - - #endif - #endif -- Index: astro/boinc-setiathome-v7/files/patch-client_vector_x86__ops.h =================================================================== --- astro/boinc-setiathome-v7/files/patch-client_vector_x86__ops.h +++ /dev/null @@ -1,43 +0,0 @@ ---- client/vector/x86_ops.h.orig 2011-05-22 19:08:50 UTC -+++ client/vector/x86_ops.h -@@ -135,7 +135,11 @@ - - #if defined(__SSE2__) - // SSE2 specific functions/macros here. --#ifdef _MSC_VER -+#ifdef __clang__ -+#ifndef __EMMINTRIN_H -+#include -+#endif -+#elif defined _MSC_VER - typedef __m128d x86_m128d; - #else - typedef double x86_m128d __attribute__ ((mode(V2DF))) __attribute__((aligned(16))); -@@ -144,7 +148,11 @@ typedef double x86_m128d __attribute__ ( - - #if defined(__SSE__) - // SSE specific functions/macros here. --#ifdef _MSC_VER -+#ifdef __clang__ -+#ifndef __XMMINTRIN_H -+#include -+#endif -+#elif defined _MSC_VER - typedef __m128 x86_m128; - typedef __m128i x86_m128i; - #else -@@ -186,6 +194,7 @@ static inline void prefetchnta(const voi - - #endif - -+#ifndef __clang__ - #ifndef __m128d - #define __m128d x86_m128d - #endif -@@ -197,5 +206,6 @@ static inline void prefetchnta(const voi - #ifndef __m128 - #define __m128 x86_m128 - #endif -+#endif - - #endif Index: astro/boinc-setiathome-v7/files/patch-configure.ac =================================================================== --- astro/boinc-setiathome-v7/files/patch-configure.ac +++ /dev/null @@ -1,32 +0,0 @@ ---- configure.ac.orig 2013-07-02 20:51:54 UTC -+++ configure.ac -@@ -5,17 +5,10 @@ - - AC_PREREQ(2.57) - AC_INIT(setiathome_v7, 7.00, korpela@ssl.berkeley.edu) --svnrev="`svn info | grep Revision:`" - --if test -n "${svnrev}" ; then -- AC_REVISION("${svnrev}") -- AC_DEFINE_UNQUOTED(SVN_REV,"${svnrev}", -- [Define to be the subversion revision number]) --else -- AC_REVISION([$Revision: 1146 $]) -- AC_DEFINE(SVN_REV,"$Revision: 1146 $", -- [Define to be the subversion revision number]) --fi -+AC_REVISION([$Revision: 1924 $]) -+AC_DEFINE(SVN_REV,"$Revision: 1924 $", -+ [Define to be the subversion revision number]) - - AC_CANONICAL_TARGET - AM_INIT_AUTOMAKE(dist-zip) -@@ -55,8 +48,6 @@ if test -z "`echo ${LDFLAGS} | grep ${tm - fi - - # set posix source on linux --CFLAGS="-D_POSIX_C_SOURCE=1 ${CFLAGS}" --CXXFLAGS="-D_POSIX_C_SOURCE=1 ${CXXFLAGS}" - - AC_ARG_ENABLE(intrinsics, - AS_HELP_STRING([--disable-intrinsics], Index: astro/boinc-setiathome-v7/files/patch-m4_sah__check__boinc.m4 =================================================================== --- astro/boinc-setiathome-v7/files/patch-m4_sah__check__boinc.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- m4/sah_check_boinc.m4.orig 2008-09-09 16:55:19 UTC -+++ m4/sah_check_boinc.m4 -@@ -30,7 +30,7 @@ AC_DEFUN([SAH_CHECK_BOINC],[ - cd $thisdir - break - else -- if $FIND $boinc_dir -name "std_fixes.h" >& /dev/null -+ if $FIND $boinc_dir -name "std_fixes.h" > /dev/null - then - BOINCDIR=`$FIND $boinc_dir -name "std_fixes.h" -print | $HEAD -1 | sed 's/\/std_fixes.h//'` - cd $BOINCDIR/.. Index: astro/boinc-setiathome-v7/files/patch-sah__config.h =================================================================== --- astro/boinc-setiathome-v7/files/patch-sah__config.h +++ /dev/null @@ -1,11 +0,0 @@ ---- sah_config.h.orig 2012-09-18 22:45:14 UTC -+++ sah_config.h -@@ -21,7 +21,7 @@ - #define AVX_MASKSTORE_TYPECAST(x) reinterpret_cast<__m256i>(x) - - /* Define to 1 to build a graphical application */ --#define BOINC_APP_GRAPHICS 1 -+/* #undef BOINC_APP_GRAPHICS */ - - /* Define to a string identifying your compiler */ - #define COMPILER_STRING "g++ (GCC) 4.4.6 20110731 (Red Hat 4.4.6-3)" Index: astro/boinc-setiathome-v7/files/pkg-deinstall.in =================================================================== --- astro/boinc-setiathome-v7/files/pkg-deinstall.in +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -if [ "$2" != "POST-DEINSTALL" ]; then - exit 0 -fi - -F=%%BOINC_CLIENT_HOME%%/projects/%%SETI_SITE%%/app_info.xml -echo Removing setiathome_v7 lines from $F - -l=`grep -n "setiathome_v7" $F | cut -f 1 -d :` -if [ $? -ne 0 ]; then - echo $F is corrupt - exit 1 -fi -l1=$(($l-1)) -l2=$(($l+13)) -sed -i.bak "${l1},${l2}d" $F # sed wants the braces -rm $F.bak - -l=`wc -l $F | cut -f 1 -d / | sed 's/ //g'` -if [ $l -eq 2 ]; then - echo Removing empty $F - rm $F -fi Index: astro/boinc-setiathome-v7/files/pkg-install.in =================================================================== --- astro/boinc-setiathome-v7/files/pkg-install.in +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -if [ "$2" != "POST-INSTALL" ]; then - exit 0 -fi - -F=%%BOINC_CLIENT_HOME%%/projects/%%SETI_SITE%%/app_info.xml - -if [ ! -f $F ]; then - echo Creating new $F - echo "" > $F - echo "" >> $F - chown %%BOINC_CLIENT_USER%%:%%BOINC_CLIENT_GROUP%% $F -fi - -echo Adding setiathome_v7 lines to $F -ed - $F < -setiathome_v7 - - -%%SETI_BINARY%% - - - -setiathome_v7 -%%SETI_VERSION%% - -%%SETI_BINARY%% - - - -. -w -q -EOF Index: astro/boinc-setiathome-v7/files/pkg-message.in =================================================================== --- astro/boinc-setiathome-v7/files/pkg-message.in +++ /dev/null @@ -1,16 +0,0 @@ -***************************************************************************** -ATTACHING PROJECT - -Just run boinc_gui (if installed), choose Attach, and follow instructions. -Project URL is %%SETI_SITE%% - -MANUAL INSTALLATION - *) If this is your first time in any BOINC project, create a new account at - http://%%SETI_SITE%%/create_account_form.php - - *) Or get your account key at http://%%SETI_SITE%%/get_passwd.php - - *) Attach to the project: - cd %%BOINC_CLIENT_HOME%% - boinccmd --project_attach %%SETI_SITE%% -***************************************************************************** Index: astro/boinc-setiathome-v7/pkg-descr =================================================================== --- astro/boinc-setiathome-v7/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -SETI - Search for Extra-Terrestrial Intelligence -- Version 7 - -Use your unused CPU cycles to aid in computations analyzing radio -telescope information for possible signs of extra-terrestrial intelligence. - -The port automatically optimizes for the host CPU using the CPUTYPE -variable in /etc/make.conf - -WWW: http://setiathome.berkeley.edu/ Index: astro/boinc-setiathome-v7/pkg-plist =================================================================== --- astro/boinc-setiathome-v7/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -@owner %%BOINC_CLIENT_USER%% -@group %%BOINC_CLIENT_GROUP%% -@dir %%BOINC_CLIENT_HOME%% -@dir %%BOINC_CLIENT_HOME%%/projects/ -@dir %%BOINC_CLIENT_HOME%%/projects/%%SETI_SITE%% -%%BOINC_CLIENT_HOME%%/projects/%%SETI_SITE%%/%%SETI_BINARY%% -%%X11%%%%BOINC_CLIENT_HOME%%/projects/%%SETI_SITE%%/seti_graphics -@owner root -@group wheel Index: sysutils/rundeck/Makefile =================================================================== --- sysutils/rundeck/Makefile +++ sysutils/rundeck/Makefile @@ -2,6 +2,7 @@ PORTNAME= rundeck PORTVERSION= 2.3.2 +PORTREVISION= 1 CATEGORIES= sysutils java MASTER_SITES= http://dl.bintray.com/rundeck/rundeck-maven/ DISTNAME= rundeck-launcher-${PORTVERSION} @@ -15,10 +16,10 @@ USE_JAVA= yes JAVA_VERSION= 1.6+ +NO_ARCH= yes NO_BUILD= yes -PLIST_FILES= rundeck/server/lib/.keep \ - share/rundeck/rundeck-launcher.jar +PLIST_SUB= RUNDECK_USER=${RUNDECK_USER} RUNDECK_GROUP=${RUNDECK_GROUP} USE_RC_SUBR= rundeck RUNDECK_HOME= ${PREFIX}/rundeck Index: sysutils/rundeck/pkg-plist =================================================================== --- /dev/null +++ sysutils/rundeck/pkg-plist @@ -0,0 +1,4 @@ +@dir(%%RUNDECK_USER%%,%%RUNDESK_GROUP%%,755) rundeck/server +@dir(%%RUNDECK_USER%%,%%RUNDESK_GROUP%%,755) rundeck/server/lib +rundeck/server/lib/.keep +%%DATADIR%%/rundeck-launcher.jar