diff options
| -rw-r--r-- | mail/dkimap4/Makefile | 20 | ||||
| -rw-r--r-- | mail/dkimap4/pkg-message | 4 | ||||
| -rw-r--r-- | mail/dkimap4/pkg-plist | 5 |
3 files changed, 10 insertions, 19 deletions
diff --git a/mail/dkimap4/Makefile b/mail/dkimap4/Makefile index bc3f62842f06..33464591e0cd 100644 --- a/mail/dkimap4/Makefile +++ b/mail/dkimap4/Makefile @@ -18,6 +18,7 @@ COMMENT= IMAP4rev1 and POP3 server from the DBOX BBS package USE_GMAKE= yes GNU_CONFIGURE= yes +USE_GCC= 2.95 # dkimap will look for incoming mail folders (mbox format) here instead of # the default from paths.h (/var/mail/) if you uncomment it: @@ -31,13 +32,8 @@ MAKE_ARGS+= BIN_DIR="${PREFIX}/bin" DKIMAPSPOOL="${DKIMAPSPOOL}" MAKE_ARGS+= SPOOLDIR="${SPOOLDIR}" .endif -DOCS= README - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500113 -BROKEN= "Does not compile (bad C++ code)" -.endif +PORTDOCS= README +PLIST_FILES= bin/movemail libexec/dkimap4 libexec/dkpop3 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/movemail/movemail ${PREFIX}/bin @@ -46,11 +42,11 @@ do-install: post-install: .if !defined(NOPORTDOCS) - ${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/share/doc/${PORTNAME} -.for f in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/${PORTNAME} + @${MKDIR} ${DOCSDIR} +.for f in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} .endfor .endif - @${CAT} ${PKGMESSAGE} + @${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/dkimap4/pkg-message b/mail/dkimap4/pkg-message index 0b17702322d0..0411e42d7e07 100644 --- a/mail/dkimap4/pkg-message +++ b/mail/dkimap4/pkg-message @@ -1,8 +1,8 @@ The dkimap4 and dkpop3 daemons should be invoked by your /etc/inetd.conf file with lines such as: -pop3 stream tcp nowait root /usr/local/libexec/dkpop3 dkpop3 -imap4 stream tcp nowait root /usr/local/libexec/dkimap4 dkimap4 +pop3 stream tcp nowait root %%PREFIX%%/libexec/dkpop3 dkpop3 +imap4 stream tcp nowait root %%PREFIX%%/libexec/dkimap4 dkimap4 You also need to set up PAM properly, as PAM is enabled by default. Use something like this in /etc/pam.conf: diff --git a/mail/dkimap4/pkg-plist b/mail/dkimap4/pkg-plist deleted file mode 100644 index c5b6c976ba7b..000000000000 --- a/mail/dkimap4/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -bin/movemail -libexec/dkimap4 -libexec/dkpop3 -%%PORTDOCS%%share/doc/dkimap4/README -%%PORTDOCS%%@dirrm share/doc/dkimap4 |