Apache-version-agnosticism, part 1: fix autoconf, FreeBSD port

skeleton, rcynic-cron.  rpkigui-apache-confgen still needs work to
support 2.4 syntax, but we should be tracking the Apache version
number correctly for the version-dependent pathnames on FreeBSD.
See #616.

svn path=/trunk/; revision=5501

4 files changed, 9 insertions, 4 deletions

diff --git a/buildtools/build-freebsd-ports.py b/buildtools/build-freebsd-ports.py
index c3ca0eef..b560498c 100644
--- a/buildtools/build-freebsd-ports.py
+++ b/buildtools/build-freebsd-ports.py
@@ -114,7 +114,7 @@ etc/rcynic.conf.sample
   f.write('''\
 @dirrm etc/rpki/trust-anchors
 @dirrmtry etc/rpki
-@dirrm www/apache22/data/rcynic
+@dirrm www/apache%%APACHE_VERSION%%/data/rcynic
 @cwd /
 @dirrm var/rcynic/data
 @dirrm var/rcynic/rpki-rtr/sockets
diff --git a/buildtools/freebsd-skeleton/rpki-ca/Makefile b/buildtools/freebsd-skeleton/rpki-ca/Makefile
index c953e037..350b3fb1 100644
--- a/buildtools/freebsd-skeleton/rpki-ca/Makefile
+++ b/buildtools/freebsd-skeleton/rpki-ca/Makefile
@@ -42,7 +42,7 @@ RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_wsgi>3:${PORTSDIR}/www/mod_wsgi3
 # Try to use system OpenSSL if we can.
 CONFIGURE_ENV=  CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
-CONFIGURE_ARGS= --disable-target-installation --disable-rp-tools
+CONFIGURE_ARGS= --disable-target-installation --disable-rp-tools APACHE_VERSION=${APACHE_VERSION}
 
 pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
diff --git a/buildtools/freebsd-skeleton/rpki-rp/Makefile b/buildtools/freebsd-skeleton/rpki-rp/Makefile
index 5511ba09..06531351 100644
--- a/buildtools/freebsd-skeleton/rpki-rp/Makefile
+++ b/buildtools/freebsd-skeleton/rpki-rp/Makefile
@@ -11,6 +11,11 @@ WWW=		http://rpki.net/
 GNU_CONFIGURE=  yes
 USE_PYTHON=	2.7+
 USE_GNOME=      libxml2 libxslt
+USE_APACHE_RUN= 22+
+
+SUB_FILES=	pkg-install
+SUB_LIST=	APACHE_VERSION=${APACHE_VERSION}
+PLIST_SUB=	APACHE_VERSION=${APACHE_VERSION}
 
 # For OpenSSL, not needed otherwise
 USE_PERL5_BUILD=yes
@@ -28,7 +33,7 @@ RUN_DEPENDS+=   rrdtool>0:${PORTSDIR}/databases/rrdtool
 
 # Just want relying party tools, try to use system OpenSSL if we can.
 
-CONFIGURE_ARGS= --disable-ca-tools
+CONFIGURE_ARGS= --disable-ca-tools APACHE_VERSION=${APACHE_VERSION}
 CONFIGURE_ENV=  CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
 MAKE_JOBS_UNSAFE= yes
diff --git a/buildtools/freebsd-skeleton/rpki-rp/pkg-install b/buildtools/freebsd-skeleton/rpki-rp/files/pkg-install.in
index 8c552016..730a85b9 100644
--- a/buildtools/freebsd-skeleton/rpki-rp/pkg-install
+++ b/buildtools/freebsd-skeleton/rpki-rp/files/pkg-install.in
@@ -72,7 +72,7 @@ POST-INSTALL)
     then
 	/bin/cp -p /usr/local/etc/rcynic.conf.sample /usr/local/etc/rcynic.conf
     fi
-    htmldir=/usr/local/www/apache22/data/rcynic
+    htmldir=/usr/local/www/apache%%APACHE_VERSION%%/data/rcynic
     if ! test -d $htmldir
     then
         echo "Creating $htmldir"