1: Stagify.

2: do not install regexp.3, bump version.

8 files changed, 100 insertions, 16 deletions

diff --git a/x11-fm/asfiles/Makefile b/x11-fm/asfiles/Makefile
index 70a4b99bcc8b..51c9a1cb2059 100644
--- a/x11-fm/asfiles/Makefile
+++ b/x11-fm/asfiles/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	asfiles
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fm afterstep windowmaker
 MASTER_SITES=	${MASTER_SITE_AFTERSTEP}
 MASTER_SITE_SUBDIR=	apps/ASFiles
@@ -18,17 +18,15 @@ USES=		perl5
 GNU_CONFIGURE=	yes
 USE_XORG=	xpm
 USE_PERL5=	build
-MAN1=	files.1
-MAN3=	regexp.3
 
 CONFIGURE_ARGS+=--with-dnd-inc=${LOCALBASE}/include \
 		--with-dnd-lib=${LOCALBASE}/lib
 
-NO_STAGE=	yes
+post-patch:
+	${REINPLACE_CMD} -e 's|%%PREFIX%%|${LOCALBASE}|g' \
+		${WRKSRC}/src/Files.ad
+
 post-install:
-	${PATCH} ${PATCH_ARGS} < ${FILESDIR}/last-patch-aa
-	${INSTALL_DATA} ${WRKSRC}/src/Files.ad ${PREFIX}/lib/X11/app-defaults/
-	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	${MV} ${WRKSRC}/src/Files.ad.orig ${WRKSRC}/src/Files.ad
+	${INSTALL_DATA} ${WRKSRC}/src/Files.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/
 
 .include <bsd.port.mk>
diff --git a/x11-fm/asfiles/files/last-patch-aa b/x11-fm/asfiles/files/patch-Files.ad
index 0518374bec5e..0518374bec5e 100644
--- a/x11-fm/asfiles/files/last-patch-aa
+++ b/x11-fm/asfiles/files/patch-Files.ad
diff --git a/x11-fm/asfiles/files/patch-bitmaps__Makefile.in b/x11-fm/asfiles/files/patch-bitmaps__Makefile.in
new file mode 100644
index 000000000000..f4497f2f9f9f
--- /dev/null
+++ b/x11-fm/asfiles/files/patch-bitmaps__Makefile.in
@@ -0,0 +1,18 @@
+--- bitmaps/Makefile.in.orig	2014-08-13 10:06:22.257001172 +0800
++++ bitmaps/Makefile.in	2014-08-13 10:06:44.483997380 +0800
+@@ -100,12 +100,12 @@ Makefile: $(top_builddir)/config.status 
+ 
+ install-bitmapDATA: $(bitmap_DATA)
+ 	$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(bitmapdir)
++	$(mkinstalldirs) $(DESTDIR)$(bitmapdir)
+ 	list="$(bitmap_DATA)"; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
+-	    $(INSTALL_DATA) $(srcdir)/$$p $(bitmapdir)/$$p; \
++	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(bitmapdir)/$$p; \
+ 	  else if test -f $$p; then \
+-	    $(INSTALL_DATA) $$p $(bitmapdir)/$$p; \
++	    $(INSTALL_DATA) $$p $(DESTDIR)$(bitmapdir)/$$p; \
+ 	  fi; fi; \
+ 	done
+ 
diff --git a/x11-fm/asfiles/files/patch-pixmaps__Makefile.in b/x11-fm/asfiles/files/patch-pixmaps__Makefile.in
new file mode 100644
index 000000000000..b81a0937896a
--- /dev/null
+++ b/x11-fm/asfiles/files/patch-pixmaps__Makefile.in
@@ -0,0 +1,18 @@
+--- pixmaps/Makefile.in.orig	2014-08-13 10:05:34.480008364 +0800
++++ pixmaps/Makefile.in	2014-08-13 10:05:56.990002894 +0800
+@@ -75,12 +75,12 @@ Makefile: $(top_builddir)/config.status 
+ 
+ install-pixmapDATA: $(pixmap_DATA)
+ 	$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(pixmapdir)
++	$(mkinstalldirs) $(DESTDIR)$(pixmapdir)
+ 	list="$(pixmap_DATA)"; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
+-	    $(INSTALL_DATA) $(srcdir)/$$p $(pixmapdir)/$$p; \
++	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p; \
+ 	  else if test -f $$p; then \
+-	    $(INSTALL_DATA) $$p $(pixmapdir)/$$p; \
++	    $(INSTALL_DATA) $$p $(DESTDIR)$(pixmapdir)/$$p; \
+ 	  fi; fi; \
+ 	done
+ 
diff --git a/x11-fm/asfiles/files/patch-src__Makefile.in b/x11-fm/asfiles/files/patch-src__Makefile.in
new file mode 100644
index 000000000000..626fe2b03562
--- /dev/null
+++ b/x11-fm/asfiles/files/patch-src__Makefile.in
@@ -0,0 +1,46 @@
+--- src/Makefile.in.orig	2014-08-13 10:01:12.336035299 +0800
++++ src/Makefile.in	2014-08-13 10:03:06.196001156 +0800
+@@ -118,10 +118,10 @@ maintainer-clean-binPROGRAMS:
+ 
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(bindir)
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	list="$(bin_PROGRAMS)"; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
++	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -147,12 +147,12 @@ files: $(files_OBJECTS) $(files_DEPENDEN
+ 	$(LINK) $(files_OBJECTS) $(files_LDADD) $(LIBS)
+ install-man: $(MANS)
+ 	$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(mandir)/man1
++	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
+ 	sect=1;				\
+ 	inst=`echo "files" | sed '$(transform)'`.1; \
+ 	if test -f $(srcdir)/files.1; then file=$(srcdir)/files.1; \
+ 	else file=files.1; fi; \
+-	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
++	$(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$$sect/$$inst
+ 
+ uninstall-man:
+ 	inst=`echo "files" | sed '$(transform)'`.1; \
+@@ -161,12 +161,12 @@ uninstall-man:
+ 
+ install-offixDATA: $(offix_DATA)
+ 	$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(offixdir)
++	$(mkinstalldirs) $(DESTDIR)$(offixdir)
+ 	list="$(offix_DATA)"; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
+-	    $(INSTALL_DATA) $(srcdir)/$$p $(offixdir)/$$p; \
++	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(offixdir)/$$p; \
+ 	  else if test -f $$p; then \
+-	    $(INSTALL_DATA) $$p $(offixdir)/$$p; \
++	    $(INSTALL_DATA) $$p $(DESTDIR)$(offixdir)/$$p; \
+ 	  fi; fi; \
+ 	done
+ 
diff --git a/x11-fm/asfiles/files/patch-src__regexp__Makefile.in b/x11-fm/asfiles/files/patch-src__regexp__Makefile.in
new file mode 100644
index 000000000000..13471c0c14c9
--- /dev/null
+++ b/x11-fm/asfiles/files/patch-src__regexp__Makefile.in
@@ -0,0 +1,11 @@
+--- src/regexp/Makefile.in.orig	2014-08-13 10:08:01.168979415 +0800
++++ src/regexp/Makefile.in	2014-08-13 10:08:19.427980054 +0800
+@@ -174,7 +174,7 @@ install-exec: 
+ install-data: install-man
+ 	$(NORMAL_INSTALL)
+ 
+-install: install-exec install-data all
++install: install-exec all
+ 	@:
+ 
+ uninstall: uninstall-man
diff --git a/x11-fm/asfiles/pkg-install b/x11-fm/asfiles/pkg-install
deleted file mode 100644
index 38cb5db7b01e..000000000000
--- a/x11-fm/asfiles/pkg-install
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-ADDIR=${PKG_PREFIX}/lib/X11/app-defaults
-
-if [ X"$2" = "XPOST-INSTALL" ]; then
-    perl -pe 's/%%PREFIX%%/$ENV{PKG_PREFIX}/g' ${ADDIR}/Files.ad > ${ADDIR}/Files
-fi
diff --git a/x11-fm/asfiles/pkg-plist b/x11-fm/asfiles/pkg-plist
index f0274114e840..31665df9d3a2 100644
--- a/x11-fm/asfiles/pkg-plist
+++ b/x11-fm/asfiles/pkg-plist
@@ -221,7 +221,7 @@ include/pixmaps/Workshop.xpm
 include/pixmaps/interface.xpm
 include/pixmaps/PDFOmni.xpm
 lib/X11/app-defaults/Files.ad
-@unexec rm -rf %B/Files
+man/man1/files.1.gz
 share/OffiX/FilesMagic
 share/OffiX/Filesrc
 @dirrm share/OffiX