- Add autoconf patches

- Reorganize Makefile

PR:		96692
Submitted by:	maintainer

2 files changed, 55 insertions, 17 deletions

diff --git a/sysutils/boxbackup/Makefile b/sysutils/boxbackup/Makefile
index 531e3c2..57b8097 100644
--- a/sysutils/boxbackup/Makefile
+++ b/sysutils/boxbackup/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	boxbackup
 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
@@ -19,6 +19,8 @@ USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 USE_GCC=	3.2+
+USE_AUTOTOOLS=	autoconf:259 aclocal:19 autoheader:259
+ACLOCAL_ARGS+=	-I ${WRKSRC}/infrastructure/m4
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
@@ -32,30 +34,31 @@ OPTIONS=	CLIENT "Install the bbackupd client" On \
 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]*
@@ -87,7 +90,7 @@ post-patch:
 	@${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}
@@ -96,8 +99,8 @@ post-patch:
 	@${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
@@ -111,8 +114,8 @@ post-install:
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-test:
 .if defined(WITH_TESTS)
+test:
 	 @${ECHO_CMD} "===> Running tests"
 	 @${MAKE} -C ${WRKSRC} test
 .endif
diff --git a/sysutils/boxbackup/files/patch-configure.ac b/sysutils/boxbackup/files/patch-configure.ac
new file mode 100644
index 0000000..e746134
--- /dev/null
+++ b/sysutils/boxbackup/files/patch-configure.ac
@@ -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