Date: Wed, 08 Jan 2014 13:07:39 +0900 From: Takefu <takefu@airport.fm> To: freebsd-gnats-submit@freebsd.org Cc: chalpin@cs.wisc.edu Subject: ports/185572: [PATCH] mail/fetchmail: fix StageDir Message-ID: <52CCCF0B.7050007@airport.fm> Resent-Message-ID: <201401080410.s084A0Gh040566@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185572
>Category: ports
>Synopsis: [PATCH] mail/fetchmail: fix StageDir
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Jan 08 04:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Takefu
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
FOX Amateur Radio Club
>Environment:
System: FreeBSD RELENG84-ix86.localIPv4.airport.fm 8.4-RELEASE-p4 FreeBSD 8.4-RELEASE-p4 #0: Wed Sep 25 14:55:36 JST 2013
>Description:
fix StageDir
Port maintainer (chalpin@cs.wisc.edu) is cc'd.
Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:
--- fetchmail-6.3.26.patch begins here ---
diff -ruN /usr/ports/mail/fetchmail/Makefile ./Makefile
--- /usr/ports/mail/fetchmail/Makefile 2013-09-21 04:59:12.000000000 +0900
+++ ./Makefile 2014-01-08 12:55:40.000000000 +0900
@@ -10,63 +10,56 @@
MAINTAINER= chalpin@cs.wisc.edu
COMMENT= Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR
+LICENSE= GPLv2 LGPL21
+LICENSE_COMB= dual
+
RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
# Note USERS can only contain a single word as parts below rely on that.
USERS= ${PORTNAME}
GROUPS= ${USERS}
+NULLDIR?= # None. portlint compliance
USE_RC_SUBR= fetchmail
FETCHMAILRC= ${PREFIX}/etc/fetchmailrc
SUB_FILES= pkg-message
-USE_XZ= yes
+USE_XZ= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_OPENSSL= yes
+NLS_USES= gettext
CONFIGURE_ARGS= --enable-opie --enable-RPA --enable-SDPS \
--without-hesiod --enable-fallback=no \
--with-ssl=${OPENSSLBASE}
LDFLAGS+= -L${LOCALBASE}/lib
-MAN1= fetchmail.1
-MLINKS= fetchmail.1 fetchmailconf.1
-OPTIONS_DEFINE= X11 NLS NTLM GSSAPI
+OPTIONS_DEFINE= X11 NLS NTLM GSSAPI POP2
OPTIONS_DEFAULT= GSSAPI
+OPTIONS_SUB= yes
X11_DESC= Python/Tkinter dependencies for ``fetchmailconf''
-NTLM_DESC= Build in support for NTLM/MSN authentication
-GSSAPI_DESC= Build GSSAPI/Kerberos 5 support
+POP2_DESC= POP2 Protocol support[obsolete]
PORTDOCS= FAQ FEATURES NEWS NOTES README README.SSL \
design-notes.html fetchmail-FAQ.html fetchmail-features.html \
esrs-design-notes.html
-NO_STAGE= yes
.include <bsd.port.options.mk>
# Pop2 is obsolete
-.if defined(WITH_POP2)
+.if ${PORT_OPTIONS:MPOP2}
CONFIGURE_ARGS+= --enable-POP2
.endif
.if ${PORT_OPTIONS:MX11}
USE_PYTHON_RUN= yes
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:${PORTSDIR}/x11-toolkits/py-tkinter
-PLIST_SUB+= X11="" NOX11="@comment "
+PLIST_SUB+= NOX11="@comment "
.else
CONFIGURE_ARGS+= PYTHON=:
SUB_FILES+= fetchmailconf
-PLIST_SUB+= X11="@comment " NOX11=""
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-CONFIGURE_ARGS+= --enable-nls
-PLIST_SUB+= NLS=""
-USES+= gettext
-.else
-CONFIGURE_ARGS+= --disable-nls
-PLIST_SUB+= NLS="@comment "
+PLIST_SUB+= NOX11=""
.endif
.if ${PORT_OPTIONS:MGSSAPI}
@@ -74,7 +68,7 @@
.if exists(${LOCALBASE}/lib/libkrb5.a)
KRB5_HOME= ${LOCALBASE}
.elif exists(/usr/lib/libkrb5.a)
-KRB5_HOME= /usr
+KRB5_HOME= ${NULLDIR}/usr
.endif
.endif
@@ -101,20 +95,22 @@
post-install:
.if ${PORT_OPTIONS:MDOCS}
- ${MKDIR} ${DOCSDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
.endif
.if empty(PORT_OPTIONS:MX11)
- ${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf.py ${PREFIX}/libexec
+ ${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf.py ${STAGEDIR}${PREFIX}/libexec
.endif
- ${MKDIR} -m 0755 "/var/run/${PORTNAME}"
- ${CHOWN} "${USERS}:${GROUPS}" "/var/run/${PORTNAME}"
- ${INSTALL} -m 644 -o ${USERS} -g ${GROUPS} ${FILESDIR}/fetchmailrc.sample ${PREFIX}/etc/fetchmailrc.sample
+ ${MKDIR} -m 0755 "${STAGEDIR}/var/run/${PORTNAME}"
+ ${CHOWN} "${USERS}:${GROUPS}" "${STAGEDIR}/var/run/${PORTNAME}"
+ ${INSTALL} -m 644 -o ${USERS} -g ${GROUPS} ${FILESDIR}/fetchmailrc.sample\
+ ${STAGEDIR}${PREFIX}/etc/fetchmailrc.sample
if [ ! -f ${PREFIX}/etc/fetchmailrc ]; then \
- ${CP} -p ${PREFIX}/etc/fetchmailrc.sample ${PREFIX}/etc/fetchmailrc ; \
- ${CHMOD} 600 ${PREFIX}/etc/fetchmailrc ; \
+ ${CP} -p ${STAGEDIR}${PREFIX}/etc/fetchmailrc.sample\
+ ${STAGEDIR}${PREFIX}/etc/fetchmailrc ; \
+ ${CHMOD} 600 ${STAGEDIR}${PREFIX}/etc/fetchmailrc ; \
fi
@${ECHO_CMD} ""
diff -ruN /usr/ports/mail/fetchmail/pkg-plist ./pkg-plist
--- /usr/ports/mail/fetchmail/pkg-plist 2013-03-26 17:56:28.000000000 +0900
+++ ./pkg-plist 2014-01-07 16:22:50.000000000 +0900
@@ -1,6 +1,8 @@
@comment $FreeBSD: mail/fetchmail/pkg-plist 315268 2013-03-26 08:56:28Z mandree $
bin/fetchmail
bin/fetchmailconf
+man/man1/fetchmail.1.gz
+man/man1/fetchmailconf.1.gz
%%NOX11%%libexec/fetchmailconf.py
%%NLS%%share/locale/ca/LC_MESSAGES/fetchmail.mo
%%NLS%%share/locale/cs/LC_MESSAGES/fetchmail.mo
--- fetchmail-6.3.26.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?52CCCF0B.7050007>