head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.20
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.18
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.16
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.14
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.12
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.10
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.8
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.6
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.4
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.2
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.1.0.6
	pkgsrc-2007Q4-base:1.1
	pkgsrc-2007Q3:1.1.0.4
	pkgsrc-2007Q3-base:1.1
	pkgsrc-2007Q2:1.1.0.2
	pkgsrc-2007Q2-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2008.03.07.22.40.29;	author tron;	state dead;
branches;
next	1.1;

1.1
date	2007.06.20.19.51.10;	author jlam;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update "e2fsprogs" to version 1.40.7. Changes since version 1.39:
- a lot of bug fixes
- security fix for CVE-2007-5497
- uuid support
@
text
@$NetBSD: patch-aq,v 1.1 2007/06/20 19:51:10 jlam Exp $

--- misc/Makefile.in.orig	2006-03-27 00:58:10.000000000 -0500
+++ misc/Makefile.in
@@@@ -228,7 +228,7 @@@@ installdirs:
 		$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
-		$(DESTDIR)$(libdir) $(DESTDIR)/etc
+		$(DESTDIR)$(libdir) $(DESTDIR)$(root_sysconfdir)
 
 install: all $(SMANPAGES) $(UMANPAGES) installdirs
 	@@for i in $(SPROGS); do \
@@@@ -288,10 +288,10 @@@@ install: all $(SMANPAGES) $(UMANPAGES) i
 		echo "	INSTALL_DATA $(man5dir)/$$i"; \
 		$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
 	done
-	@@if ! test -f $(DESTDIR)/etc/mke2fs.conf; then \
-		echo "	INSTALL_DATA /etc/mke2fs.conf"; \
+	@@if ! test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
+		echo "	INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \
 		$(INSTALL_DATA) $(srcdir)/mke2fs.conf \
-			$(DESTDIR)/etc/mke2fs.conf; \
+			$(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
 	fi
 
 install-strip: install
@@@@ -336,8 +336,8 @@@@ uninstall:
 	for i in $(FMANPAGES); do \
 		$(RM) -f $(DESTDIR)$(man5dir)/$$i; \
 	done
-	if cmp -s $(srcdir)/mke2fs.conf $(DESTDIR)/etc/mke2fs.conf; then \
-		$(RM) $(DESTDIR)/etc/mke2fs.conf; \
+	if cmp -s $(srcdir)/mke2fs.conf $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
+		$(RM) $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
 	fi
 
 clean:
@


1.1
log
@* Honor PKG_SYSCONFDIR.
* Simplify the PLISTs by merging them.  This makes it easier to handle
  future platforms that want to install fsck.
* Don't compress the info files during installation.  The plist module
  can handle that automatically.
* Install the example mke2fs.conf file into the right place.

This should fix the latest bulk build error for e2fsprogs.
Bump PKGREVISION to 1.
@
text
@d1 1
a1 1
$NetBSD$
@