Attachment #65208 for bug #96692

View | Details | Raw Unified | Return to bug 96692
Collapse All | Expand All

Lines 8-14 Link Here

(-)boxbackup/Makefile (-18 / +21 lines)
8	PORTVERSION= 0.10	8	PORTVERSION= 0.10
9	CATEGORIES= sysutils	9	CATEGORIES= sysutils
10	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	10	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
11	MASTER_SITE_SUBDIR= ${PORTNAME}	11	MASTER_SITE_SUBDIR=${PORTNAME}
12	EXTRACT_SUFX= .tgz	12	EXTRACT_SUFX= .tgz
13		13
14	MAINTAINER= james@netinertia.co.uk	14	MAINTAINER= james@netinertia.co.uk
Lines 17-23 Link Here
17	USE_OPENSSL= yes	17	USE_OPENSSL= yes
18	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
19	USE_PERL5= yes	19	USE_PERL5= yes
20	USE_GCC= 3.2+	20	USE_GCC= 2.95+
		21	USE_AUTOTOOLS= autoconf:259 aclocal:19 autoheader:259
		22	ACLOCAL_ARGS+= -I ${WRKSRC}/infrastructure/m4
21		23
22	PKGMESSAGE= ${WRKDIR}/pkg-message	24	PKGMESSAGE= ${WRKDIR}/pkg-message
23		25
Lines 31-60 Link Here
31	TARGETOS!= ${ECHO_CMD} `${UNAME} -s``${UNAME} -r \| ${SED} -e 's/[-(].*//'` \| ${TR} A-Z a-z	33	TARGETOS!= ${ECHO_CMD} `${UNAME} -s``${UNAME} -r \| ${SED} -e 's/[-(].*//'` \| ${TR} A-Z a-z
32		34
33	.if defined(WITH_GNUREADLINE)	35	.if defined(WITH_GNUREADLINE)
34	CONFIGURE_ARGS+= --enable-gnu-readline	36	CONFIGURE_ARGS+=--enable-gnu-readline
35	NO_PACKAGE= GNU GPL prevents distributing binaries linked against GNU readline	37	NO_PACKAGE= GNU GPL prevents distributing binaries linked against GNU readline
36	.endif	38	.endif
37		39
38	.if defined(WITHOUT_CLIENT) && defined(WITHOUT_SERVER)	40	.if defined(WITHOUT_CLIENT) && defined(WITHOUT_SERVER)
39	IGNORE= requires at least CLIENT or SERVER to be defined. Please run 'make config' again	41	IGNORE= requires at least CLIENT or SERVER to be defined.\
		42	Please \`make config\` again
40	.endif	43	.endif
41		44
42	.if defined(WITHOUT_CLIENT)	45	.if defined(WITHOUT_CLIENT)
43	PLIST_SUB+= CLIENT="@comment "	46	PLIST_SUB+= CLIENT="@comment "
44	.else	47	.else
45	USE_RC_SUBR+= bbackupd.sh	48	USE_RC_SUBR+= bbackupd.sh
46	PLIST_SUB+= CLIENT=""	49	PLIST_SUB+= CLIENT=""
47	ALL_TARGET+= parcels/${DISTNAME}-backup-client-${TARGETOS}.tgz	50	ALL_TARGET+= parcels/${DISTNAME}-backup-client-${TARGETOS}.tgz
48	INSTALL_TARGET+= install-backup-client	51	INSTALL_TARGET+=install-backup-client
49	.endif	52	.endif
50		53
51	.if defined(WITHOUT_SERVER)	54	.if defined(WITHOUT_SERVER)
52	PLIST_SUB+= SERVER="@comment "	55	PLIST_SUB+= SERVER="@comment "
53	.else	56	.else
54	USE_RC_SUBR+= bbstored.sh	57	USE_RC_SUBR+= bbstored.sh
55	PLIST_SUB+= SERVER=""	58	PLIST_SUB+= SERVER=""
56	ALL_TARGET+= parcels/${DISTNAME}-backup-server-${TARGETOS}.tgz	59	ALL_TARGET+= parcels/${DISTNAME}-backup-server-${TARGETOS}.tgz
57	INSTALL_TARGET+= install-backup-server	60	INSTALL_TARGET+=install-backup-server
58	.endif	61	.endif
59		62
60	CONFLICTS= boxbackup-server-[0-9]* boxbackup-client-[0-9]*	63	CONFLICTS= boxbackup-server-[0-9]* boxbackup-client-[0-9]*
Lines 86-92 Link Here
86	@${REINPLACE_CMD} -e 's,"perl ,PERL_EXECUTABLE " ,g' \	89	@${REINPLACE_CMD} -e 's,"perl ,PERL_EXECUTABLE " ,g' \
87	${WRKSRC}/test/backupstorefix/testbackupstorefix.cpp	90	${WRKSRC}/test/backupstorefix/testbackupstorefix.cpp
88	# Fix hard-coded g++	91	# Fix hard-coded g++
89	@${REINPLACE_CMD} -e "s\|g++\|${CXX}\|"\	92	@${REINPLACE_CMD} -e 's,g++,${CXX},' \
90	${WRKSRC}/infrastructure/makebuildenv.pl	93	${WRKSRC}/infrastructure/makebuildenv.pl
91	.if !defined(WITHOUT_CLIENT)	94	.if !defined(WITHOUT_CLIENT)
92	@${CAT} ${FILESDIR}/pkg-message.client >> ${PKGMESSAGE}	95	@${CAT} ${FILESDIR}/pkg-message.client >> ${PKGMESSAGE}
Lines 95-102 Link Here
95	@${CAT} ${FILESDIR}/pkg-message.server >> ${PKGMESSAGE}	98	@${CAT} ${FILESDIR}/pkg-message.server >> ${PKGMESSAGE}
96	.endif	99	.endif
97		100
98	pre-install:
99	.if !defined(WITHOUT_SERVER)	101	.if !defined(WITHOUT_SERVER)
		102	pre-install:
100	@${SETENV} PKG_PREFIX=${PREFIX} \	103	@${SETENV} PKG_PREFIX=${PREFIX} \
101	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL	104	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
102	.endif	105	.endif
Lines 110-117 Link Here
110	.endif	113	.endif
111	@${CAT} ${PKGMESSAGE}	114	@${CAT} ${PKGMESSAGE}
112		115
113	test:
114	.if defined(WITH_TESTS)	116	.if defined(WITH_TESTS)
		117	test:
115	@${ECHO_CMD} "===> Running tests"	118	@${ECHO_CMD} "===> Running tests"
116	@${MAKE} -C ${WRKSRC} test	119	@${MAKE} -C ${WRKSRC} test
117	.endif	120	.endif




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

Return to bug 96692

Line 0 Link Here

(-)boxbackup/files/patch-configure.ac (+35 lines)
	1	--- configure.ac.orig Thu Mar 16 22:26:39 2006
	2	+++ configure.ac Thu Mar 16 22:28:31 2006
	3	@@ -2,7 +2,7 @@
	4	# Process this file with autoconf to produce a configure script.
	5
	6	AC_PREREQ(2.59)
	7	-AC_INIT([Box Backup], 0.09, [box@fluffy.co.uk])
	8	+AC_INIT([Box Backup], 0.10, [box@fluffy.co.uk])
	9	AC_CONFIG_SRCDIR([lib/common/Box.h])
	10	AC_CONFIG_HEADERS([lib/common/BoxConfig.h])
	11
	12	@@ -26,6 +26,12 @@
	13	# Use -rdynamic if we have gcc. This is needed for backtrace
	14	AC_SUBST([LDADD_RDYNAMIC], ['-rdynamic'])
	15	fi
	16	+AC_PATH_PROG([PERL], [perl], [no])
	17	+if test "x$PERL" != "xno"; then
	18	+ AC_DEFINE_UNQUOTED([PERL_EXECUTABLE], ["$PERL"], [Location of the perl executable])
	19	+else
	20	+ AC_MSG_ERROR([[perl executable was not found]])
	21	+fi
	22
	23
	24	### Checks for libraries.
	25	@@ -208,8 +214,8 @@
	26
	27	# Configure the Box build system
	28	echo
	29	-perl ./infrastructure/makebuildenv.pl &&
	30	- perl ./infrastructure/makeparcels.pl
	31	+$PERL ./infrastructure/makebuildenv.pl &&
	32	+ $PERL ./infrastructure/makeparcels.pl
	33
	34	# Write summary of important info
	35	cat <<EOC