Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 Nov 2019 19:09:49 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r517087 - head/mail/nullmailer
Message-ID:  <201911081909.xA8J9ndT098429@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Fri Nov  8 19:09:49 2019
New Revision: 517087
URL: https://svnweb.freebsd.org/changeset/ports/517087

Log:
  - Fix LICENSE
  - Add LICENSE_FILE
  - Simplify Makefile
  - Switch to options helpers

Modified:
  head/mail/nullmailer/Makefile

Modified: head/mail/nullmailer/Makefile
==============================================================================
--- head/mail/nullmailer/Makefile	Fri Nov  8 18:57:29 2019	(r517086)
+++ head/mail/nullmailer/Makefile	Fri Nov  8 19:09:49 2019	(r517087)
@@ -12,44 +12,31 @@ MASTER_SITES=	http://untroubled.org/nullmailer/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MTA for hosts which relay to a fixed set of smart relays
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LOCALSTATEDIR=	/var/spool
 
-.if defined(MAINTAINER_MODE)
-UID_FILES+=	../../UIDs
-GID_FILES+=	../../GIDs
-.endif
 USERS=		nullmail
 GROUPS=		nullmail
-NULLMAIL_UID=	522
-NULLMAIL_GID=	522
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--localstatedir=${LOCALSTATEDIR}
+CONFIGURE_ARGS=	--localstatedir=${LOCALSTATEDIR}
 
 USE_CXXSTD=	gnu++98
-USE_SUBMAKE=	yes
 
 USE_RC_SUBR=	${PORTNAME}
-SUB_FILES+=	pkg-install pkg-deinstall pkg-message
+SUB_FILES=	pkg-install pkg-deinstall pkg-message
 
-PLIST_SUB+=	LOCALSTATEDIR=${LOCALSTATEDIR} NULLMAIL_USER=${USERS}
-SUB_LIST+=	LOCALSTATEDIR=${LOCALSTATEDIR} NULLMAIL_USER=${USERS}
+PLIST_SUB=	LOCALSTATEDIR=${LOCALSTATEDIR} NULLMAIL_USER=${USERS}
+SUB_LIST=	LOCALSTATEDIR=${LOCALSTATEDIR} NULLMAIL_USER=${USERS}
 
 OPTIONS_DEFINE=	GNUTLS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	libgnutls.so:security/gnutls
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lgnutls
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS+=--enable-tls
-.else
-CONFIGURE_ARGS+=--disable-tls
-.endif
+GNUTLS_CONFIGURE_ENABLE=tls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
+GNUTLS_USES=		localbase:ldflags
+GNUTLS_LDFLAGS=		-lgnutls
 
 post-install:
 	${INSTALL_DATA} -c ${FILESDIR}/remotes.sample ${STAGEDIR}${ETCDIR}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911081909.xA8J9ndT098429>