From 2098f0632c45e2fe9180133d027ff66b00cb2dec Mon Sep 17 00:00:00 2001
From: Yen-Ming Lee <leeym@FreeBSD.org>
Date: Sat, 12 Feb 2005 18:34:36 +0000
Subject: - fix wrong pkg-plist and unbreak this port - add some cosmetic fixes
 to make portlint happier

---
 mail/zmailer/Makefile       | 25 ++++++++++++-------------
 mail/zmailer/files/patch-aa |  3 +--
 mail/zmailer/pkg-plist      |  7 +++++++
 3 files changed, 20 insertions(+), 15 deletions(-)

(limited to 'mail')

diff --git a/mail/zmailer/Makefile b/mail/zmailer/Makefile
index 38399b9782c6..60f1f87de847 100644
--- a/mail/zmailer/Makefile
+++ b/mail/zmailer/Makefile
@@ -17,22 +17,20 @@ CONFLICTS=	courier-0.* postfix-1.* postfix-2.* sendmail-8.* sendmail-*-8.* smail
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 
-BROKEN=		Incomplete pkg-plist
-
-.include <bsd.port.pre.mk>
-
-.if ( ${PERL_LEVEL} < 500600 )
-IGNORE=	"This port requires perl 5.006 or better"
-.endif
-
 .if defined(WITH_SSL)
-USE_OPENSSL=	YES
+USE_OPENSSL=	yes
 CONFIGURE_ARGS=	--with-openssl
 .else
 CONFIGURE_ARGS=	--without-openssl
 .endif
 
-.if ( ${OSVERSION} >= 500000 )
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500600
+IGNORE=	"This port requires perl 5.006 or better"
+.endif
+
+.if ${OSVERSION} >= 500000
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-EAI_NODATA
 .endif
 
@@ -56,11 +54,12 @@ CONFIGURE_ARGS+=--prefix=${PREFIX}/ \
 
 MAN1=		rmail.1zm vacation.1zm zmailer.1zm zmsh.1zm mboxpath.1zm mailq.1zm \
 		mailrm.1zm newaliases.1zm
-MAN3=		zmailer.3zm
-MAN5=		aliases.5zm
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3=		ZMailer::mailq.3
+MAN5=		aliases.5zm mailq-m.5zm zdbases.conf.5zm zmailer.conf.5zm
 MAN8=		hold.8zm router.8zm scheduler.8zm sendmail.8zm sm.8zm smtp.8zm \
 		smtpserver.8zm mprobe.8zm expirer.8zm errormail.8zm mailbox.8zm \
-		manual-expirer.8zm
+		manual-expirer.8zm manual-rerouter.8zm reroute.8zm
 
 PKGMESSAGE=	${WRKDIR}/MESSAGE
 PKGINSTALL=	${WRKDIR}/pkg-install
diff --git a/mail/zmailer/files/patch-aa b/mail/zmailer/files/patch-aa
index fbaa6b694939..7a83abb03cf9 100644
--- a/mail/zmailer/files/patch-aa
+++ b/mail/zmailer/files/patch-aa
@@ -25,11 +25,10 @@
  #include <sys/mount.h>
  
  _ACEOF
-@@ -20539,6 +20541,7 @@
+@@ -20539,5 +20541,6 @@
  /* end confdefs.h.  */
  
  #include <sys/fs_types.h>
 +#include <sys/param.h>
  #include <sys/mount.h>
  _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
diff --git a/mail/zmailer/pkg-plist b/mail/zmailer/pkg-plist
index dea7599558c3..6c68820112df 100644
--- a/mail/zmailer/pkg-plist
+++ b/mail/zmailer/pkg-plist
@@ -318,7 +318,14 @@ sbin/ta/reroute
 sbin/ta/sm
 sbin/ta/smtp
 include/zmailer.h
+man/man3/zmailer.3zm
+lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/perllocal.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/ZMailer/mailq/.packlist
+%%SITE_PERL%%/ZMailer/mailq.pm
 @dirrm sbin/ta
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZMailer/mailq
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZMailer
+@dirrm %%SITE_PERL%%/ZMailer
 @cwd /var/spool
 @dirrm postoffice/deferred
 @dirrm postoffice/freezer
-- 
cgit v1.2.3