- Now really fix NOPORTDOCS case, handling it using an extra patche called when NOPORTODCS is set.

- Bump PORTREVISION.

Discussed with:	gabor
Approved by:	gabor (mentor, implicit)

4 files changed, 73 insertions, 129 deletions

diff --git a/devel/quilt/Makefile b/devel/quilt/Makefile
index a6d14ced31d3..cc8776c27acd 100644
--- a/devel/quilt/Makefile
+++ b/devel/quilt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quilt
 PORTVERSION=	0.46
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	quilt
@@ -31,7 +31,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-sed=${LOCALBASE}/bin/gsed --without-getopt --with-patch=${LOCALBASE}/bin/gpatch
 
 MAN1=		guards.1 quilt.1
-PORTDOCS=	README* quilt.pdf
+DOCS=		README README.MAIL quilt.pdf
 
 .include <bsd.port.pre.mk>
 
@@ -52,10 +52,8 @@ PLIST_SUB+=	NLS="@comment "
 CONFIGURE_ARGS+=	--disable-nls
 .endif
 
-post-install:
-	@if [ ! -f ${PREFIX}/etc/quilt.quiltrc ]; then \
-		${CP} ${PREFIX}/etc/quilt.quiltrc.sample \
-			${PREFIX}/etc/quilt.quiltrc ; \
-	fi
+.if defined(NOPORTDOCS)
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-Makefile.in
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/quilt/files/extra-patch-Makefile.in b/devel/quilt/files/extra-patch-Makefile.in
new file mode 100644
index 000000000000..947a7780e108
--- /dev/null
+++ b/devel/quilt/files/extra-patch-Makefile.in
@@ -0,0 +1,15 @@
+--- Makefile.in.old	2008-08-03 20:41:13.000000000 -0300
++++ Makefile.in	2008-08-03 20:45:36.000000000 -0300
+@@ -316,12 +316,6 @@
+ 	$(INSTALL) -d $(BUILD_ROOT)$(libdir)/$(PACKAGE)
+ 	$(INSTALL) -m 755 $(LIB:%=lib/%) $(BUILD_ROOT)$(libdir)/$(PACKAGE)/
+ 
+-	$(INSTALL) -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
+-	$(INSTALL) -m 644 doc/README					\
+-		   $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
+-	$(INSTALL) -m 644 doc/quilt.pdf doc/README.MAIL			\
+-		   $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
+-
+ 	$(INSTALL) -d $(BUILD_ROOT)$(mandir)/man1
+ 	$(INSTALL) -m 644 $(MAN1) $(BUILD_ROOT)$(mandir)/man1/
+ 
diff --git a/devel/quilt/files/patch-Makefile.in b/devel/quilt/files/patch-Makefile.in
deleted file mode 100644
index a08feac91256..000000000000
--- a/devel/quilt/files/patch-Makefile.in
+++ /dev/null
@@ -1,67 +0,0 @@
---- Makefile.in.orig	Fri Oct 20 10:56:34 2006
-+++ Makefile.in	Fri Oct 20 11:00:56 2006
-@@ -6,12 +6,12 @@
- prefix :=	@prefix@
- exec_prefix :=	@exec_prefix@
- bindir :=	@bindir@
--libdir :=	@libdir@
-+libdir :=	@datadir@/libexec
- datarootdir :=	@datarootdir@
--datadir :=	@datadir@
--docdir :=	@docdir@
-+datadir :=	@datadir@/libexec
-+docdir :=	$(prefix)/share/doc/
- mandir :=	@mandir@
--localedir :=	$(datadir)/locale
-+localedir :=	@datadir@/locale
- etcdir :=	$(subst /usr/etc,/etc,$(prefix)/etc)
- 
- INSTALL :=	@INSTALL@
-@@ -257,7 +257,7 @@
- 		-e 's:@VERSION''@:$(VERSION):g'				\
- 		-e 's:@RELEASE''@:$(RELEASE):g'				\
- 		-e 's:@LOCALEDIR''@:$(localedir):g'			\
--		-e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g'	\
-+		-e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE):g'		\
- 		$< > $@
- 	@$(if $(filter-out $<,$(NON_EXEC_IN)),chmod +x $@)
- 
-@@ -312,15 +312,14 @@
- 	$(INSTALL) -m 755 bin/patch-wrapper				\
- 		   $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper/patch
- endif
--	
- 	$(INSTALL) -d $(BUILD_ROOT)$(libdir)/$(PACKAGE)
- 	$(INSTALL) -m 755 $(LIB:%=lib/%) $(BUILD_ROOT)$(libdir)/$(PACKAGE)/
- 
--	$(INSTALL) -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
-+	$(INSTALL) -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)/
- 	$(INSTALL) -m 644 doc/README					\
--		   $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
-+		   $(BUILD_ROOT)$(docdir)/$(PACKAGE)/
- 	$(INSTALL) -m 644 doc/quilt.pdf doc/README.MAIL			\
--		   $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
-+		   $(BUILD_ROOT)$(docdir)/$(PACKAGE)/
- 
- 	$(INSTALL) -d $(BUILD_ROOT)$(mandir)/man1
- 	$(INSTALL) -m 644 $(MAN1) $(BUILD_ROOT)$(mandir)/man1/
-@@ -329,7 +328,7 @@
- 	$(INSTALL) -d $(BUILD_ROOT)$(etcdir)/bash_completion.d
- 	$(INSTALL) -m 644 bash_completion				\
- 		   $(BUILD_ROOT)$(etcdir)/bash_completion.d/quilt
--	$(INSTALL) -m 644 quilt.quiltrc $(BUILD_ROOT)$(etcdir)/
-+	$(INSTALL) -m 644 quilt.quiltrc $(BUILD_ROOT)$(etcdir)/quilt.quiltrc.sample
- 
- install-compat: install-compat1 $(COMPAT_SYMLINKS:%=install-compat-symlink-%)
- install-compat-symlink-% :: install-compat1
-@@ -355,8 +354,8 @@
- 	       $(patsubst %,$(BUILD_ROOT)$(mandir)/man1/%,		\
- 		   $(notdir $(MAN1)))					\
- 	       $(BUILD_ROOT)$(etcdir)/bash_completion.d/quilt		\
--	       $(BUILD_ROOT)$(etcdir)/quilt.quiltrc			\
--	       $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
-+	       $(BUILD_ROOT)$(etcdir)/quilt.quiltrc.sample		\
-+	       $(BUILD_ROOT)$(docdir)/$(PACKAGE)/
- 
- check: $(TESTS:test/%.test=test/.%.ok)
- check-all: $(TESTS:test/%.test=check-%)
diff --git a/devel/quilt/pkg-plist b/devel/quilt/pkg-plist
index aee7fb530d84..af2f7e6ba50e 100644
--- a/devel/quilt/pkg-plist
+++ b/devel/quilt/pkg-plist
@@ -1,63 +1,61 @@
-@unexec if cmp -s %D/etc/quilt.quiltrc %D/etc/quilt.quiltrc.sample; then rm -f %D/etc/quilt.quiltrc; fi
-etc/quilt.quiltrc.sample
-@exec if [ ! -f %D/etc/quilt.quiltrc ] ; then cp %D/%F %B/quilt.quiltrc; fi
 bin/guards
 bin/quilt
 etc/bash_completion.d/quilt
-share/libexec/quilt/add
-share/libexec/quilt/annotate
-share/libexec/quilt/applied
-share/libexec/quilt/backup-files
-share/libexec/quilt/compat/cp
-share/libexec/quilt/compat/date
-share/libexec/quilt/compat/getopt
-share/libexec/quilt/compat/patch
+etc/quilt.quiltrc
+lib/quilt/backup-files
+%%NLS%%share/locale/de/LC_MESSAGES/quilt.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/quilt.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/quilt.mo
+%%DATADIR%%/add
+%%DATADIR%%/annotate
+%%DATADIR%%/applied
+%%DATADIR%%/delete
+%%DATADIR%%/diff
+%%DATADIR%%/edit
+%%DATADIR%%/files
+%%DATADIR%%/fold
+%%DATADIR%%/fork
+%%DATADIR%%/graph
+%%DATADIR%%/grep
+%%DATADIR%%/header
+%%DATADIR%%/import
+%%DATADIR%%/mail
+%%DATADIR%%/new
+%%DATADIR%%/next
+%%DATADIR%%/patches
+%%DATADIR%%/pop
+%%DATADIR%%/previous
+%%DATADIR%%/push
+%%DATADIR%%/refresh
+%%DATADIR%%/remove
+%%DATADIR%%/rename
+%%DATADIR%%/series
+%%DATADIR%%/setup
+%%DATADIR%%/snapshot
+%%DATADIR%%/top
+%%DATADIR%%/unapplied
+%%DATADIR%%/upgrade
+%%DATADIR%%/scripts/parse-patch
+%%DATADIR%%/scripts/inspect
+%%DATADIR%%/scripts/dependency-graph
+%%DATADIR%%/scripts/edmail
+%%DATADIR%%/scripts/remove-trailing-ws
+%%DATADIR%%/scripts/patchfns
+%%DATADIR%%/wrapper/patch
+%%DATADIR%%/compat/getopt
+%%DATADIR%%/compat/cp
+%%DATADIR%%/compat/date
+%%DATADIR%%/compat/sed
+%%DATADIR%%/compat/patch
+%%DATADIR%%/compat/sendmail
 %%RPMBUILD%%share/libexec/quilt/compat/rpmbuild
-share/libexec/quilt/compat/sed
-share/libexec/quilt/compat/sendmail
-share/libexec/quilt/delete
-share/libexec/quilt/diff
-share/libexec/quilt/edit
-share/libexec/quilt/files
-share/libexec/quilt/fold
-share/libexec/quilt/fork
-share/libexec/quilt/graph
-share/libexec/quilt/grep
-share/libexec/quilt/header
-share/libexec/quilt/import
-share/libexec/quilt/mail
-share/libexec/quilt/new
-share/libexec/quilt/next
-share/libexec/quilt/patches
-share/libexec/quilt/pop
-share/libexec/quilt/previous
-share/libexec/quilt/push
-share/libexec/quilt/refresh
-share/libexec/quilt/remove
-share/libexec/quilt/rename
-share/libexec/quilt/scripts/dependency-graph
-share/libexec/quilt/scripts/edmail
-share/libexec/quilt/scripts/inspect
-share/libexec/quilt/scripts/parse-patch
-share/libexec/quilt/scripts/patchfns
-share/libexec/quilt/scripts/remove-trailing-ws
-share/libexec/quilt/series
-share/libexec/quilt/setup
-share/libexec/quilt/snapshot
-share/libexec/quilt/top
-share/libexec/quilt/unapplied
-share/libexec/quilt/upgrade
-share/libexec/quilt/wrapper/patch
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.MAIL
 %%PORTDOCS%%%%DOCSDIR%%/quilt.pdf
-%%NLS%%share/locale/de/LC_MESSAGES/quilt.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/quilt.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/quilt.mo
-@dirrm share/libexec/quilt/wrapper
-@dirrm share/libexec/quilt/scripts
-@dirrm share/libexec/quilt/compat
-@dirrm share/libexec/quilt
-@dirrm share/libexec
-@dirrm etc/bash_completion.d
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry etc/bash_completion.d
+@dirrmtry lib/quilt
+@dirrm %%DATADIR%%/compat
+@dirrm %%DATADIR%%/wrapper
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%