Wed Mar 11 15:18:51 2015 UTC ()
Add SMF manifest and ssl/tls support (new gnutls option, enabled by default)


(wiedi)
diff -r1.36 -r1.37 pkgsrc/mail/nullmailer/Makefile
diff -r0 -r1.1 pkgsrc/mail/nullmailer/options.mk
diff -r0 -r1.1 pkgsrc/mail/nullmailer/files/smf/manifest.xml
cvs diff -r1.36 -r1.37 pkgsrc/mail/nullmailer/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/nullmailer/Makefile 2013/09/03 17:50:27 1.36
+++ pkgsrc/mail/nullmailer/Makefile 2015/03/11 15:18:51 1.37
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.36 2013/09/03 17:50:27 shattered Exp $ 1# $NetBSD: Makefile,v 1.37 2015/03/11 15:18:51 wiedi Exp $
2 2
3DISTNAME= nullmailer-1.13 3DISTNAME= nullmailer-1.13
 4PKGREVISION= 1
4CATEGORIES= mail 5CATEGORIES= mail
5MASTER_SITES= ${HOMEPAGE:Q} 6MASTER_SITES= ${HOMEPAGE:Q}
6DIST_SUBDIR= ${PKGNAME_NOREV} 7DIST_SUBDIR= ${PKGNAME_NOREV}
7 8
8MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
9HOMEPAGE= http://untroubled.org/nullmailer/ 10HOMEPAGE= http://untroubled.org/nullmailer/
10COMMENT= Simple relay-only mail transport agent 11COMMENT= Simple relay-only mail transport agent
11 12
12LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
13 14
14PKG_DESTDIR_SUPPORT= destdir 15PKG_DESTDIR_SUPPORT= destdir
15 16
16USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
@@ -49,26 +50,28 @@ SPECIAL_PERMS+= libexec/nullmailer/null @@ -49,26 +50,28 @@ SPECIAL_PERMS+= libexec/nullmailer/null
49 ${NULLMAILER_USER} ${NULLMAILER_GROUP} 4555 50 ${NULLMAILER_USER} ${NULLMAILER_GROUP} 4555
50 51
51SUBST_CLASSES+= paths 52SUBST_CLASSES+= paths
52SUBST_FILES.paths= ${WRKDIR}/mailer.conf ${WRKDIR}/nullmailer-daemon 53SUBST_FILES.paths= ${WRKDIR}/mailer.conf ${WRKDIR}/nullmailer-daemon
53SUBST_FILES.paths+= doc/nullmailer-send.8 doc/nullmailer-queue.8 54SUBST_FILES.paths+= doc/nullmailer-send.8 doc/nullmailer-queue.8
54SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' 55SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
55SUBST_SED.paths+= -e 's,@VARBASE@,${VARBASE},g' 56SUBST_SED.paths+= -e 's,@VARBASE@,${VARBASE},g'
56SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' 57SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
57SUBST_STAGE.paths= post-configure 58SUBST_STAGE.paths= post-configure
58 59
59INSTALLATION_DIRS= share/doc/${PKGBASE} share/examples/${PKGBASE} 60INSTALLATION_DIRS= share/doc/${PKGBASE} share/examples/${PKGBASE}
60BUILD_DEFS+= VARBASE 61BUILD_DEFS+= VARBASE
61 62
 63.include "options.mk"
 64
62post-extract: 65post-extract:
63 ${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf 66 ${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
64 ${CP} ${FILESDIR}/nullmailer-daemon ${WRKDIR}/nullmailer-daemon 67 ${CP} ${FILESDIR}/nullmailer-daemon ${WRKDIR}/nullmailer-daemon
65 68
66post-install: 69post-install:
67 cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS BUGS COPYING ChangeLog \ 70 cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS BUGS COPYING ChangeLog \
68 HOWTO NEWS README TODO ${DESTDIR}${PREFIX}/share/doc/nullmailer 71 HOWTO NEWS README TODO ${DESTDIR}${PREFIX}/share/doc/nullmailer
69 ${INSTALL_DATA} ${WRKDIR}/mailer.conf \ 72 ${INSTALL_DATA} ${WRKDIR}/mailer.conf \
70 ${DESTDIR}${PREFIX}/share/examples/nullmailer/ 73 ${DESTDIR}${PREFIX}/share/examples/nullmailer/
71 ${INSTALL_SCRIPT} ${WRKDIR}/nullmailer-daemon \ 74 ${INSTALL_SCRIPT} ${WRKDIR}/nullmailer-daemon \
72 ${DESTDIR}${PREFIX}/libexec/nullmailer/ 75 ${DESTDIR}${PREFIX}/libexec/nullmailer/
73 76
74.include "../../mk/bsd.pkg.mk" 77.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/mail/nullmailer/options.mk
# $NetBSD: options.mk,v 1.1 2015/03/11 15:18:51 wiedi Exp $

PKG_OPTIONS_VAR=        PKG_OPTIONS.nullmailer
PKG_SUPPORTED_OPTIONS=  gnutls
PKG_SUGGESTED_OPTIONS=  gnutls

.include "../../mk/bsd.options.mk"

.if !empty(PKG_OPTIONS:Mgnutls)
.  include "../../security/gnutls/buildlink3.mk"
CONFIGURE_ARGS+=	--enable-tls
.endif # option gnutls
File Added: pkgsrc/mail/nullmailer/files/smf/manifest.xml
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<service_bundle type='manifest' name='@SMF_NAME@'>
<service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='1'>
	<create_default_instance enabled="false"/>
	<dependency name='fs-root' grouping='require_all' restart_on='none' type='service'>
		<service_fmri value='svc:/system/filesystem/root' />
	</dependency>
	<dependency name='network-service' grouping='require_all' restart_on='none' type='service'>
		<service_fmri value='svc:/network/service'/>
	</dependency>
	<method_context working_directory='/tmp'>
		<method_credential user="@NULLMAILER_USER@" group="@NULLMAILER_GROUP@"/>
	</method_context>

	<exec_method name='start' type='method' exec='@PREFIX@/libexec/nullmailer/nullmailer-send' timeout_seconds='20'/>
	<exec_method name='stop'  type='method' exec=':kill' timeout_seconds='60'/>

	<property_group name="startd" type="framework">
		<propval name="duration" type="astring" value="child" />
		<propval name="ignore_error" type="astring" value="core,signal" />
	</property_group>

	<stability value='Unstable'/>
	<template>
		<common_name>
			<loctext xml:lang='C'>Simple relay-only mail transport agent</loctext>
		</common_name>
		<documentation>
			<manpage title='nullmailer' section='7' manpath='@PREFIX@/@PKGMANDIR@' />
		</documentation>
	</template>
</service>
</service_bundle>