summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/heirloom-mailx/Makefile18
-rw-r--r--mail/heirloom-mailx/distinfo4
-rw-r--r--mail/nail/Makefile18
-rw-r--r--mail/nail/distinfo4
4 files changed, 28 insertions, 16 deletions
diff --git a/mail/heirloom-mailx/Makefile b/mail/heirloom-mailx/Makefile
index 306bc7945586..490fd781ffb8 100644
--- a/mail/heirloom-mailx/Makefile
+++ b/mail/heirloom-mailx/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: nail
-# Date created: 20 October 2000
-# Whom: Kris Kennaway <kris@FreeBSD.org>
+# Date created: 20 October 2000
+# Whom: Kris Kennaway <kris@FreeBSD.org>
#
# $FreeBSD$
#
PORTNAME= nail
-PORTVERSION= 11.24
+PORTVERSION= 11.25
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= ehaupt@critical.ch
COMMENT= BSD mail utility with MIME extensions
USE_BZIP2= yes
@@ -25,14 +25,20 @@ MAKE_ARGS= PREFIX="${PREFIX}" \
IPv6="-DHAVE_IPv6_FUNCS"
MAN1= nail.1
-PLIST_FILES= bin/nail etc/nail.rc
+PLIST_FILES= bin/nail \
+ "@unexec if cmp -s %D/etc/nail.rc %D/etc/nail.rc.default; then rm -f %D/etc/nail.rc; fi " \
+ "etc/nail.rc.default" \
+ "@exec [ -f %B/nail.rc ] || cp %B/%f %B/nail.rc"
CPPFLAGS= -I${LOCALBASE}/include
LDFLAGS= -L${LOCALBASE}/lib
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/nail ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/nail.rc ${PREFIX}/etc
${INSTALL_MAN} ${WRKSRC}/nail.1 ${MANPREFIX}/man/man1
+ ${INSTALL_DATA} ${WRKSRC}/nail.rc ${PREFIX}/etc/nail.rc.default
+.if !exists(${PREFIX}/etc/nail.rc)
+ ${INSTALL_DATA} ${WRKSRC}/nail.rc ${PREFIX}/etc
+.endif
.include <bsd.port.mk>
diff --git a/mail/heirloom-mailx/distinfo b/mail/heirloom-mailx/distinfo
index bcc263058dd1..c61e85ea880b 100644
--- a/mail/heirloom-mailx/distinfo
+++ b/mail/heirloom-mailx/distinfo
@@ -1,2 +1,2 @@
-MD5 (nail-11.24.tar.bz2) = e127cdbba1220a45f6f1f463ac4b4fd1
-SIZE (nail-11.24.tar.bz2) = 266691
+MD5 (nail-11.25.tar.bz2) = 54f42db31911d734fcf37a89b72d4df7
+SIZE (nail-11.25.tar.bz2) = 267959
diff --git a/mail/nail/Makefile b/mail/nail/Makefile
index 306bc7945586..490fd781ffb8 100644
--- a/mail/nail/Makefile
+++ b/mail/nail/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: nail
-# Date created: 20 October 2000
-# Whom: Kris Kennaway <kris@FreeBSD.org>
+# Date created: 20 October 2000
+# Whom: Kris Kennaway <kris@FreeBSD.org>
#
# $FreeBSD$
#
PORTNAME= nail
-PORTVERSION= 11.24
+PORTVERSION= 11.25
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= ehaupt@critical.ch
COMMENT= BSD mail utility with MIME extensions
USE_BZIP2= yes
@@ -25,14 +25,20 @@ MAKE_ARGS= PREFIX="${PREFIX}" \
IPv6="-DHAVE_IPv6_FUNCS"
MAN1= nail.1
-PLIST_FILES= bin/nail etc/nail.rc
+PLIST_FILES= bin/nail \
+ "@unexec if cmp -s %D/etc/nail.rc %D/etc/nail.rc.default; then rm -f %D/etc/nail.rc; fi " \
+ "etc/nail.rc.default" \
+ "@exec [ -f %B/nail.rc ] || cp %B/%f %B/nail.rc"
CPPFLAGS= -I${LOCALBASE}/include
LDFLAGS= -L${LOCALBASE}/lib
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/nail ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/nail.rc ${PREFIX}/etc
${INSTALL_MAN} ${WRKSRC}/nail.1 ${MANPREFIX}/man/man1
+ ${INSTALL_DATA} ${WRKSRC}/nail.rc ${PREFIX}/etc/nail.rc.default
+.if !exists(${PREFIX}/etc/nail.rc)
+ ${INSTALL_DATA} ${WRKSRC}/nail.rc ${PREFIX}/etc
+.endif
.include <bsd.port.mk>
diff --git a/mail/nail/distinfo b/mail/nail/distinfo
index bcc263058dd1..c61e85ea880b 100644
--- a/mail/nail/distinfo
+++ b/mail/nail/distinfo
@@ -1,2 +1,2 @@
-MD5 (nail-11.24.tar.bz2) = e127cdbba1220a45f6f1f463ac4b4fd1
-SIZE (nail-11.24.tar.bz2) = 266691
+MD5 (nail-11.25.tar.bz2) = 54f42db31911d734fcf37a89b72d4df7
+SIZE (nail-11.25.tar.bz2) = 267959