Date: Tue, 02 May 2006 23:21:03 +0100 From: "James O'Gorman" <james@netinertia.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/96692: [Maintainer] Update sysutils/boxbackup - add autoconf patches Message-ID: <E1Fb3Et-0009Zw-Nz@starbug.netinertia.co.uk> Resent-Message-ID: <200605022220.k42MKIGt093012@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 96692
>Category: ports
>Synopsis: [Maintainer] Update sysutils/boxbackup - add autoconf patches
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue May 02 22:20:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: James O'Gorman
>Release: FreeBSD 6.0-RELEASE-p4 i386
>Organization:
>Environment:
System: FreeBSD starbug.netinertia.co.uk 6.0-RELEASE-p4 FreeBSD 6.0-RELEASE-p4 #5: Thu Feb 16 20:57:38 GMT 2006 root@starbug.netinertia.co.uk:/usr/obj/usr/src/sys/STARBUG i386
>Description:
Add back the Autoconf patches that the previous committer removed from my update without my consent (see ports/94752)
Also undo the unnecessary whitespace changes and fix to allow GCC 2.95+
>How-To-Repeat:
>Fix:
--- boxbackup.diff begins here ---
diff -urN boxbackup.old/Makefile boxbackup/Makefile
--- boxbackup.old/Makefile Tue May 2 23:07:46 2006
+++ boxbackup/Makefile Tue May 2 23:07:33 2006
@@ -8,7 +8,7 @@
PORTVERSION= 0.10
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITE_SUBDIR=${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= james@netinertia.co.uk
@@ -17,7 +17,9 @@
USE_OPENSSL= yes
GNU_CONFIGURE= yes
USE_PERL5= yes
-USE_GCC= 3.2+
+USE_GCC= 2.95+
+USE_AUTOTOOLS= autoconf:259 aclocal:19 autoheader:259
+ACLOCAL_ARGS+= -I ${WRKSRC}/infrastructure/m4
PKGMESSAGE= ${WRKDIR}/pkg-message
@@ -31,30 +33,31 @@
TARGETOS!= ${ECHO_CMD} `${UNAME} -s``${UNAME} -r | ${SED} -e 's/[-(].*//'` | ${TR} A-Z a-z
.if defined(WITH_GNUREADLINE)
-CONFIGURE_ARGS+= --enable-gnu-readline
-NO_PACKAGE= GNU GPL prevents distributing binaries linked against GNU readline
+CONFIGURE_ARGS+=--enable-gnu-readline
+NO_PACKAGE= GNU GPL prevents distributing binaries linked against GNU readline
.endif
.if defined(WITHOUT_CLIENT) && defined(WITHOUT_SERVER)
-IGNORE= requires at least CLIENT or SERVER to be defined. Please run 'make config' again
+IGNORE= requires at least CLIENT or SERVER to be defined.\
+ Please \`make config\` again
.endif
.if defined(WITHOUT_CLIENT)
-PLIST_SUB+= CLIENT="@comment "
+PLIST_SUB+= CLIENT="@comment "
.else
-USE_RC_SUBR+= bbackupd.sh
-PLIST_SUB+= CLIENT=""
-ALL_TARGET+= parcels/${DISTNAME}-backup-client-${TARGETOS}.tgz
-INSTALL_TARGET+= install-backup-client
+USE_RC_SUBR+= bbackupd.sh
+PLIST_SUB+= CLIENT=""
+ALL_TARGET+= parcels/${DISTNAME}-backup-client-${TARGETOS}.tgz
+INSTALL_TARGET+=install-backup-client
.endif
.if defined(WITHOUT_SERVER)
-PLIST_SUB+= SERVER="@comment "
+PLIST_SUB+= SERVER="@comment "
.else
-USE_RC_SUBR+= bbstored.sh
-PLIST_SUB+= SERVER=""
-ALL_TARGET+= parcels/${DISTNAME}-backup-server-${TARGETOS}.tgz
-INSTALL_TARGET+= install-backup-server
+USE_RC_SUBR+= bbstored.sh
+PLIST_SUB+= SERVER=""
+ALL_TARGET+= parcels/${DISTNAME}-backup-server-${TARGETOS}.tgz
+INSTALL_TARGET+=install-backup-server
.endif
CONFLICTS= boxbackup-server-[0-9]* boxbackup-client-[0-9]*
@@ -86,7 +89,7 @@
@${REINPLACE_CMD} -e 's,"perl ,PERL_EXECUTABLE " ,g' \
${WRKSRC}/test/backupstorefix/testbackupstorefix.cpp
# Fix hard-coded g++
- @${REINPLACE_CMD} -e "s|g++|${CXX}|"\
+ @${REINPLACE_CMD} -e 's,g++,${CXX},' \
${WRKSRC}/infrastructure/makebuildenv.pl
.if !defined(WITHOUT_CLIENT)
@${CAT} ${FILESDIR}/pkg-message.client >> ${PKGMESSAGE}
@@ -95,8 +98,8 @@
@${CAT} ${FILESDIR}/pkg-message.server >> ${PKGMESSAGE}
.endif
-pre-install:
.if !defined(WITHOUT_SERVER)
+pre-install:
@${SETENV} PKG_PREFIX=${PREFIX} \
${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
.endif
@@ -110,8 +113,8 @@
.endif
@${CAT} ${PKGMESSAGE}
-test:
.if defined(WITH_TESTS)
+test:
@${ECHO_CMD} "===> Running tests"
@${MAKE} -C ${WRKSRC} test
.endif
diff -urN boxbackup.old/files/patch-configure.ac boxbackup/files/patch-configure.ac
--- boxbackup.old/files/patch-configure.ac Thu Jan 1 01:00:00 1970
+++ boxbackup/files/patch-configure.ac Mon Mar 20 21:29:34 2006
@@ -0,0 +1,35 @@
+--- configure.ac.orig Thu Mar 16 22:26:39 2006
++++ configure.ac Thu Mar 16 22:28:31 2006
+@@ -2,7 +2,7 @@
+ # Process this file with autoconf to produce a configure script.
+
+ AC_PREREQ(2.59)
+-AC_INIT([Box Backup], 0.09, [box@fluffy.co.uk])
++AC_INIT([Box Backup], 0.10, [box@fluffy.co.uk])
+ AC_CONFIG_SRCDIR([lib/common/Box.h])
+ AC_CONFIG_HEADERS([lib/common/BoxConfig.h])
+
+@@ -26,6 +26,12 @@
+ # Use -rdynamic if we have gcc. This is needed for backtrace
+ AC_SUBST([LDADD_RDYNAMIC], ['-rdynamic'])
+ fi
++AC_PATH_PROG([PERL], [perl], [no])
++if test "x$PERL" != "xno"; then
++ AC_DEFINE_UNQUOTED([PERL_EXECUTABLE], ["$PERL"], [Location of the perl executable])
++else
++ AC_MSG_ERROR([[perl executable was not found]])
++fi
+
+
+ ### Checks for libraries.
+@@ -208,8 +214,8 @@
+
+ # Configure the Box build system
+ echo
+-perl ./infrastructure/makebuildenv.pl &&
+- perl ./infrastructure/makeparcels.pl
++$PERL ./infrastructure/makebuildenv.pl &&
++ $PERL ./infrastructure/makeparcels.pl
+
+ # Write summary of important info
+ cat <<EOC
--- boxbackup.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1Fb3Et-0009Zw-Nz>