ports/118752: [maintainer] mail/dkim-milter move command-line tools under libexec to bin

[Hirohisa Yamaguchi]

>Number:         118752
>Category:       ports
>Synopsis:       [maintainer] mail/dkim-milter move command-line tools under libexec to bin
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 16 19:20:00 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Hirohisa Yamaguchi
>Release:        FreeBSD 8.0-CURRENT amd64
>Organization:
<organization of PR author (multiple lines)>
>Environment:
System: FreeBSD calliope.****.org 8.0-CURRENT FreeBSD 8.0-CURRENT #13: Sat Oct 27 13:36:07 JST 2007 root at calliope.****.org:/usr/obj/usr/src/sys/CALLIOPE64 amd64

>Description:
	There are some executables installed with dkim-filter, the
	milter program; dkim-genkey, dkim-stats, dkim-testkey and
	dkim-testssp.

	These are installed into the same directory with dkim-filter
	(i.e. ${PREFIX}/libexec/), but should be placed to
	${PREFIX}/bin/ instead, since they're not daemon.

>How-To-Repeat:
	N/A
>Fix:

	The patch follows:


diff -Npru ports.orig/mail/dkim-milter/Makefile ports/mail/dkim-milter/Makefile
--- ports.orig/mail/dkim-milter/Makefile	2007-12-01 08:36:47.000000000 +0900
+++ ports/mail/dkim-milter/Makefile	2007-12-17 03:55:03.000000000 +0900
@@ -14,6 +14,7 @@
 
 PORTNAME=	dkim-milter
 PORTVERSION=	2.4.0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -44,9 +45,8 @@ WCONF=		${WRKSRC}/devtools/Site
 MAN5=		dkim-filter.conf.5
 MAN8=		dkim-filter.8 dkim-genkey.8 dkim-testkey.8 dkim-testssp.8
 PLIST_FILES=	etc/mail/dkim-filter.conf.sample \
-		libexec/dkim-filter libexec/dkim-genkey \
-		%%STATS%%libexec/dkim-stats \
-		libexec/dkim-testkey libexec/dkim-testssp
+		bin/dkim-genkey %%STATS%%bin/dkim-stats bin/dkim-testkey \
+		bin/dkim-testssp libexec/dkim-filter
 PLIST_DIRS=	etc/mail
 PORTDOCS=	FEATURES INSTALL KNOWNBUGS LICENSE README RELEASE_NOTES \
 		autorespond.csh \
diff -Npru ports.orig/mail/dkim-milter/files/patch-dkim-filter__Makefile.m4 ports/mail/dkim-milter/files/patch-dkim-filter__Makefile.m4
--- ports.orig/mail/dkim-milter/files/patch-dkim-filter__Makefile.m4	1970-01-01 09:00:00.000000000 +0900
+++ ports/mail/dkim-milter/files/patch-dkim-filter__Makefile.m4	2007-12-17 03:50:15.000000000 +0900
@@ -0,0 +1,32 @@
+--- ./dkim-filter/Makefile.m4.orig	2007-11-01 04:00:07.000000000 +0900
++++ ./dkim-filter/Makefile.m4	2007-12-17 03:50:11.000000000 +0900
+@@ -31,18 +31,21 @@
+ 
+ 
+ bldPRODUCT_START(`executable', `dkim-filter')
++define(`bldINSTALL_DIR', `E')
+ define(`bldSOURCES', `config.c dkim-ar.c dkim-filter.c stats.c test.c util.c ')
+ PREPENDDEF(`confLIBS', `-lmilter ')
+ bldPRODUCT_END
+ 
+ ifelse(index(confENVDEF, `-D_FFR_STATS'), -1, `', `
+ bldPRODUCT_START(`executable', `dkim-stats')
++define(`bldINSTALL_DIR', `U')
+ define(`bldSOURCES', `dkim-stats.c ')
+ bldPRODUCT_END
+ ')
+ 
+ dnl Install code for dkim-genkey is in here
+ bldPRODUCT_START(`executable', `dkim-testkey')
++define(`bldINSTALL_DIR', `U')
+ define(`bldSOURCES', `dkim-testkey.c ')
+ bldPUSH_INSTALL_TARGET(`install-genkey')
+ divert(bldTARGETS_SECTION)
+@@ -54,6 +57,7 @@
+ bldPRODUCT_END
+ 
+ bldPRODUCT_START(`executable', `dkim-testssp')
++define(`bldINSTALL_DIR', `U')
+ define(`bldSOURCES', `dkim-testssp.c ')
+ bldPRODUCT_END
+ 
diff -Npru ports.orig/mail/dkim-milter/files/site.config.m4 ports/mail/dkim-milter/files/site.config.m4
--- ports.orig/mail/dkim-milter/files/site.config.m4	2007-08-03 09:05:29.000000000 +0900
+++ ports/mail/dkim-milter/files/site.config.m4	2007-12-15 08:49:47.000000000 +0900
@@ -1,7 +1,7 @@
 define(`confEBINDIR',`%%PREFIX%%/libexec')
 define(`confMANROOT',`%%PREFIX%%/man/man')
 define(`confMANROOTMAN',`%%PREFIX%%/man/man')
-define(`confUBINDIR',`%%PREFIX%%/libexec')
+define(`confUBINDIR',`%%PREFIX%%/bin')
 define(`confLIBDIR',`%%PREFIX%%/lib')
 define(`confDONT_INSTALL_CATMAN',`True')
 %%STATIC%%APPENDDEF(`confLIBS', `-static ')
>Release-Note:
>Audit-Trail:
>Unformatted: