- Install PostScript documentation, too

- Respect NOPORTDOCS
- Use INSTALL_DATA instead of INSTALL_MAN when installing docs
- Use DOCSDIR shortcut
- Make installation a little bit more vebose
- Redo patch a bit better than my last commit

Submitted by:   Sergei Kolobov <sergei@kolobov.com>
PR:             ports/42693

3 files changed, 29 insertions, 24 deletions

diff --git a/mail/bulk_mailer/Makefile b/mail/bulk_mailer/Makefile
index 1fd731188102..403569fbef41 100644
--- a/mail/bulk_mailer/Makefile
+++ b/mail/bulk_mailer/Makefile
@@ -20,10 +20,12 @@ ALL_TARGET=	bulk_mailer
 MAN1=		bulk_mailer.1
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/bulk_mailer ${PREFIX}/bin/bulk_mailer
-	@ ${MKDIR} ${PREFIX}/share/doc/bulk_mailer
-	@ ${INSTALL_MAN} ${WRKSRC}/bulk_mailer.README \
-		${PREFIX}/share/doc/bulk_mailer/README
-	@ ${INSTALL_MAN} ${WRKSRC}/bulk_mailer.1 ${PREFIX}/man/man1/bulk_mailer.1
+	${INSTALL_PROGRAM} ${WRKSRC}/bulk_mailer ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/bulk_mailer.1 ${PREFIX}/man/man1
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/bulk_mailer.README ${DOCSDIR}/README
+	${INSTALL_DATA} ${WRKSRC}/bulk_mailer.ps ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/mail/bulk_mailer/files/patch-ab b/mail/bulk_mailer/files/patch-ab
index a414f1eb09a0..57befc3fa769 100644
--- a/mail/bulk_mailer/files/patch-ab
+++ b/mail/bulk_mailer/files/patch-ab
@@ -1,5 +1,5 @@
---- bulk_mailer.c.orig	Wed May 24 12:34:33 2000
-+++ bulk_mailer.c	Sat Sep 28 22:17:45 2002
+--- bulk_mailer.c.orig	Wed May 24 23:34:33 2000
++++ bulk_mailer.c	Thu Sep 12 17:32:58 2002
 @@ -95,11 +95,16 @@
  #include <sysexits.h>
  #include <errno.h>
@@ -17,17 +17,19 @@
  #ifndef PIPECOMMAND
  #define PIPECOMMAND "/usr/lib/sendmail -bs %s"
  #endif
-@@ -122,9 +127,6 @@
+@@ -122,9 +127,11 @@
  char *strchr();
  char *strrchr();
  #endif
--char *malloc ();
--char *realloc ();
--char *mktemp ();
++#ifndef __FreeBSD__
+ char *malloc ();
+ char *realloc ();
+ char *mktemp ();
++#endif
  
  /*
   * (default) max different domains per envelope.
-@@ -296,6 +298,7 @@
+@@ -296,6 +303,7 @@
   * memory, appending a NUL to the copy.
   */
  
@@ -35,7 +37,7 @@
  static char *
  strndup (str, len)
  char *str;
-@@ -307,6 +310,7 @@
+@@ -307,6 +315,7 @@
      result[len] = '\0';
      return result;
  }
@@ -43,7 +45,7 @@
  
  /*
   * sort by case-folded reversed domain
-@@ -337,15 +341,15 @@
+@@ -337,15 +346,15 @@
  {
      char *at;
      char *ptr;
@@ -62,7 +64,7 @@
  	
  	num_addr_slots += 1000;
  	if (address_list == NULL)
-@@ -571,12 +575,12 @@
+@@ -571,12 +580,12 @@
  open_envelope ()
  {
      FILE *fp;
@@ -77,7 +79,7 @@
  
  	if ((fp = popen (command_buf, "w")) == NULL) {
  	    fprintf (stderr, "can't open pipe to sendmail: %s\n",
-@@ -927,7 +931,7 @@
+@@ -927,7 +936,7 @@
  {
      struct tm gmt;
      struct tm *lt;
@@ -86,7 +88,7 @@
      int gmtoff;
      char sign;
      static char *months[] = {
-@@ -960,7 +964,7 @@
+@@ -960,7 +969,7 @@
  	sign = '-';
  	gmtoff = -gmtoff;
      }
@@ -95,7 +97,7 @@
  	     wdays[lt->tm_wday], lt->tm_mday, months[lt->tm_mon], lt->tm_year + 1900,
  	     lt->tm_hour, lt->tm_min, lt->tm_sec,
  	     sign,
-@@ -985,7 +989,7 @@
+@@ -985,7 +994,7 @@
  copy_message (out, in)
  FILE *out, *in;
  {
@@ -104,7 +106,7 @@
      char linebuf[32*1024];
      int has_valid_approved_hdr = 0;
      int has_resent_to_hdr = 0;
-@@ -1218,14 +1222,14 @@
+@@ -1218,14 +1227,14 @@
       */
      lines = 0;
      while (fgets (linebuf, sizeof (linebuf), in) != NULL) {
@@ -121,7 +123,7 @@
  	    saw_command = 1;
  	++lines;
  	fputs (linebuf, out);
-@@ -1326,13 +1330,14 @@
+@@ -1326,13 +1335,14 @@
  int argc;
  char *argv[];
  {
@@ -139,7 +141,7 @@
  
      while (argc > 1 && (*argv[1] == '-' || *argv[1] == '+')) {
  	if (strcmp (argv[1], "-comment") == 0 && argc > 2) {
-@@ -1513,8 +1518,9 @@
+@@ -1513,8 +1523,9 @@
  	exit (EX_OSFILE);
      }
  
@@ -151,7 +153,7 @@
      switch (copy_message (tmp, stdin)) {
  
      case HAS_EMBEDDED_COMMAND:
-@@ -1592,4 +1598,5 @@
+@@ -1592,4 +1603,5 @@
  	
  	exit (EX_OK);
      }
diff --git a/mail/bulk_mailer/pkg-plist b/mail/bulk_mailer/pkg-plist
index a091ab012add..8b27eeeb9484 100644
--- a/mail/bulk_mailer/pkg-plist
+++ b/mail/bulk_mailer/pkg-plist
@@ -1,3 +1,4 @@
 bin/bulk_mailer
-share/doc/bulk_mailer/README
-@dirrm share/doc/bulk_mailer
+%%PORTDOCS%%share/doc/bulk_mailer/README
+%%PORTDOCS%%share/doc/bulk_mailer/bulk_mailer.ps
+%%PORTDOCS%%@dirrm share/doc/bulk_mailer