diff options
| author | alex <alex@FreeBSD.org> | 2000-07-19 15:31:26 +0800 |
|---|---|---|
| committer | alex <alex@FreeBSD.org> | 2000-07-19 15:31:26 +0800 |
| commit | a4f7f85069c19f90aeadc9e47d0e90a780591c0a (patch) | |
| tree | 6fb4eb263803d6697c1a812d72c9c4358dc70344 | |
| parent | d29cb0600ebbe2c869af33f47d13b7bde814ff81 (diff) | |
| download | freebsd-ports-graphics-a4f7f85069c19f90aeadc9e47d0e90a780591c0a.tar.gz freebsd-ports-graphics-a4f7f85069c19f90aeadc9e47d0e90a780591c0a.tar.zst freebsd-ports-graphics-a4f7f85069c19f90aeadc9e47d0e90a780591c0a.zip | |
Use a "q"-prefix everywhere, to avoid conflicts with the popper
and popper3 ports.
The manpages are patched accordingly.
Pointed out by: sobomax
| -rw-r--r-- | mail/qpopper/Makefile | 17 | ||||
| -rw-r--r-- | mail/qpopper/pkg-message | 4 | ||||
| -rw-r--r-- | mail/qpopper/pkg-plist | 8 | ||||
| -rw-r--r-- | mail/qpopper/scripts/pre-install | 2 |
4 files changed, 17 insertions, 14 deletions
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile index 9547295894f..d12f8a072f5 100644 --- a/mail/qpopper/Makefile +++ b/mail/qpopper/Makefile @@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}3.1b5 MAINTAINER= ports@freebsd.org GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-apop=${PREFIX}/etc/popper/pop.auth +CONFIGURE_ARGS= --enable-apop=${PREFIX}/etc/qpopper/pop.auth O_DEFS= -DSETPROCTITLE -DKEEP_TEMP_DROP -DBSD44_DBM -DBIND43 \ -DBULLDB -DNONAUTHFILE='\"/etc/ftpusers\"' @@ -27,15 +27,18 @@ CONFIGURE_ARGS+=--enable-debugging CONFIGURE_ENV= LIBS="${P_LIBS}" O_DEFS="${O_DEFS}" -MAN8= popauth.8 popper.8 +MAN8= qpopauth.8 qpopper.8 -do-install: - cd ${WRKSRC} && \ - ${INSTALL_PROGRAM} popper/popauth ${PREFIX}/bin +post-patch: cd ${WRKSRC} && \ - ${INSTALL_PROGRAM} popper/popper ${PREFIX}/libexec + ${PERL} -pi.orig -e "s:/usr/local:${PREFIX}:g" man/popper.8 + +do-install: cd ${WRKSRC} && \ - ${INSTALL_MAN} man/popauth.8 man/popper.8 ${PREFIX}/man/man8 + ${INSTALL_PROGRAM} popper/popauth ${PREFIX}/bin/qpopauth && \ + ${INSTALL_PROGRAM} popper/popper ${PREFIX}/libexec/qpopper && \ + ${INSTALL_MAN} man/popauth.8 ${PREFIX}/man/man8/qpopauth.8 && \ + ${INSTALL_MAN} man/popper.8 ${PREFIX}/man/man8/qpopper.8 post-install: @${SED} -e "s:/usr/local:${PREFIX}:" ${PKGMESSAGE} diff --git a/mail/qpopper/pkg-message b/mail/qpopper/pkg-message index 7afa699da0b..f54fdfea9d0 100644 --- a/mail/qpopper/pkg-message +++ b/mail/qpopper/pkg-message @@ -1,7 +1,7 @@ **************************************************************************** -To enable the popper-daemon, add the following line to your /etc/inetd.conf: +To enable the qpopper-daemon, add the following line to your /etc/inetd.conf: - pop3 stream tcp nowait root /usr/local/libexec/popper qpopper -s + pop3 stream tcp nowait root /usr/local/libexec/qpopper qpopper -s **************************************************************************** diff --git a/mail/qpopper/pkg-plist b/mail/qpopper/pkg-plist index 45868e6a9c6..4450333f7c2 100644 --- a/mail/qpopper/pkg-plist +++ b/mail/qpopper/pkg-plist @@ -1,4 +1,4 @@ -bin/popauth -libexec/popper -@dirrm etc/popper -@exec mkdir -p %D/etc/popper && chown pop.daemon %D/etc/popper && chmod 700 %D/etc/popper +bin/qpopauth +libexec/qpopper +@dirrm etc/qpopper +@exec mkdir -p %D/etc/qpopper && chown pop.daemon %D/etc/qpopper && chmod 700 %D/etc/qpopper diff --git a/mail/qpopper/scripts/pre-install b/mail/qpopper/scripts/pre-install index d3e1fef6635..2551b3f46bb 100644 --- a/mail/qpopper/scripts/pre-install +++ b/mail/qpopper/scripts/pre-install @@ -8,7 +8,7 @@ if ! id -u pop > /dev/null 2>&1; then echo "" exit 1 fi -usrdir=${PREFIX}/etc/popper +usrdir=${PREFIX}/etc/qpopper if [ ! -d $usrdir ]; then mkdir -p $usrdir fi |