Date: Thu, 11 Dec 2014 05:49:41 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374512 - in head: . sysutils sysutils/boxbackup sysutils/boxbackup-devel sysutils/boxbackup-devel/files Message-ID: <201412110549.sBB5nf5o082891@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Thu Dec 11 05:49:41 2014 New Revision: 374512 URL: https://svnweb.freebsd.org/changeset/ports/374512 QAT: https://qat.redports.org/buildarchive/r374512/ Log: Revive ports: sysutils/boxbackup, sysutils/boxbackup-devel - revived - stage support added - compilation issues fixed PR: 194223 Submitted by: Hrant Dadivanyan <hrant@dadivanyan.net>, Chris Hutchinson <portmaster@bsdforge.com> Added: head/sysutils/boxbackup/ - copied from r366684, head/sysutils/boxbackup/ head/sysutils/boxbackup-devel/ - copied from r366684, head/sysutils/boxbackup-devel/ head/sysutils/boxbackup-devel/files/patch-infrastructure_BoxPlatform.pm.in (contents, props changed) head/sysutils/boxbackup-devel/files/patch-qdbm_Makefile.in (contents, props changed) head/sysutils/boxbackup-devel/files/patch-qdbm_config.status (contents, props changed) head/sysutils/boxbackup-devel/files/patch-qdbm_configure (contents, props changed) head/sysutils/boxbackup-devel/files/patch-qdbm_configure.in (contents, props changed) Modified: head/MOVED head/sysutils/Makefile head/sysutils/boxbackup-devel/Makefile head/sysutils/boxbackup-devel/pkg-plist head/sysutils/boxbackup/Makefile head/sysutils/boxbackup/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Thu Dec 11 05:26:39 2014 (r374511) +++ head/MOVED Thu Dec 11 05:49:41 2014 (r374512) @@ -6871,7 +6871,6 @@ security/tinysu||2014-09-01|Not staged sysutils/asapm||2014-09-01|Not staged sysutils/asr-utils||2014-09-01|Not staged sysutils/be_agent||2014-09-01|Not staged -sysutils/boxbackup-devel||2014-09-01|Not staged sysutils/bubblemon-dockapp||2014-09-01|Not staged sysutils/clockspeed-conf||2014-09-01|Not staged sysutils/comconsole||2014-09-01|Not staged @@ -6969,7 +6968,6 @@ devel/scsh-install-lib||2014-09-01|Not s games/qix||2014-09-01|Not staged games/vdrift||2014-09-01|Not staged net-mgmt/zenpack-graphportlet||2014-09-01|Not staged -sysutils/boxbackup||2014-09-01|Not staged www/webcalendar-devel|www/webcalendar|2014-09-04|Removed, use www/webcalendar instead devel/ruby-memoize||2014-09-06|Has expired: RubyForge shutdown May 15 2014 www/oops||2014-09-06|Development stops long ago, domain has been expired Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Thu Dec 11 05:26:39 2014 (r374511) +++ head/sysutils/Makefile Thu Dec 11 05:49:41 2014 (r374512) @@ -79,6 +79,8 @@ SUBDIR += bkpupsd SUBDIR += bksh SUBDIR += bontmia + SUBDIR += boxbackup + SUBDIR += boxbackup-devel SUBDIR += brasero SUBDIR += brebis SUBDIR += bsd-splash-changer Modified: head/sysutils/boxbackup-devel/Makefile ============================================================================== --- head/sysutils/boxbackup-devel/Makefile Sat Aug 30 21:49:21 2014 (r366684) +++ head/sysutils/boxbackup-devel/Makefile Thu Dec 11 05:49:41 2014 (r374512) @@ -8,10 +8,10 @@ MASTER_SITES= http://www.boxbackup.org/s PKGNAMESUFFIX= ${CLIENT_OR_SERVER}-devel DISTNAME= ${PORTNAME}-${SVNVERSION} -MAINTAINER= ports@FreeBSD.org -COMMENT= Open source, completely automatic on-line backup system for Unix +MAINTAINER= portmaster@BSDforge.com +COMMENT= Open source, completely automatic on-line backup system for UNIX -LICENSE= BSD GPLv2 +LICENSE= BSD3CLAUSE GPLv2 LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE-DUAL.txt @@ -26,8 +26,6 @@ GNU_CONFIGURE= yes USE_AUTOTOOLS= autoconf aclocal autoheader ACLOCAL_ARGS+= -I ${WRKSRC}/infrastructure/m4 -# Box now defaults to /etc for configuration. Linux devs make me sad. -# Override this. CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc PKGMESSAGE= ${WRKDIR}/pkg-message @@ -40,24 +38,24 @@ CLIENT_DESC= Install the bbackupd clien SERVER_DESC= Install the bbstored server GNUREADLINE_DESC= Enable the use of GNU readline -NO_STAGE= yes - MAKE_JOBS_UNSAFE= yes .include <bsd.port.options.mk> +CLIENTDIR= CLIENT +SERVERDIR= SERVER +CLIENT_FILES= bbackupd bbackupquery bbackupctl +SERVER_FILES= bbstored bbstoreaccounts + .if ${PORT_OPTIONS:MGNUREADLINE} CONFIGURE_ARGS+=--enable-gnu-readline .endif -MANCOMPRESSED= yes .if ${PORT_OPTIONS:MCLIENT} USE_RC_SUBR+= bbackupd PLIST_SUB+= CLIENT="" ALL_TARGET+= build-backup-client -INSTALL_TARGET+=install-backup-client -MAN5+= bbackupd.conf.5 -MAN8+= bbackupd.8 bbackupctl.8 bbackupd-config.8 bbackupquery.8 +CLIENT_SCRIPTS= bbackupd-config SUB_FILES+= 999.boxbackup .else PLIST_SUB+= CLIENT="@comment " @@ -69,24 +67,18 @@ USERS+= _bbstored GROUPS+= _bbstored PLIST_SUB+= SERVER="" ALL_TARGET+= build-backup-server -INSTALL_TARGET+=install-backup-server -MAN5+= bbstored.conf.5 raidfile.conf.5 -MAN8+= bbstored.8 bbstoreaccounts.8 bbstored-certs.8 bbstored-config.8 raidfile-config.8 +SERVER_SCRIPTS= bbstored-certs bbstored-config raidfile-config .else PLIST_SUB+= SERVER="@comment " .endif .if ! ${PORT_OPTIONS:MCLIENT} -# if this is a server-only install, CONFLICT with an install of the CLIENT or both CONFLICTS= boxbackup-client-[0-9]* boxbackup-[0-9]* CLIENT_OR_SERVER=-server .elif ! ${PORT_OPTIONS:MSERVER} -# if this is a client-only install, CONFLICT with an install of the SERVER or both CONFLICTS= boxbackup-server-[0-9]* boxbackup-[0-9]* CLIENT_OR_SERVER=-client .else -# if we install boxbackup-[0-9]*, we should CONFLICT with a CLIENT or SERVER only install -# PKGNAMESUFFIX is empty at this point CONFLICTS= boxbackup-server-[0-9]* boxbackup-client-[0-9]* .endif @@ -101,15 +93,54 @@ post-patch: post-configure: @${REINPLACE_CMD} -e '/share.doc.boxbackup/d' ${WRKSRC}/parcels/scripts/install-backup-* +pre-install: + (cd ${WRKSRC}/parcels \ + && ${MV} ./boxbackup-0.11_trunk_2979-backup-client ../CLIENT) + + (cd ${WRKSRC}/parcels \ + && ${MV} ./boxbackup-0.11_trunk_2979-backup-server ../SERVER) +do-install: +.if ${PORT_OPTIONS:MCLIENT} + (cd ${WRKSRC}/${CLIENTDIR}/ \ + && ${INSTALL_PROGRAM} ${CLIENT_FILES} ${STAGEDIR}${PREFIX}/sbin/) + + (cd ${WRKSRC}/${CLIENTDIR}/ \ + && ${INSTALL_SCRIPT} ${CLIENT_SCRIPTS} ${STAGEDIR}${PREFIX}/sbin/) + + ${INSTALL_MAN} ${WRKSRC}/${CLIENTDIR}/bbackupd.conf.5.gz \ + ${STAGEDIR}${PREFIX}/man/man5/ + ${INSTALL_MAN} ${WRKSRC}/${CLIENTDIR}/bbackupctl.8.gz \ + ${WRKSRC}/${CLIENTDIR}/bbackupd-config.8.gz \ + ${WRKSRC}/${CLIENTDIR}/bbackupd.8.gz ${WRKSRC}/${CLIENTDIR}/bbackupquery.8.gz \ + ${STAGEDIR}${PREFIX}/man/man8/ +.endif +.if ${PORT_OPTIONS:MSERVER} + (cd ${WRKSRC}/${SERVERDIR}/ \ + && ${INSTALL_PROGRAM} ${SERVER_FILES} ${STAGEDIR}${PREFIX}/sbin/) + + (cd ${WRKSRC}/${SERVERDIR}/ \ + && ${INSTALL_SCRIPT} ${SERVER_SCRIPTS} ${STAGEDIR}${PREFIX}/sbin/) + + ${INSTALL_MAN} ${WRKSRC}/${SERVERDIR}/raidfile.conf.5.gz \ + ${WRKSRC}/${SERVERDIR}/bbstored.conf.5.gz \ + ${STAGEDIR}${PREFIX}/man/man5/ + + ${INSTALL_MAN} ${WRKSRC}/${SERVERDIR}/bbstoreaccounts.8.gz \ + ${WRKSRC}/${SERVERDIR}/bbstored-certs.8.gz \ + ${WRKSRC}/${SERVERDIR}/bbstored-config.8.gz \ + ${WRKSRC}/${SERVERDIR}/bbstored.8.gz \ + ${WRKSRC}/${SERVERDIR}/raidfile-config.8.gz \ + ${STAGEDIR}${PREFIX}/man/man8/ +.endif post-install: .if ${PORT_OPTIONS:MCLIENT} - @${MKDIR} -m 0700 ${PREFIX}/etc/box/bbackupd - @${MKDIR} ${PREFIX}/etc/periodic/monthly - ${INSTALL_SCRIPT} ${WRKDIR}/999.boxbackup ${PREFIX}/etc/periodic/monthly + @${MKDIR} -m 0700 ${STAGEDIR}${PREFIX}/etc/box/bbackupd + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/monthly + ${INSTALL_SCRIPT} ${WRKDIR}/999.boxbackup ${STAGEDIR}${PREFIX}/etc/periodic/monthly .endif .if ${PORT_OPTIONS:MSERVER} - @${MKDIR} -m 0700 ${PREFIX}/etc/box/bbstored + @${MKDIR} -m 0700 ${STAGEDIR}${PREFIX}/etc/box/bbstored .endif @${CAT} ${PKGMESSAGE} Added: head/sysutils/boxbackup-devel/files/patch-infrastructure_BoxPlatform.pm.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/boxbackup-devel/files/patch-infrastructure_BoxPlatform.pm.in Thu Dec 11 05:49:41 2014 (r374512) @@ -0,0 +1,11 @@ +--- infrastructure/BoxPlatform.pm.in.orig 2014-10-19 13:20:18.000000000 -0700 ++++ infrastructure/BoxPlatform.pm.in 2014-10-19 13:22:48.000000000 -0700 +@@ -128,7 +128,7 @@ + sub parcel_root + { + my $tos = $_[1] || $target_os; +- return $product_name.'-'.$product_version.'-'.$_[0].'-'.$tos; ++ return $product_name.'-'.$product_version.'-'.$_[0]; + } + + sub parcel_dir Added: head/sysutils/boxbackup-devel/files/patch-qdbm_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/boxbackup-devel/files/patch-qdbm_Makefile.in Thu Dec 11 05:49:41 2014 (r374512) @@ -0,0 +1,11 @@ +--- qdbm/Makefile.in.orig 2014-10-15 08:11:25.000000000 -0700 ++++ qdbm/Makefile.in 2014-10-15 08:17:54.000000000 -0700 +@@ -56,7 +56,7 @@ + -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \ + -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \ + -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG +-CFLAGS = @CFLAGS@ -Wall -pedantic -fPIC -fsigned-char -O0 -fforce-addr @MYOPTS@ ++CFLAGS = @CFLAGS@ -Wall -pedantic -fPIC -fsigned-char -O0 @MYOPTS@ + LD = @LD@ + LIBS = -lqdbm @LIBS@ + LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@ Added: head/sysutils/boxbackup-devel/files/patch-qdbm_config.status ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/boxbackup-devel/files/patch-qdbm_config.status Thu Dec 11 05:49:41 2014 (r374512) @@ -0,0 +1,11 @@ +--- qdbm/config.status.orig 2014-10-15 08:47:14.000000000 -0700 ++++ qdbm/config.status 2014-10-15 08:47:31.000000000 -0700 +@@ -475,7 +475,7 @@ + s,@LIBREV@,13,;t t + s,@TARGETS@,all,;t t + s,@MYDEFS@,,;t t +-s,@MYOPTS@,-O1 -fno-omit-frame-pointer -fno-force-addr,;t t ++s,@MYOPTS@,-O1 -fno-omit-frame-pointer,;t t + s,@MGWLIBS@,,;t t + s,@LD@,/usr/bin/ld,;t t + s,@AR@,/usr/bin/ar,;t t Added: head/sysutils/boxbackup-devel/files/patch-qdbm_configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/boxbackup-devel/files/patch-qdbm_configure Thu Dec 11 05:49:41 2014 (r374512) @@ -0,0 +1,21 @@ +--- qdbm/configure.orig 2014-10-15 08:47:58.000000000 -0700 ++++ qdbm/configure 2014-10-15 08:48:38.000000000 -0700 +@@ -2401,15 +2401,15 @@ + fi + if uname | egrep -i 'SunOS' > /dev/null 2>&1 + then +- MYOPTS="-O1 -fno-omit-frame-pointer -fno-force-addr" ++ MYOPTS="-O1 -fno-omit-frame-pointer" + fi + if uname | egrep -i 'BSD' > /dev/null 2>&1 + then +- MYOPTS="-O1 -fno-omit-frame-pointer -fno-force-addr" ++ MYOPTS="-O1 -fno-omit-frame-pointer" + fi + if gcc --version | egrep -i '^2\.(8|9)' > /dev/null 2>&1 + then +- MYOPTS="-O1 -fno-omit-frame-pointer -fno-force-addr" ++ MYOPTS="-O1 -fno-omit-frame-pointer" + fi + + # Linker Added: head/sysutils/boxbackup-devel/files/patch-qdbm_configure.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/boxbackup-devel/files/patch-qdbm_configure.in Thu Dec 11 05:49:41 2014 (r374512) @@ -0,0 +1,21 @@ +--- qdbm/configure.in.orig 2014-10-15 08:35:05.000000000 -0700 ++++ qdbm/configure.in 2014-10-15 08:35:41.000000000 -0700 +@@ -180,15 +180,15 @@ + fi + if uname | egrep -i 'SunOS' > /dev/null 2>&1 + then +- MYOPTS="-O1 -fno-omit-frame-pointer -fno-force-addr" ++ MYOPTS="-O1 -fno-omit-frame-pointer" + fi + if uname | egrep -i 'BSD' > /dev/null 2>&1 + then +- MYOPTS="-O1 -fno-omit-frame-pointer -fno-force-addr" ++ MYOPTS="-O1 -fno-omit-frame-pointer" + fi + if gcc --version | egrep -i '^2\.(8|9)' > /dev/null 2>&1 + then +- MYOPTS="-O1 -fno-omit-frame-pointer -fno-force-addr" ++ MYOPTS="-O1 -fno-omit-frame-pointer" + fi + + # Linker Modified: head/sysutils/boxbackup-devel/pkg-plist ============================================================================== --- head/sysutils/boxbackup-devel/pkg-plist Sat Aug 30 21:49:21 2014 (r366684) +++ head/sysutils/boxbackup-devel/pkg-plist Thu Dec 11 05:49:41 2014 (r374512) @@ -7,11 +7,19 @@ %%SERVER%%sbin/bbstored-certs %%SERVER%%sbin/bbstored-config %%SERVER%%sbin/raidfile-config -%%CLIENT%%@exec mkdir -p -m 0700 %D/etc/box/bbackupd -%%SERVER%%@exec mkdir -p -m 0700 %D/etc/box/bbstored -%%CLIENT%%@dirrmtry etc/box/bbackupd -%%SERVER%%@dirrmtry etc/box/bbstored +%%CLIENT%%man/man5/bbackupd.conf.5.gz +%%SERVER%%man/man5/bbstored.conf.5.gz +%%SERVER%%man/man5/raidfile.conf.5.gz +%%SERVER%%man/man8/bbstored.8.gz +%%SERVER%%man/man8/bbstoreaccounts.8.gz +%%SERVER%%man/man8/bbstored-certs.8.gz +%%SERVER%%man/man8/bbstored-config.8.gz +%%SERVER%%man/man8/raidfile-config.8.gz +%%CLIENT%%man/man8/bbackupd.8.gz +%%CLIENT%%man/man8/bbackupctl.8.gz +%%CLIENT%%man/man8/bbackupd-config.8.gz +%%CLIENT%%man/man8/bbackupquery.8.gz %%CLIENT%%etc/periodic/monthly/999.boxbackup -@dirrmtry etc/periodic/monthly -@dirrmtry etc/periodic -@dirrmtry etc/box +@mode 0077 +%%CLIENT%%@dir etc/box/bbackupd +%%SERVER%%@dir etc/box/bbstored Modified: head/sysutils/boxbackup/Makefile ============================================================================== --- head/sysutils/boxbackup/Makefile Sat Aug 30 21:49:21 2014 (r366684) +++ head/sysutils/boxbackup/Makefile Thu Dec 11 05:49:41 2014 (r374512) @@ -11,7 +11,7 @@ PKGNAMESUFFIX= ${CLIENT_OR_SERVER} MAINTAINER= ports@FreeBSD.org COMMENT= Open source, completely automatic on-line backup system for Unix -LICENSE= BSD GPLv2 +LICENSE= BSD3CLAUSE GPLv2 LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE-DUAL.txt @@ -21,6 +21,7 @@ GNU_CONFIGURE= yes USE_AUTOTOOLS= autoconf aclocal autoheader ACLOCAL_ARGS+= -I ${WRKSRC}/infrastructure/m4 + MAKE_JOBS_UNSAFE=yes CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc @@ -37,9 +38,17 @@ SERVER_DESC= Install the bbstored server OPTIONS_DEFAULT=CLIENT SERVER -NO_STAGE= yes .include <bsd.port.options.mk> +.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1000000 +USES+= execinfo +LDFLAGS+= -lexecinfo +.endif + +.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000000 && ${OSVERSION} > 900000 +USE_GCC= yes +.endif + .if ${PORT_OPTIONS:MREADLINE} CONFIGURE_ARGS+=--enable-gnu-readline .endif @@ -51,8 +60,6 @@ PLIST_SUB+= CLIENT="" SUB_LIST+= CLIENT="" ALL_TARGET+= build-backup-client INSTALL_TARGET+=install-backup-client -MAN5+= bbackupd.conf.5 -MAN8+= bbackupd.8 bbackupctl.8 bbackupd-config.8 bbackupquery.8 SUB_FILES+= 999.boxbackup .else PLIST_SUB+= CLIENT="@comment " @@ -67,8 +74,6 @@ PLIST_SUB+= SERVER="" SUB_LIST+= SERVER="" ALL_TARGET+= build-backup-server INSTALL_TARGET+=install-backup-server -MAN5+= bbstored.conf.5 raidfile.conf.5 -MAN8+= bbstored.8 bbstoreaccounts.8 bbstored-certs.8 bbstored-config.8 raidfile-config.8 .else PLIST_SUB+= SERVER="@comment " SUB_LIST+= SERVER="@comment " @@ -97,12 +102,12 @@ post-configure: post-install: .if ${PORT_OPTIONS:MCLIENT} - @${MKDIR} -m 0700 ${PREFIX}/etc/boxbackup/bbackupd - @${MKDIR} ${PREFIX}/etc/periodic/monthly - ${INSTALL_SCRIPT} ${WRKDIR}/999.boxbackup ${PREFIX}/etc/periodic/monthly + @${MKDIR} -m 0700 ${STAGEDIR}/${PREFIX}/etc/boxbackup/bbackupd + @${MKDIR} ${STAGEDIR}/${PREFIX}/etc/periodic/monthly + ${INSTALL_SCRIPT} ${WRKDIR}/999.boxbackup ${STAGEDIR}/${PREFIX}/etc/periodic/monthly .endif .if ${PORT_OPTIONS:MSERVER} - @${MKDIR} -m 0700 ${PREFIX}/etc/boxbackup/bbstored + @${MKDIR} -m 0700 ${STAGEDIR}/${PREFIX}/etc/boxbackup/bbstored .endif @${CAT} ${PKGMESSAGE} Modified: head/sysutils/boxbackup/pkg-plist ============================================================================== --- head/sysutils/boxbackup/pkg-plist Sat Aug 30 21:49:21 2014 (r366684) +++ head/sysutils/boxbackup/pkg-plist Thu Dec 11 05:49:41 2014 (r374512) @@ -7,11 +7,19 @@ %%SERVER%%sbin/bbstored-certs %%SERVER%%sbin/bbstored-config %%SERVER%%sbin/raidfile-config -%%CLIENT%%@exec mkdir -p -m 0700 %D/etc/boxbackup/bbackupd -%%SERVER%%@exec mkdir -p -m 0700 %D/etc/boxbackup/bbstored -%%CLIENT%%@dirrmtry etc/boxbackup/bbackupd -%%SERVER%%@dirrmtry etc/boxbackup/bbstored +%%CLIENT%%man/man5/bbackupd.conf.5.gz +%%SERVER%%man/man5/bbstored.conf.5.gz +%%SERVER%%man/man5/raidfile.conf.5.gz +%%SERVER%%man/man8/bbstored.8.gz +%%SERVER%%man/man8/bbstoreaccounts.8.gz +%%SERVER%%man/man8/bbstored-certs.8.gz +%%SERVER%%man/man8/bbstored-config.8.gz +%%SERVER%%man/man8/raidfile-config.8.gz +%%CLIENT%%man/man8/bbackupd.8.gz +%%CLIENT%%man/man8/bbackupctl.8.gz +%%CLIENT%%man/man8/bbackupd-config.8.gz +%%CLIENT%%man/man8/bbackupquery.8.gz etc/periodic/monthly/999.boxbackup -@dirrmtry etc/periodic/monthly -@dirrmtry etc/periodic -@dirrmtry etc/boxbackup +@mode 0077 +%%CLIENT%%@dir etc/boxbackup/bbackupd +%%SERVER%%@dir etc/boxbackup/bbstored
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412110549.sBB5nf5o082891>