4 files changed, 24 insertions, 26 deletions

diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index c9259e059ce7..8de98d3d8e0e 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nullmailer
-PORTVERSION=	1.03
-PORTREVISION=	2
+PORTVERSION=	1.04
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://untroubled.org/nullmailer/ \
@@ -17,22 +16,21 @@ MASTER_SITE_SUBDIR=	${PORTVERSION}
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	MTA for hosts which relay to a fixed set of smart relays
 
-HAS_CONFIGURE=	yes
+LOCALSTATEDIR=	/var/spool
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR}
 
 USE_SUBMAKE=	yes
 
 USE_RC_SUBR=	${PORTNAME}
-SUB_FILES+=	pkg-install pkg-message 
+SUB_FILES+=	pkg-install pkg-message
 
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PLIST_SUB+=	LOCALSTATEDIR=${LOCALSTATEDIR}
 SUB_LIST+=	LOCALSTATEDIR=${LOCALSTATEDIR}
 
-LOCALSTATEDIR=	/var/spool
-
-CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR}
-
 MAN1=	nullmailer-inject.1 sendmail.1
 MAN7=	nullmailer.7
 MAN8=	nullmailer-queue.8 nullmailer-send.8
diff --git a/mail/nullmailer/distinfo b/mail/nullmailer/distinfo
index 78c20faa1887..be54906c0b77 100644
--- a/mail/nullmailer/distinfo
+++ b/mail/nullmailer/distinfo
@@ -1,3 +1,3 @@
-MD5 (nullmailer-1.03.tar.gz) = 4e94a84f359571b0872f398f0859a22a
-SHA256 (nullmailer-1.03.tar.gz) = 1471ab6c0c6038d7df4d301734e9e7f93b75147a954b52cb95e669c503fb9479
-SIZE (nullmailer-1.03.tar.gz) = 172250
+MD5 (nullmailer-1.04.tar.gz) = f4d7a0dc8694be909644f68f1ebb5394
+SHA256 (nullmailer-1.04.tar.gz) = 364b7888720469d1494c6084a8de7cd39cfc8f841f3be02dfc417e111572fe8b
+SIZE (nullmailer-1.04.tar.gz) = 176867
diff --git a/mail/nullmailer/files/patch-Makefile.in b/mail/nullmailer/files/patch-Makefile.in
index 8703569fb16b..6a62edb96bc5 100644
--- a/mail/nullmailer/files/patch-Makefile.in
+++ b/mail/nullmailer/files/patch-Makefile.in
@@ -1,15 +1,15 @@
---- Makefile.in~	Sat Mar  5 01:22:15 2005
-+++ Makefile.in	Sat Mar  5 01:20:05 2005
-@@ -142,7 +142,7 @@
+--- Makefile.in.orig	2007-10-09 19:23:26.000000000 -0400
++++ Makefile.in	2009-08-11 17:21:54.000000000 -0400
+@@ -143,7 +143,7 @@
  infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
 -libexecdir = @libexecdir@
 +libexecdir = @libexecdir@/nullmailer
+ localedir = @localedir@
  localstatedir = @localstatedir@/nullmailer
  mandir = @mandir@
- mkdir_p = @mkdir_p@
-@@ -587,8 +587,8 @@
+@@ -613,8 +613,8 @@
  	chown nullmail $(DESTDIR)$(localstatedir)/*
  	chown nullmail $(DESTDIR)$(sbindir)/nullmailer-queue
  	chmod u+s $(DESTDIR)$(sbindir)/nullmailer-queue
diff --git a/mail/nullmailer/files/patch-src-Makefile.in b/mail/nullmailer/files/patch-src-Makefile.in
index d7e1621f185f..1c73ddc4f8bd 100644
--- a/mail/nullmailer/files/patch-src-Makefile.in
+++ b/mail/nullmailer/files/patch-src-Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig	Tue Mar  1 01:39:50 2005
-+++ src/Makefile.in	Sat Mar  5 10:06:52 2005
-@@ -36,9 +36,9 @@
+--- src/Makefile.in.orig	2007-10-09 19:23:25.000000000 -0400
++++ src/Makefile.in	2009-08-11 17:24:28.000000000 -0400
+@@ -30,9 +30,9 @@
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -13,7 +13,7 @@
  subdir = src
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -52,7 +52,9 @@
+@@ -46,7 +46,9 @@
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@@ -24,16 +24,16 @@
  am_mailq_OBJECTS = mailq.$(OBJEXT)
  mailq_OBJECTS = $(am_mailq_OBJECTS)
  mailq_DEPENDENCIES = ../lib/libnullmailer.a
-@@ -158,7 +160,7 @@
+@@ -154,7 +156,7 @@
  infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
 -libexecdir = @libexecdir@
 +libexecdir = @libexecdir@/nullmailer
+ localedir = @localedir@
  localstatedir = @localstatedir@
  mandir = @mandir@
- mkdir_p = @mkdir_p@
-@@ -251,6 +253,31 @@
+@@ -253,6 +255,31 @@
  	  else :; fi; \
  	done
  
@@ -65,12 +65,12 @@
  uninstall-sbinPROGRAMS:
  	@$(NORMAL_UNINSTALL)
  	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
-@@ -433,7 +460,7 @@
+@@ -435,7 +462,7 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
 -install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
 +install-exec-am: install-binPROGRAMS install-sbinPROGRAMS install-libexecPROGRAMS
  
- install-info: install-info-am
+ install-html: install-html-am