Introduce a new mk.conf definition MTOOLS_ENABLE_FLOPPYD, which

can either be defined or not. This governs the installation of the
floppyd binary in the mtools package. The floppyd program needs
the SM and ICE libs from the X11 distribution to link (floppyd's
authorisation model to enable remote access to floppy drives closely
resembles that of X11's xauth model). Modify the mtools Makefile
accordingly.

2 files changed, 24 insertions, 11 deletions

diff --git a/mk/mk.conf.example b/mk/mk.conf.example
index 598f8be0afb..653ec57c4ba 100644
--- a/mk/mk.conf.example
+++ b/mk/mk.conf.example
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf.example,v 1.155 2000/09/15 15:07:30 jwise Exp $
+# $NetBSD: mk.conf.example,v 1.156 2000/09/26 11:09:26 agc Exp $
 #
 
 # Sample /etc/mk.conf file, which can be used to set specific values
@@ -503,6 +503,13 @@
 # Possible: any directory.
 # Default: /var/tmp
 
+#MTOOLS_ENABLE_FLOPPYD=
+# Used by the mtools package to determine whether or not the floppyd
+# program is installed. X11 libraries and header files are needed to
+# build floppyd and run floppyd.
+# Possible: defined, not defined
+# Default: not defined
+
 #MUTT_USE_SSL=	YES
 # Enable SSL in mutt (for pop and imap connections)
 # Possible: YES, NO
diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
index fbdbe3a5f96..778410c10aa 100644
--- a/sysutils/mtools/Makefile
+++ b/sysutils/mtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2000/01/04 17:49:41 bouyer Exp $
+# $NetBSD: Makefile,v 1.18 2000/09/26 11:09:27 agc Exp $
 #
 
 DISTNAME=	mtools-3.9.5
@@ -13,11 +13,17 @@ HOMEPAGE=	http://www.tux.org/pub/knaff/mtools/
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CPPFLAGS+=	-I${X11BASE}/include
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
-
 INFO_FILES=	mtools.info
 
+.include "../../mk/bsd.prefs.mk"
+
+.ifdef MTOOLS_ENABLE_FLOPPYD
+USE_X11=	yes
+CPPFLAGS+=	-I${X11BASE}/include
+CONFIGURE_ARGS+=	--enable-floppyd
+.endif
+
 PLIST_SRC=	${WRKDIR}/PLIST
 
 pre-patch:
@@ -27,12 +33,12 @@ post-patch:
 	@${RM} ${WRKSRC}/mtools
 
 post-install:
-	@if [ -x ${PREFIX}/bin/floppyd ]; then \
-	  ${CP} ${PKGDIR}/PLIST ${PLIST_SRC}; \
-	else \
-	  ${ECHO} ${RM} -f ${PREFIX}/man/man1/floppyd.1; \
-	  ${RM} -f ${PREFIX}/man/man1/floppyd.1; \
-	  ${GREP} -v /floppyd ${PKGDIR}/PLIST >${PLIST_SRC}; \
-	fi \
+.ifdef MTOOLS_ENABLE_FLOPPYD
+	${RM} -f ${PREFIX}/man/man1/floppyd.1
+	${RM} -f ${PREFIX}/bin/floppyd ${PREFIX}/bin/floppyd_installtest
+	${GREP} -v /floppyd ${PKGDIR}/PLIST >${PLIST_SRC}
+.else
+	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
+.endif
 
 .include "../../mk/bsd.pkg.mk"