4 files changed, 18 insertions, 16 deletions

diff --git a/devel/quilt/Makefile b/devel/quilt/Makefile
index 61d3906c7055..e636e41858ae 100644
--- a/devel/quilt/Makefile
+++ b/devel/quilt/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	quilt
-PORTVERSION=	0.46
-PORTREVISION=	5
+PORTVERSION=	0.47
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	quilt
@@ -28,11 +27,12 @@ USE_PERL5=	yes
 OPTIONS=	RPMBUILD "rpmbuild support" off
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-sed=${LOCALBASE}/bin/gsed --without-getopt --with-patch=${LOCALBASE}/bin/gpatch
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+CONFIGURE_ARGS=	--with-sed=${LOCALBASE}/bin/gsed \
+		--without-getopt \
+		--with-patch=${LOCALBASE}/bin/gpatch
 
 MAN1=		guards.1 quilt.1
-DOCS=		README README.MAIL quilt.pdf
+PORTDOCS=	README README.MAIL quilt.pdf
 
 .include <bsd.port.pre.mk>
 
@@ -57,4 +57,8 @@ CONFIGURE_ARGS+=	--disable-nls
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-Makefile.in
 .endif
 
+post-extract:
+	@${REINPLACE_CMD} -e 's|$$(docdir)/$$(PACKAGE)-$$(VERSION)|$$(docdir)/$$(PACKAGE)|g' \
+		${WRKSRC}/Makefile.in
+
 .include <bsd.port.post.mk>
diff --git a/devel/quilt/distinfo b/devel/quilt/distinfo
index 0d2259167349..a8712d24cf8f 100644
--- a/devel/quilt/distinfo
+++ b/devel/quilt/distinfo
@@ -1,3 +1,3 @@
-MD5 (quilt-0.46.tar.gz) = 4508546d1ed0257ef7c128b6121b7208
-SHA256 (quilt-0.46.tar.gz) = 47bf030565bb462840db694acc183273455714028c74974c5b3a3bd4ad29ad89
-SIZE (quilt-0.46.tar.gz) = 403984
+MD5 (quilt-0.47.tar.gz) = d33d2442bd34387260b1c1db3e623af0
+SHA256 (quilt-0.47.tar.gz) = 100a6a7d5012d36590e607ebc87535f62318cfe7368f4cd44cacb94a2cf938a2
+SIZE (quilt-0.47.tar.gz) = 421731
diff --git a/devel/quilt/files/extra-patch-Makefile.in b/devel/quilt/files/extra-patch-Makefile.in
index 947a7780e108..bc6f65a65658 100644
--- a/devel/quilt/files/extra-patch-Makefile.in
+++ b/devel/quilt/files/extra-patch-Makefile.in
@@ -4,11 +4,11 @@
  	$(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/
diff --git a/devel/quilt/pkg-plist b/devel/quilt/pkg-plist
index af2f7e6ba50e..a7c47111f4d1 100644
--- a/devel/quilt/pkg-plist
+++ b/devel/quilt/pkg-plist
@@ -3,6 +3,7 @@ bin/quilt
 etc/bash_completion.d/quilt
 etc/quilt.quiltrc
 lib/quilt/backup-files
+share/emacs/site-lisp/quilt.el
 %%NLS%%share/locale/de/LC_MESSAGES/quilt.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/quilt.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/quilt.mo
@@ -27,8 +28,8 @@ lib/quilt/backup-files
 %%DATADIR%%/previous
 %%DATADIR%%/push
 %%DATADIR%%/refresh
-%%DATADIR%%/remove
 %%DATADIR%%/rename
+%%DATADIR%%/revert
 %%DATADIR%%/series
 %%DATADIR%%/setup
 %%DATADIR%%/snapshot
@@ -42,6 +43,7 @@ lib/quilt/backup-files
 %%DATADIR%%/scripts/remove-trailing-ws
 %%DATADIR%%/scripts/patchfns
 %%DATADIR%%/wrapper/patch
+%%DATADIR%%/compat/awk
 %%DATADIR%%/compat/getopt
 %%DATADIR%%/compat/cp
 %%DATADIR%%/compat/date
@@ -49,10 +51,6 @@ lib/quilt/backup-files
 %%DATADIR%%/compat/patch
 %%DATADIR%%/compat/sendmail
 %%RPMBUILD%%share/libexec/quilt/compat/rpmbuild
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.MAIL
-%%PORTDOCS%%%%DOCSDIR%%/quilt.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry etc/bash_completion.d
 @dirrmtry lib/quilt
 @dirrm %%DATADIR%%/compat