- Update to 150

PR:		144589
Submitted by:	Ports Fury

4 files changed, 22 insertions, 30 deletions

diff --git a/mail/im/Makefile b/mail/im/Makefile
index 85a5def4bc48..aa0ce601a14f 100644
--- a/mail/im/Makefile
+++ b/mail/im/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	im
-PORTVERSION=	149
+PORTVERSION=	150
 CATEGORIES=	mail
 MASTER_SITES=	http://tats.haun.org/im/ \
 		${MASTER_SITE_PORTS_JP}
@@ -16,8 +16,9 @@ COMMENT=	Set of user interfaces of Email and NetNews
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--libdir=${PREFIX}/etc
-MAKE_ARGS=	prefix=${PREFIX} imlibdir=${PREFIX}/etc/im
+CONFIGURE_ARGS=	--libdir=${PREFIX}/etc \
+		--with-hostname=_domain_of_your_mail_address_
+MAKE_ARGS=	prefix=${PREFIX} imlibdir=${ETCDIR}
 
 # Use RPOP instead of APOP
 .if defined(WITH_RPOP)
@@ -30,6 +31,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/00* ${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/man
 	${INSTALL_DATA} ${WRKSRC}/man/* ${DOCSDIR}/man
+.endif
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/dot.im/* ${EXAMPLESDIR}
 .endif
diff --git a/mail/im/distinfo b/mail/im/distinfo
index 2722ea1b5271..e0240db15746 100644
--- a/mail/im/distinfo
+++ b/mail/im/distinfo
@@ -1,3 +1,3 @@
-MD5 (im-149.tar.gz) = f18e3aa0cd1e2d16fba0993727ff9fa5
-SHA256 (im-149.tar.gz) = ef59daad89ee379846db7c4b04ca8db4bb8eaef869ea5dcfc5c66a7df62d0134
-SIZE (im-149.tar.gz) = 221971
+MD5 (im-150.tar.gz) = d5f4a89fc81866379a83d4980a4e5184
+SHA256 (im-150.tar.gz) = 7086a2ab5f591263ac88d68ec81f76c7cb23aa0a09037db16c771bf1b2660c93
+SIZE (im-150.tar.gz) = 267337
diff --git a/mail/im/files/patch-aa b/mail/im/files/patch-aa
deleted file mode 100644
index db4f235f36fd..000000000000
--- a/mail/im/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in~	Tue Feb 25 01:51:43 2003
-+++ configure.in	Thu Apr 24 11:39:22 2003
-@@ -125,7 +125,7 @@
- [im_hostname="${withval}"])
- if test "x$im_hostname" = 'x'; then
-   AC_MSG_CHECKING([domain for mail-address])
--  im_hostname=`hostname`
-+  im_hostname="_domain_of_your_mail_address_"
-   AC_MSG_RESULT([$im_hostname])
- fi
- 
diff --git a/mail/im/pkg-plist b/mail/im/pkg-plist
index 0f1492d9d697..3723073bfd0e 100644
--- a/mail/im/pkg-plist
+++ b/mail/im/pkg-plist
@@ -19,7 +19,7 @@ bin/imsetup
 bin/imsort
 bin/imstore
 bin/imtar
-etc/im/SiteConfig
+%%ETCDIR%%/SiteConfig
 @unexec if [ -f %B/SiteConfig.new ]; then rm -f %B/SiteConfig.new; fi
 lib/IM/Address.pm
 lib/IM/Alias.pm
@@ -72,18 +72,18 @@ lib/IM/Util.pm
 %%PORTDOCS%%%%DOCSDIR%%/man/imsort.jis
 %%PORTDOCS%%%%DOCSDIR%%/man/imstore.jis
 %%PORTDOCS%%%%DOCSDIR%%/man/imtar.jis
-%%PORTDOCS%%%%EXAMPLESDIR%%/Config
-%%PORTDOCS%%%%EXAMPLESDIR%%/Petnames
-%%PORTDOCS%%%%EXAMPLESDIR%%/get.sbr
-%%PORTDOCS%%%%EXAMPLESDIR%%/get.sbr.refile
-%%PORTDOCS%%%%EXAMPLESDIR%%/getchk.sbr
-%%PORTDOCS%%%%EXAMPLESDIR%%/getchk.sbr.postpet
-%%PORTDOCS%%%%EXAMPLESDIR%%/password
-%%PORTDOCS%%%%EXAMPLESDIR%%/scan.sbr
-%%PORTDOCS%%%%EXAMPLESDIR%%/scan.sbr.sample1
-%%PORTDOCS%%%%EXAMPLESDIR%%/scan.sbr.sample2
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Config
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Petnames
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/get.sbr
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/get.sbr.refile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getchk.sbr
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getchk.sbr.postpet
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/password
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scan.sbr
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scan.sbr.sample1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scan.sbr.sample2
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/man
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/IM
-@dirrm etc/im
+@dirrm %%ETCDIR%%