diff options
| author | tijl <tijl@FreeBSD.org> | 2018-01-15 04:22:37 +0800 |
|---|---|---|
| committer | Koop Mast <kwm@rainbow-runner.nl> | 2018-02-04 06:24:01 +0800 |
| commit | 5ec75d38a99cdc53543920a67d9daf073e4d4e09 (patch) | |
| tree | c4ec1a4b507017e8897a9a2462cd89d5f3d9f022 /mail | |
| parent | e5f26c347a2cbd3a93fb153c8601cdc7010c6ae0 (diff) | |
| download | freebsd-ports-gnome-5ec75d38a99cdc53543920a67d9daf073e4d4e09.tar.gz freebsd-ports-gnome-5ec75d38a99cdc53543920a67d9daf073e4d4e09.tar.zst freebsd-ports-gnome-5ec75d38a99cdc53543920a67d9daf073e4d4e09.zip | |
Patch configure instead of configure.in so USE_AUTOTOOLS can be removed.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/qpopper/Makefile | 8 | ||||
| -rw-r--r-- | mail/qpopper/files/patch-configure.in | 30 |
2 files changed, 4 insertions, 34 deletions
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile index 887efa6905de..296f123df31a 100644 --- a/mail/qpopper/Makefile +++ b/mail/qpopper/Makefile @@ -13,10 +13,10 @@ MAINTAINER= bc979@lafn.org COMMENT= Berkeley POP 3 server (now maintained by Qualcomm) USES= compiler:features -USE_AUTOTOOLS= autoconf +GNU_CONFIGURE= yes CONFIGURE_ENV= OS_DEFS="-DSETPROCTITLE ${OS_DEFS}" CONFIGURE_ARGS= --enable-nonauth-file=${POPUSERS_FILE} \ - --without-gdbm \ + --without-gdbm ac_cv_header_gdbm_h=no \ --enable-keep-temp-drop LIBS+= -L${LOCALBASE}/lib -lcrypt -lmd -lutil @@ -124,13 +124,13 @@ CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} post-patch: .if ${COMPILER_TYPE} == clang - @${REINPLACE_CMD} -e 's|-freg-struct-return||' ${WRKSRC}/configure.in + @${REINPLACE_CMD} -e 's|-freg-struct-return||' ${WRKSRC}/configure .endif @${RM} ${WRKSRC}/popper/md5.h @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/man/* @${REINPLACE_CMD} -e \ 's|\$${sbindir}/sendmail|${LOCALBASE}/sbin/sendmail|g' \ - ${WRKSRC}/configure.in + ${WRKSRC}/configure .if ${PORT_OPTIONS:MPOPPASSD} @${REINPLACE_CMD} -e 's|/usr/bin/smbpasswd|${LOCALBASE}/bin/smbpasswd|' \ ${WRKSRC}/password/poppassd.c diff --git a/mail/qpopper/files/patch-configure.in b/mail/qpopper/files/patch-configure.in deleted file mode 100644 index ef3fdff812df..000000000000 --- a/mail/qpopper/files/patch-configure.in +++ /dev/null @@ -1,30 +0,0 @@ ---- configure.in.orig 2011-05-30 11:13:39.000000000 -0800 -+++ configure.in 2012-03-14 10:38:44.000000000 -0800 -@@ -1409,14 +1409,14 @@ - dnl - - AC_MSG_CHECKING([for sendmail program]) --if test -f ${sbindir}/sendmail --then -- AC_DEFINE(MAIL_COMMAND, "${sbindir}/sendmail") -- AC_MSG_RESULT([found at ${sbindir}/sendmail]) --elif test -f /usr/sbin/sendmail -+if test -f /usr/sbin/sendmail - then - AC_DEFINE(MAIL_COMMAND, "/usr/sbin/sendmail") - AC_MSG_RESULT([found at /usr/sbin/sendmail]) -+elif test -f ${sbindir}/sendmail -+then -+ AC_DEFINE(MAIL_COMMAND, "${sbindir}/sendmail") -+ AC_MSG_RESULT([found at ${sbindir}/sendmail]) - elif test -f /usr/lib/sendmail - then - AC_DEFINE(MAIL_COMMAND, "/usr/lib/sendmail") -@@ -1508,7 +1508,6 @@ - ) - - AC_CHECK_HEADER( ndbm.h, NDBM_H="yes"; AC_DEFINE(HAVE_NDBM_H), NDBM_H="no" ) --AC_CHECK_HEADER( gdbm.h, GDBM_H="yes"; AC_DEFINE(HAVE_GDBM_H), GDBM_H="no" ) - AC_CHECK_HEADER( dbm.h, DBM_H="yes"; AC_DEFINE(HAVE_DBM_H), DBM_H="no" ) - - AC_CHECK_TYPES( socklen_t, , , [#include <sys/socket.h>] ) |