Install manpages with INSTALL_MAN

Noticed by:	Roman Neuhauser <roman@bellavista.cz>

3 files changed, 47 insertions, 5 deletions

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index ef9aa04e5ba0..0efb59fcf563 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -160,14 +160,14 @@ EXTRA_DOCS=	README INSTALL AUTHORS imap/ChangeLog
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's/^	imapd.cnf pop3d.cnf //' \
-		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \
 		${WRKSRC}/liblock/configure
 	@${REINPLACE_CMD} -e 's|$$VPOPMAILLIBS|& -lcrypt|g' \
 		${WRKSRC}/authlib/configure
 	@${REINPLACE_CMD} -e 's|^@INSTALLAUTHMODULES@$$|& @AUTHMODULES@|' \
 		${WRKSRC}/authlib/installlist.in
+	@${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \
+		${WRKSRC}/Makefile.in ${WRKSRC}/authlib/Makefile.in
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/authlib/authtest ${PREFIX}/bin/
diff --git a/mail/courier-imap/files/patch-Makefile.in b/mail/courier-imap/files/patch-Makefile.in
index 0a9c33f1e5b0..e442e33b6e2c 100644
--- a/mail/courier-imap/files/patch-Makefile.in
+++ b/mail/courier-imap/files/patch-Makefile.in
@@ -1,6 +1,37 @@
---- Makefile.in.orig	Mon Mar 24 16:31:17 2003
-+++ Makefile.in	Mon Mar 24 16:32:01 2003
-@@ -872,6 +872,7 @@
+--- Makefile.in.orig	Wed Jul  2 02:30:46 2003
++++ Makefile.in	Sun Jul 20 14:09:49 2003
+@@ -132,7 +132,7 @@
+ EXTRA_DIST = 00README.NOW.OR.SUFFER README README.cygwin automake.fix COPYING.GPL sysconftool
+ 
+ sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
+-	imapd.cnf pop3d.cnf quotawarnmsg.example
++	quotawarnmsg.example
+ 
+ libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
+ 
+@@ -351,8 +351,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
+-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
++	  echo " %%INSTALL_MAN%% $$file $(DESTDIR)$(man1dir)/$$inst"; \
++	  %%INSTALL_MAN%% $$file $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ uninstall-man1:
+ 	@$(NORMAL_UNINSTALL)
+@@ -394,8 +394,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
+-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
++	  echo " %%INSTALL_MAN%% $$file $(DESTDIR)$(man8dir)/$$inst"; \
++	  %%INSTALL_MAN%% $$file $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ uninstall-man8:
+ 	@$(NORMAL_UNINSTALL)
+@@ -873,6 +873,7 @@
  
  install-data-local: install-man
  	for f in `cat authlib/modulelist ; . authlib/authdaemonrc ; echo $$authmodulelist ` ; do \
diff --git a/mail/courier-imap/files/patch-authlib::Makefile.in b/mail/courier-imap/files/patch-authlib::Makefile.in
new file mode 100644
index 000000000000..ed065c7d873e
--- /dev/null
+++ b/mail/courier-imap/files/patch-authlib::Makefile.in
@@ -0,0 +1,11 @@
+--- authlib/Makefile.in.orig	Sun Jul 20 12:01:18 2003
++++ authlib/Makefile.in	Sun Jul 20 12:56:12 2003
+@@ -1341,7 +1341,7 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(man7dir) ; \
+ 	for f in $(man_MANS) "" ; do \
+ 		test "$$f" = "" && continue ; \
+-		$(INSTALL_DATA) $$f $(DESTDIR)$(man7dir) ; done ; \
++		%%INSTALL_MAN%% $$f $(DESTDIR)$(man7dir) ; done ; \
+ 	cd $(DESTDIR)$(man7dir) || exit 1 ; \
+ 		for f in $(man_LINKS) "" ; do \
+ 			test "$$f" = "" && continue ; \