diff options
| -rw-r--r-- | mail/usendmail/Makefile | 12 | ||||
| -rw-r--r-- | mail/usendmail/files/patch-src_env_get.c | 10 | ||||
| -rw-r--r-- | mail/usendmail/files/patch-src_uogetopt.c | 48 | ||||
| -rw-r--r-- | mail/usendmail/files/pkg-message.in (renamed from mail/usendmail/pkg-message) | 0 |
4 files changed, 63 insertions, 7 deletions
diff --git a/mail/usendmail/Makefile b/mail/usendmail/Makefile index a60385507a0b..7b66dc2edde7 100644 --- a/mail/usendmail/Makefile +++ b/mail/usendmail/Makefile @@ -22,14 +22,17 @@ QMAIL_DIR?= /var/qmail NO_SIZE= yes USE_REINPLACE= yes WRKSRC= ${WRKDIR}/mail/${DISTNAME} -PKGMESSAGE= ${WRKDIR}/pkg-message PLIST_FILES= sbin/usendmail PORTDOCS= NEWS README +SUB_FILES= pkg-message +SUB_LIST= QMAIL_DIR=${QMAIL_DIR} -do-patch: +post-patch: @${REINPLACE_CMD} -e 's,/var/qmail,${QMAIL_DIR},' \ ${WRKSRC}/src/usendmail.c + @${REINPLACE_CMD} -e 's,^CC=,CC\?=,' \ + ${WRKSRC}/src/Makefile do-build: cd ${WRKSRC} && ./package/build @@ -40,11 +43,6 @@ do-install: @${MKDIR} ${DOCSDIR} cd ${WRKSRC}/src && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif - -post-install: - @${SED} -e 's:%%PREFIX%%:${PREFIX}:g' \ - -e's:%%QMAIL_DIR%%:${QMAIL_DIR}:g' <pkg-message \ - >${PKGMESSAGE} @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/mail/usendmail/files/patch-src_env_get.c b/mail/usendmail/files/patch-src_env_get.c new file mode 100644 index 000000000000..797bdd9275c1 --- /dev/null +++ b/mail/usendmail/files/patch-src_env_get.c @@ -0,0 +1,10 @@ +--- src/env_get.c.orig Wed Jul 20 19:28:21 2005 ++++ src/env_get.c Wed Jul 20 19:28:43 2005 +@@ -4,7 +4,6 @@ + */ + #include "env.h" + +-extern char **environ; + char *env_get(const char *var) + { + int e; diff --git a/mail/usendmail/files/patch-src_uogetopt.c b/mail/usendmail/files/patch-src_uogetopt.c new file mode 100644 index 000000000000..8b5ddb8f5370 --- /dev/null +++ b/mail/usendmail/files/patch-src_uogetopt.c @@ -0,0 +1,48 @@ +--- src/uogetopt.c.orig Wed Jul 20 19:28:57 2005 ++++ src/uogetopt.c Wed Jul 20 19:31:50 2005 +@@ -116,7 +116,8 @@ + #define SETEXITVOID() do { SETEXIT(); return; } while(0) + #define SETEXITRET(x) do { SETEXIT(); return x; } while(0) + +-static void outplus(void (*out)(int, const char *), ++static attribute_regparm(2) void ++outplus(void (*out)(int, const char *), + const char *s) + { + unsigned int l; +@@ -140,7 +141,7 @@ + #define uogetopt_hlong(e,s,o) uogetopt_num(e,1,s,o) + + +-static unsigned int ++static attribute_regparm(2) unsigned int + outandcount(void (*out)(int iserr,const char *), const char *s) + { + if (!s) return 0; +@@ -231,7 +232,7 @@ + } while (EXPECT(*p,1) && EXPECT(p[1],1)); + } + +-static void ++static attribute_regparm(2) void + uogetopt_printver(uogetopt_env_t *env, int maxlen) + { + int l; +@@ -249,7 +250,7 @@ + env->out(0,env->version); + } + +-static void ++static attribute_regparm(3) void + handle_argopt(uogetopt_env_t *env, uogetopt_t *o, char *arg) + { + int at=o->argtype; +@@ -274,7 +275,7 @@ + #define PRINTHELP_MODE_SHORT 0 + #define PRINTHELP_MODE_NORM 1 + #define PRINTHELP_MODE_LONG 2 +-static void ++static attribute_regparm(2) void + uogetopt_printhelp(uogetopt_env_t *env, int mode) + { + uogetopt_t *opts=env->opts; diff --git a/mail/usendmail/pkg-message b/mail/usendmail/files/pkg-message.in index f6f1d3fc8366..f6f1d3fc8366 100644 --- a/mail/usendmail/pkg-message +++ b/mail/usendmail/files/pkg-message.in |