diff options
| author | Pawel Pekala <pawel@FreeBSD.org> | 2012-11-01 02:11:58 +0800 |
|---|---|---|
| committer | Pawel Pekala <pawel@FreeBSD.org> | 2012-11-01 02:11:58 +0800 |
| commit | 6b70eda942bb687b4473835cd546f24129177418 (patch) | |
| tree | 9c6e9570fc1b01ed0d03d661df06001bcd2c0709 /mail | |
| parent | 327f80fdcadbb0863e505ba7fb8c2f4af320b4d3 (diff) | |
| download | freebsd-ports-gnome-6b70eda942bb687b4473835cd546f24129177418.tar.gz freebsd-ports-gnome-6b70eda942bb687b4473835cd546f24129177418.tar.zst freebsd-ports-gnome-6b70eda942bb687b4473835cd546f24129177418.zip | |
- Fix build with clang [1]
- Switch to PLIST_FILES, PORTDOCS
- Convert to OptionsNG
PR: ports/172574 [1]
Submitted by: Boris Samorodov <bsam@FreeBSD.org> [1]
Approved by: maintainer timeout (21 days)
Feature safe: yes
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/mail2sms/Makefile | 24 | ||||
| -rw-r--r-- | mail/mail2sms/files/patch-aa | 9 | ||||
| -rw-r--r-- | mail/mail2sms/pkg-plist | 5 |
3 files changed, 24 insertions, 14 deletions
diff --git a/mail/mail2sms/Makefile b/mail/mail2sms/Makefile index 1e52c28d6c60..ff1aa00a0975 100644 --- a/mail/mail2sms/Makefile +++ b/mail/mail2sms/Makefile @@ -1,23 +1,28 @@ -# New ports collection makefile for: mail2sms -# Date created: 2003-04-16 -# Whom: Gerhard Gonter <g.gonter@ieee.org> -# +# Created by: Gerhard Gonter <g.gonter@ieee.org> # $FreeBSD$ PORTNAME= mail2sms PORTVERSION= 1.3.5 CATEGORIES= mail MASTER_SITES= http://www.contactor.se/~dast/stuff/ -DISTNAME= mail2sms-${PORTVERSION} MAINTAINER= g.gonter@ieee.org COMMENT= Mail to SMS converter GNU_CONFIGURE= yes +PLIST_FILES= bin/${PORTNAME} MAN1= mail2sms.1 MAN5= mail2sms.5 +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDOCS} +PORTDOCS= README REGEX example.conf +.endif + post-patch: ${CP} ${WRKSRC}/mail2sms.4 ${WRKSRC}/mail2sms.5 ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mail2sms.5 @@ -27,10 +32,11 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mail2sms ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${PREFIX}/man/man1/ ${INSTALL_MAN} ${WRKSRC}/${MAN5} ${PREFIX}/man/man5/ -.if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/mail2sms - ${INSTALL_MAN} ${WRKSRC}/README ${WRKSRC}/REGEX ${WRKSRC}/example.conf \ - ${PREFIX}/share/doc/mail2sms +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${DOCSDIR} +.for f in ${PORTDOCS} + ${INSTALL_MAN} ${WRKSRC}/${f} ${DOCSDIR} +.endfor .endif .include <bsd.port.mk> diff --git a/mail/mail2sms/files/patch-aa b/mail/mail2sms/files/patch-aa index a40c6e5cea6d..9c6426113e45 100644 --- a/mail/mail2sms/files/patch-aa +++ b/mail/mail2sms/files/patch-aa @@ -23,6 +23,15 @@ { int nlen = strlen(needle); int hlen = strlen(haystack); +@@ -325,7 +326,7 @@ struct body * process(char *mbox, /* + if (use_stdin || !mbox || !strcasecmp(mbox, "NONE")) + fp = stdin; + else if ((fp = fopen(mbox, "r")) == NULL) { +- return; /* add error code */ ++ return -1; /* add error code */ + } + + isinheader = 1; --- mail2sms.1.orig Wed Apr 16 05:22:01 2003 +++ mail2sms.1 Wed Apr 16 05:22:57 2003 @@ -32,7 +32,7 @@ diff --git a/mail/mail2sms/pkg-plist b/mail/mail2sms/pkg-plist deleted file mode 100644 index daf6c66f7d5d..000000000000 --- a/mail/mail2sms/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -bin/mail2sms -%%PORTDOCS%%share/doc/mail2sms/README -%%PORTDOCS%%share/doc/mail2sms/REGEX -%%PORTDOCS%%share/doc/mail2sms/example.conf -%%PORTDOCS%%@dirrm share/doc/mail2sms |