Add support for DESTDIR and modular Xorg.

XXX This should use the option framework for the floppyd.

4 files changed, 137 insertions, 18 deletions

diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
index fccd63ad4f4..f4fd1733ffd 100644
--- a/sysutils/mtools/Makefile
+++ b/sysutils/mtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2006/04/07 19:54:17 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2007/08/17 20:55:34 joerg Exp $
 
 DISTNAME=	mtools-3.9.10
 PKGREVISION=	1
@@ -10,6 +10,8 @@ MAINTAINER=	is@NetBSD.org
 HOMEPAGE=	http://www.tux.org/pub/knaff/mtools/
 COMMENT=	FAT (MS-DOS, Atari) disk access tools
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NOT_FOR_PLATFORM = *-*-alpha *-*-sparc64	# LP64 problem
 
 GNU_CONFIGURE=		YES
@@ -19,7 +21,9 @@ INFO_FILES=		# PLIST
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(MTOOLS_ENABLE_FLOPPYD) && !empty(MTOOLS_ENABLE_FLOPPYD:M[Yy][Ee][Ss])
-.include "../../mk/x11.buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXt?=	build
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 CPPFLAGS+=		-I${X11BASE}/include
 CONFIGURE_ARGS+=	--enable-floppyd
 PLIST_SUBST+=		NOFLOPPYD=
diff --git a/sysutils/mtools/distinfo b/sysutils/mtools/distinfo
index a487413c85f..f5b4bce28a5 100644
--- a/sysutils/mtools/distinfo
+++ b/sysutils/mtools/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.11 2006/10/13 13:04:31 is Exp $
+$NetBSD: distinfo,v 1.12 2007/08/17 20:55:34 joerg Exp $
 
 SHA1 (mtools-3.9.10.tar.bz2) = f916e54e1bff599946bb1e72601f99096ea79456
 RMD160 (mtools-3.9.10.tar.bz2) = 566d3f3e3c6201cfe750ba05826f8013778f90b9
 Size (mtools-3.9.10.tar.bz2) = 291876 bytes
-SHA1 (patch-aa) = 5fa8d178bf4da73813a8857412e9369762d3dce1
-SHA1 (patch-ab) = 222ec2dac5cacc8d54eb685ce73124b1c312d93e
+SHA1 (patch-aa) = 52a43c817253f278edfa7de5466fb3c559a1e22b
+SHA1 (patch-ab) = fde9551dcc19393dfd681d9597c88d1b178620a3
 SHA1 (patch-ac) = 84d959c35ec65679e003f50ef6a6fb2e62ff272e
 SHA1 (patch-ad) = d599f6b184c6da84abf4392b44d243b7b62bac3e
 SHA1 (patch-ae) = 5281829c8c79f95ff4672fabb53acd22685c17bb
diff --git a/sysutils/mtools/patches/patch-aa b/sysutils/mtools/patches/patch-aa
index 1bde311d4ec..906f9d2aede 100644
--- a/sysutils/mtools/patches/patch-aa
+++ b/sysutils/mtools/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.9 2005/04/04 08:56:18 adam Exp $
+$NetBSD: patch-aa,v 1.10 2007/08/17 20:55:34 joerg Exp $
 
---- Makefile.in.orig	2004-02-28 19:06:35.000000000 +0000
+--- Makefile.in.orig	2004-02-28 20:06:35.000000000 +0100
 +++ Makefile.in
 @@ -11,7 +11,6 @@ USERCFLAGS = 
  USERLDFLAGS =
@@ -27,12 +27,125 @@ $NetBSD: patch-aa,v 1.9 2005/04/04 08:56:18 adam Exp $
  mclasserase.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 mdu.1 mformat.1  minfo.1 \
  mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1 \
  mrd.1 mren.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1
-@@ -258,7 +258,7 @@ install-links: $(bindir)/mtools
- install-scripts: $(bindir)/mtools
- 	@$(top_srcdir)/mkinstalldirs $(bindir)
+@@ -195,30 +195,30 @@ html: mtools.html mtools_toc.html
+ 
+ # Don't cd, to avoid breaking install-sh references.
+ install-info: info
+-	$(top_srcdir)/mkinstalldirs $(infodir)
++	$(top_srcdir)/mkinstalldirs ${DESTDIR}$(infodir)
+ 	if test -f mtools.info; then \
+ 	  for i in mtools.info*; do \
+-	    $(INSTALL_DATA) $$i $(infodir)/$$i; \
++	    $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; \
+ 	  done; \
+ 	else \
+ 	  for i in $(srcdir)/mtools.info*; do \
+-	    $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
++	    $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
+ 	  done; \
+ 	fi; \
+ 	if [ -n "$(INSTALL_INFO)" ] ; then \
+ 		if [ -f $(infodir)/dir.info ] ; then \
+-			$(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir.info; \
++			$(INSTALL_INFO) ${DESTDIR}$(infodir)/mtools.info ${DESTDIR}$(infodir)/dir.info; \
+ 		fi; \
+ 		if [ -f $(infodir)/dir ] ; then \
+-			$(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir; \
++			$(INSTALL_INFO) ${DESTDIR}$(infodir)/mtools.info ${DESTDIR}$(infodir)/dir; \
+ 		fi; \
+ 	fi
+ 
+ uninstall-info:
+ 	cd $(infodir) && rm -f mtools.info*
+ 
+-install:	$(bindir)/mtools @BINFLOPPYD@ install-man install-links \
+-		$(bindir)/mkmanifest install-scripts install-info
++install:	${DESTDIR}$(bindir)/mtools @BINFLOPPYD@ install-man install-links \
++		${DESTDIR}$(bindir)/mkmanifest install-scripts install-info
+ 
+ uninstall:	uninstall-bin uninstall-man uninstall-links \
+ 		uninstall-scripts
+@@ -228,52 +228,52 @@ distclean: clean texclean
+ maintainer-clean: distclean
+ 
+ 
+-$(bindir)/floppyd: floppyd
+-	$(top_srcdir)/mkinstalldirs $(bindir)
+-	$(INSTALL_PROGRAM) floppyd $(bindir)/floppyd
+-
+-$(bindir)/floppyd_installtest: floppyd_installtest
+-	$(top_srcdir)/mkinstalldirs $(bindir)
+-	$(INSTALL_PROGRAM) floppyd_installtest $(bindir)/floppyd_installtest
+-
+-$(bindir)/mtools: mtools
+-	$(top_srcdir)/mkinstalldirs $(bindir)
+-	$(INSTALL_PROGRAM) mtools $(bindir)/mtools
+-
+-$(bindir)/mkmanifest: mkmanifest
+-	$(top_srcdir)/mkinstalldirs $(bindir)
+-	$(INSTALL_PROGRAM) mkmanifest $(bindir)/mkmanifest
++${DESTDIR}$(bindir)/floppyd: floppyd
++	$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
++	$(INSTALL_PROGRAM) floppyd ${DESTDIR}$(bindir)/floppyd
++
++${DESTDIR}$(bindir)/floppyd_installtest: floppyd_installtest
++	$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
++	$(INSTALL_PROGRAM) floppyd_installtest ${DESTDIR}$(bindir)/floppyd_installtest
++
++${DESTDIR}$(bindir)/mtools: mtools
++	$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
++	$(INSTALL_PROGRAM) mtools ${DESTDIR}$(bindir)/mtools
++
++${DESTDIR}$(bindir)/mkmanifest: mkmanifest
++	$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
++	$(INSTALL_PROGRAM) mkmanifest ${DESTDIR}$(bindir)/mkmanifest
+ 
+ #$(ETCDIR)/mtools: mtools.etc
+ #	cp mtools.etc $(ETCDIR)/mtools
+ 
+-install-links: $(bindir)/mtools
++install-links: ${DESTDIR}$(bindir)/mtools
+ 	@for j in $(LINKS); do \
+-		rm -f $(bindir)/$$j ; \
+-		$(LN_S) mtools $(bindir)/$$j ; \
+-		echo $(bindir)/$$j ; \
++		rm -f ${DESTDIR}$(bindir)/$$j ; \
++		$(LN_S) mtools ${DESTDIR}$(bindir)/$$j ; \
++		echo ${DESTDIR}$(bindir)/$$j ; \
+ 	done
+ 
+ ## "z" is the older version of "gz"; the name is just *too* short
+-install-scripts: $(bindir)/mtools
+-	@$(top_srcdir)/mkinstalldirs $(bindir)
++install-scripts: ${DESTDIR}$(bindir)/mtools
++	@$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
  	@for j in $(SCRIPTS) ; do \
 -		$(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
-+		$(INSTALL_SCRIPT) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
- 		echo $(bindir)/$$j ; \
+-		echo $(bindir)/$$j ; \
++		$(INSTALL_SCRIPT) $(srcdir)/scripts/$$j ${DESTDIR}$(bindir)/$$j ; \
++		echo ${DESTDIR}$(bindir)/$$j ; \
  	done
- 	rm -f $(bindir)/lz
+-	rm -f $(bindir)/lz
+-	$(LN_S) uz $(bindir)/lz
++	rm -f ${DESTDIR}$(bindir)/lz
++	$(LN_S) uz ${DESTDIR}$(bindir)/lz
+ 
+ install-man:
+-	@$(top_srcdir)/mkinstalldirs $(MAN1DIR)
++	@$(top_srcdir)/mkinstalldirs ${DESTDIR}$(MAN1DIR)
+ 	@for j in $(MAN1); do \
+-		$(INSTALL_DATA) $(srcdir)/$$j $(MAN1DIR)/$$j ; \
+-		echo $(MAN1DIR)/$$j ; \
++		$(INSTALL_DATA) $(srcdir)/$$j ${DESTDIR}$(MAN1DIR)/$$j ; \
++		echo ${DESTDIR}$(MAN1DIR)/$$j ; \
+ 	done
+-	@$(top_srcdir)/mkinstalldirs $(MAN5DIR)
++	@$(top_srcdir)/mkinstalldirs ${DESTDIR}$(MAN5DIR)
+ 	@for j in $(MAN5); do \
+-		$(INSTALL_DATA) $(srcdir)/$$j $(MAN5DIR)/$$j ; \
+-		echo $(MAN5DIR)/$$j ; \
++		$(INSTALL_DATA) $(srcdir)/$$j ${DESTDIR}$(MAN5DIR)/$$j ; \
++		echo ${DESTDIR}$(MAN5DIR)/$$j ; \
+ 	done
+ 
+ uninstall-bin:
diff --git a/sysutils/mtools/patches/patch-ab b/sysutils/mtools/patches/patch-ab
index fdff93a17f7..8252983adf1 100644
--- a/sysutils/mtools/patches/patch-ab
+++ b/sysutils/mtools/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.8 2005/04/04 08:56:18 adam Exp $
+$NetBSD: patch-ab,v 1.9 2007/08/17 20:55:34 joerg Exp $
 
---- configure.orig	2005-02-28 22:10:33.000000000 +0000
+--- configure.orig	2005-02-28 23:10:33.000000000 +0100
 +++ configure
 @@ -5938,7 +5938,7 @@ if [ $host_os3 = hpux ] ; then
  fi
@@ -29,10 +29,12 @@ $NetBSD: patch-ab,v 1.8 2005/04/04 08:56:18 adam Exp $
    # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
    # check for ICE first), but we must link in the order -lSM -lICE or
    # we get undefined symbols.  So assume we have SM if we have ICE.
-@@ -7738,6 +7738,8 @@ if test X$use_floppyd = Xyes; then
+@@ -7737,7 +7737,9 @@ if test X$use_floppyd = Xyes; then
+ 	exit 1
      fi
      FLOPPYD="floppyd floppyd_installtest"
-     BINFLOPPYD="\$(bindir)/floppyd \$(bindir)/floppyd_installtest"
+-    BINFLOPPYD="\$(bindir)/floppyd \$(bindir)/floppyd_installtest"
++    BINFLOPPYD="\${DESTDIR}\$(bindir)/floppyd \${DESTDIR}\$(bindir)/floppyd_installtest"
 +    MANFLOPPYD="floppyd.1"
 +    MANFLOPPYD_INSTTEST="floppyd_installtest.1"
  
@@ -47,7 +49,7 @@ $NetBSD: patch-ab,v 1.8 2005/04/04 08:56:18 adam Exp $
  fi
  
  
-@@ -8401,6 +8405,8 @@ s,@X_LIBS@,$X_LIBS,;t t
+@@ -8401,6 +8407,8 @@ s,@X_LIBS@,$X_LIBS,;t t
  s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
  s,@FLOPPYD@,$FLOPPYD,;t t
  s,@BINFLOPPYD@,$BINFLOPPYD,;t t