update patchset

sysutils/bacula9-client/Makefile

@@ -13,4 +13,6 @@ OPTIONS_DEFINE=	NLS PYTHON IPV6
 
 BROKEN_aarch64=		Fails to link: missing sbrk
 
+CONFIGURE_TARGET=	${ARCH}-portbld-midnightbsd1.2
+
 .include "${MASTERDIR}/Makefile"

sysutils/bacula9-server/Makefile

@@ -27,8 +27,6 @@ PLIST_SUB+=	LIB_VERSION=${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_TARGET=	${ARCH}-portbld-freebsd10.4
-
 CPPFLAGS+=	-I/usr/include/readline -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -183,26 +181,26 @@ post-patch:
 .if !target(post-install)
 post-install:
 .if ! ${PORT_OPTIONS:MPYTHON}
-	${RM} ${STAGEDIR}${DATADIR}/dvd-handler
+	-${RM} ${STAGEDIR}${DATADIR}/dvd-handler
 .endif
 .if defined(WITH_CLIENT_ONLY)
-	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/examples/sample-query.sql ${STAGEDIR}${LOCALBASE}/share/bacula/query.sql.sample
+	${MV} ${ETCDIR}/bconsole.conf ${ETCDIR}/bconsole.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/examples/sample-query.sql ${FAKE_DESTDIR}${LOCALBASE}/share/bacula/query.sql.sample
 .else
 	${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.sample
 	# bacula-dir attempts to install query.sql as bpart of bacula-server, but that should only installed by bacula-client.
-	${RM} ${STAGEDIR}${LOCALBASE}/share/bacula/query.sql
+	${RM} ${FAKE_DESTDIR}${LOCALBASE}/share/bacula/query.sql
 
 	#the following are installed by the -CLIENT port, and I ([email protected])
 	#don't know how to remove them from being built for the -SERVER port.
-	${RM} ${STAGEDIR}${LOCALBASE}/lib/bpipe-fd.so
-	${RM} ${STAGEDIR}${LOCALBASE}/lib/libbac-${PORTVERSION}.so
-	${RM} ${STAGEDIR}${LOCALBASE}/lib/libbac.so
-	${RM} ${STAGEDIR}${LOCALBASE}/lib/libbaccfg-${PORTVERSION}.so
-	${RM} ${STAGEDIR}${LOCALBASE}/lib/libbaccfg.so
-	${RM} ${STAGEDIR}${LOCALBASE}/lib/libbacfind-${PORTVERSION}.so
-	${RM} ${STAGEDIR}${LOCALBASE}/lib/libbacfind.so
+	${RM} ${FAKE_DESTDIR}${LOCALBASE}/lib/bpipe-fd.so
+	${RM} ${FAKE_DESTDIR}${LOCALBASE}/lib/libbac-${PORTVERSION}.so
+	${RM} ${FAKE_DESTDIR}${LOCALBASE}/lib/libbac.so
+	${RM} ${FAKE_DESTDIR}${LOCALBASE}/lib/libbaccfg-${PORTVERSION}.so
+	${RM} ${FAKE_DESTDIR}${LOCALBASE}/lib/libbaccfg.so
+	${RM} ${FAKE_DESTDIR}${LOCALBASE}/lib/libbacfind-${PORTVERSION}.so
+	${RM} ${FAKE_DESTDIR}${LOCALBASE}/lib/libbacfind.so
 .endif
 	for na in ${CONFFILES}; do \
 		${MV} ${STAGEDIR}${ETCDIR}/bacula-$$na.conf ${STAGEDIR}${ETCDIR}/bacula-$$na.conf.sample; \

sysutils/bacula9-server/files/patch-configure

@@ -0,0 +1,29 @@
+--- configure.orig	2020-05-02 16:38:21.835899000 -0400
++++ configure	2020-05-02 16:39:21.392140000 -0400
+@@ -7032,7 +7032,7 @@
+     i*86 )
+       # Not sure whether the presence of OpenBSD here was a mistake.
+       # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
++      lt_cv_deplibs_check_method='file_magic (MidnightBSD|FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+       lt_cv_file_magic_cmd=/usr/bin/file
+       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+       ;;
+@@ -16945,7 +16945,7 @@
+ fi
+ fi
+
+-if test $HAVE_UNAME=yes -a x`uname -s` = xFreeBSD
++if test $HAVE_UNAME=yes -a x`uname -s` = xMidnightBSD
+ then
+
+
+@@ -17166,7 +17166,7 @@
+ elif test $HAVE_UNAME=yes -a x`uname -s` = xGNU
+ then
+         DISTNAME=hurd
+-elif test $HAVE_UNAME=yes -a x`uname -s` = xFreeBSD
++elif test $HAVE_UNAME=yes -a x`uname -s` = xMidnightBSD
+ then
+         DISTNAME=freebsd
+ elif test $HAVE_UNAME=yes -a x`uname -s` = xNetBSD