- Respect NOPORTDOCS and NOPORTEXAMPLES knobs as reported by itetcu@.

- Bump PORTREVISION.

PR:		ports/123999
Submitted by:	Marcus von Appen (maintainer)

2 files changed, 30 insertions, 7 deletions

diff --git a/x11-fm/emelfm2/Makefile b/x11-fm/emelfm2/Makefile
index cab2b9e93255..12f02469a851 100644
--- a/x11-fm/emelfm2/Makefile
+++ b/x11-fm/emelfm2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	emelfm2
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://emelfm2.net/rel/
 
@@ -31,6 +32,9 @@ OPTIONS=	DEBUG	"Enable debugging messages" off \
 		HAL	"Enable HAL support" off \
 		NLS	"Enable gettext support" on
 
+DOCFILES=	ACTIONS CONFIGURATION CREDITS GPL HACKING INSTALL LGPL NEWS \
+		README SPEC TODO USAGE WARNING help.txt
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_DEBUG)
@@ -87,4 +91,12 @@ post-patch:
  		${WRKSRC}/src/filesystem/e2_fs.c
 .endif
 
+.if !defined(NOPORTDOCS)
+post-install:
+	@${MKDIR} ${DOCSDIR}
+.for file in ${DOCFILES}
+	${INSTALL_DATA} ${WRKSRC}/docs/${file} ${DOCSDIR}
+.endfor
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/x11-fm/emelfm2/files/patch-Makefile b/x11-fm/emelfm2/files/patch-Makefile
index f1115b44bd48..16e7e26b40b8 100644
--- a/x11-fm/emelfm2/files/patch-Makefile
+++ b/x11-fm/emelfm2/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2008-02-09 23:22:11.000000000 +0100
-+++ Makefile	2008-04-04 21:47:47.000000000 +0200
-@@ -56,7 +56,7 @@
+--- Makefile.orig	2008-05-12 02:04:41.000000000 +0200
++++ Makefile	2008-05-26 08:45:53.000000000 +0200
+@@ -51,7 +51,7 @@
  
  #these are only used here for installation purposes
  BIN_DIR = $(PREFIX)/bin
@@ -9,7 +9,7 @@
  #as well as usage here, all in-code uses of these is assumed localised
  ifeq ($(DOCS_VERSION), 1)
  DOC_DIR = $(PREFIX)/share/doc/$(TARGET)-$(VERSION)
-@@ -217,7 +217,7 @@
+@@ -215,7 +215,7 @@
  
  lLDFLAGS = $(LDFLAGS)
  # -lrt needed for clock_gettime()
@@ -18,7 +18,7 @@
  ifeq ($(USE_FAM),1)
  lLIBS += -lfam
  endif
-@@ -234,6 +234,7 @@
+@@ -232,6 +232,7 @@
  lLIBS += -lacl
  endif
  ifeq ($(WITH_HAL),1)
@@ -26,7 +26,7 @@
  lLIBS += $(shell pkg-config --libs dbus-1 dbus-glib-1 hal hal-storage)
  endif
  # for vfs & gvfs development
-@@ -246,10 +247,10 @@
+@@ -244,10 +245,10 @@
  endif
  # should not need translation
  OPSYS := $(shell uname)
@@ -40,4 +40,15 @@
 +#endif
  
  .PHONY: all plugins install install_plugins uninstall uninstall_plugins doc \
-         clean deps marshals gettext i18n install_i18n uninstall_i18n \
+         clean deps i18n install_i18n uninstall_i18n \
+@@ -266,10 +267,6 @@
+ 	@for file in `ls icons/ |grep -v svn`; do \
+ 		install -m 644 icons/$$file $(ICON_DIR); \
+ 	done
+-	@install -d $(DOC_DIR)
+-	@for file in `ls docs/ |grep -v svn |grep -v desktop_environment |grep -v api |grep -v $(TARGET).1`; do \
+-		install -m 644 docs/$$file $(DOC_DIR); \
+-	done
+ 	@install -d $(MAN_DIR)
+ 	@install -m 644 docs/$(TARGET).1 $(MAN_DIR);
+ #	@bzip2 -f $(MAN_DIR)/$(TARGET).1;