6 files changed, 15 insertions, 71 deletions
diff --git a/buildtools/freebsd-skeleton/rpki-ca/Makefile b/buildtools/freebsd-skeleton/rpki-ca/Makefile
index 6cf890d6..71f38436 100644
--- a/buildtools/freebsd-skeleton/rpki-ca/Makefile
+++ b/buildtools/freebsd-skeleton/rpki-ca/Makefile
@@ -9,6 +9,7 @@ COMMENT=	rpki.net RPKI CA tools
 WWW=		http://rpki.net/
 
 GNU_CONFIGURE=  yes
+NO_MTREE=	yes
 USE_PYTHON=	2.7+
 USE_GNOME=      libxml2 libxslt
 USE_MYSQL=      server
@@ -16,9 +17,12 @@ USE_APACHE_RUN= 22+
 
 USE_RC_SUBR=	rpki-ca
 
-# Disable a couple of recent whoopie cushions in the FreeBSD ports system
+# Disable parallel builds, they failed last time I tried and we don't really need them
 MAKE_JOBS_UNSAFE= yes
-NO_STAGE	= yes
+
+# We depend on our own relying party code.  Perhaps this should require our own version number?
+BUILD_DEPENDS+= rpki-rp>0:${PORTSDIR}/net/rpki-rp
+RUN_DEPENDS+=   rpki-rp>0:${PORTSDIR}/net/rpki-rp
 
 # For OpenSSL, not needed otherwise
 USE_PERL5_BUILD=yes
@@ -26,9 +30,6 @@ USE_PERL5_BUILD=yes
 # For building OpenSSL, not needed otherwise
 BUILD_DEPENDS+= makedepend>0:${PORTSDIR}/devel/makedepend
 
-# Needed at build to keep ./configure from complaining.
-BUILD_DEPENDS+= rsync>0:${PORTSDIR}/net/rsync
-
 RPKID_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml                 \
                 ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:${PORTSDIR}/databases/py-MySQLdb       \
                 ${PYTHON_PKGNAMEPREFIX}django>=1.3.7:${PORTSDIR}/www/py-django          \
@@ -40,17 +41,14 @@ RPKID_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml
 BUILD_DEPENDS+=	${RPKID_DEPENDS}
 RUN_DEPENDS+=	${RPKID_DEPENDS}
 
-RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_wsgi>3:${PORTSDIR}/www/mod_wsgi3
+RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_wsgi3>0:${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 APACHE_VERSION=${APACHE_VERSION}
+CONFIGURE_ARGS= --disable-target-installation --disable-runtime-dependencies --disable-rp-tools APACHE_VERSION=${APACHE_VERSION}
 
 pre-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-post-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@test -d ${STAGEDIR}${PREFIX}/etc/rc.d || mkdir -p ${STAGEDIR}${PREFIX}/etc/rc.d
 
 .include <bsd.port.mk>
diff --git a/buildtools/freebsd-skeleton/rpki-ca/pkg-plist b/buildtools/freebsd-skeleton/rpki-ca/pkg-plist
deleted file mode 100644
index e69de29b..00000000
--- a/buildtools/freebsd-skeleton/rpki-ca/pkg-plist
+++ /dev/null
diff --git a/buildtools/freebsd-skeleton/rpki-ca/pkg-upgrade b/buildtools/freebsd-skeleton/rpki-ca/pkg-upgrade
deleted file mode 100644
index f569a3d6..00000000
--- a/buildtools/freebsd-skeleton/rpki-ca/pkg-upgrade
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh -
-
-echo 1>&2 "pkg-upgrade invoked with arguments \"$*\"."
-
-case $2 in
-
-PRE-UPGRADE)
-    ;;
-
-POST-UPGRADE)
-    ;;
-
-*)
-    echo "No clue what this script is meant to do when invoked with arguments \"$*\"."
-    #exit 1
-    ;;
-
-esac
diff --git a/buildtools/freebsd-skeleton/rpki-rp/Makefile b/buildtools/freebsd-skeleton/rpki-rp/Makefile
index be88adc0..adae6ef0 100644
--- a/buildtools/freebsd-skeleton/rpki-rp/Makefile
+++ b/buildtools/freebsd-skeleton/rpki-rp/Makefile
@@ -9,6 +9,7 @@ COMMENT=	rpki.net RPKI relying party tools
 WWW=		http://rpki.net/
 
 GNU_CONFIGURE=  yes
+NO_MTREE=	yes
 USE_PYTHON=	2.7+
 USE_GNOME=      libxml2 libxslt
 USE_APACHE_RUN= 22+
@@ -35,37 +36,18 @@ 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 APACHE_VERSION=${APACHE_VERSION}
+CONFIGURE_ARGS= --disable-target-installation --disable-runtime-dependencies --disable-ca-tools APACHE_VERSION=${APACHE_VERSION}
 CONFIGURE_ENV=  CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
-# Disable a couple of recent whoopie cushions in the FreeBSD ports system
+# Disable parallel builds, they failed the last time I tried and we don't really need them
 MAKE_JOBS_UNSAFE= yes
-NO_STAGE	= yes
 
 # rcynic's Makefile constructs an rcynic.conf for us if it doesn't
 # find one already installed.  This turns out to be exactly what
-# FreeBSD's rules want us to install as rcynic.conf.sample, so we
-# shuffle things around a bit just before and just after installation
-# to make this all come out right.
-# 
-# If I ever teach rcynic to construct a .conf.sample file per the
-# FreeBSD way of doing things, this will need to change to match.
-
-pre-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-	@if test -f ${PREFIX}/etc/rcynic.conf; \
-	 then \
-	    ${MV} -f ${PREFIX}/etc/rcynic.conf ${PREFIX}/etc/rcynic.conf.real; \
-	 fi
+# FreeBSD's rules want us to install as rcynic.conf.sample, so we just
+# rename it.
 
 post-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@if test -f ${PREFIX}/etc/rcynic.conf.real; \
-	 then \
-	    ${MV} -f ${PREFIX}/etc/rcynic.conf ${PREFIX}/etc/rcynic.conf.sample; \
-	    ${MV} -f ${PREFIX}/etc/rcynic.conf.real ${PREFIX}/etc/rcynic.conf; \
-	 else \
-	    ${CP} -p ${PREFIX}/etc/rcynic.conf ${PREFIX}/etc/rcynic.conf.sample; \
-	 fi
+	${MV} -vf ${STAGEDIR}${PREFIX}/etc/rcynic.conf ${STAGEDIR}${PREFIX}/etc/rcynic.conf.sample
 
 .include <bsd.port.mk>
diff --git a/buildtools/freebsd-skeleton/rpki-rp/pkg-plist b/buildtools/freebsd-skeleton/rpki-rp/pkg-plist
deleted file mode 100644
index e69de29b..00000000
--- a/buildtools/freebsd-skeleton/rpki-rp/pkg-plist
+++ /dev/null
diff --git a/buildtools/freebsd-skeleton/rpki-rp/pkg-upgrade b/buildtools/freebsd-skeleton/rpki-rp/pkg-upgrade
deleted file mode 100644
index f569a3d6..00000000
--- a/buildtools/freebsd-skeleton/rpki-rp/pkg-upgrade
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh -
-
-echo 1>&2 "pkg-upgrade invoked with arguments \"$*\"."
-
-case $2 in
-
-PRE-UPGRADE)
-    ;;
-
-POST-UPGRADE)
-    ;;
-
-*)
-    echo "No clue what this script is meant to do when invoked with arguments \"$*\"."
-    #exit 1
-    ;;
-
-esac