aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorache <ache@FreeBSD.org>2007-12-17 03:55:07 +0800
committerache <ache@FreeBSD.org>2007-12-17 03:55:07 +0800
commit911dee82be3cc3e4621797f485fed7ef944a4146 (patch)
treedbe729b49d390d8e8a27dc47c87438baf05bd06e /mail
parent4b20dc67542f56f0a06aec0f45f8748f1b8bcd34 (diff)
downloadfreebsd-ports-graphics-911dee82be3cc3e4621797f485fed7ef944a4146.tar.gz
freebsd-ports-graphics-911dee82be3cc3e4621797f485fed7ef944a4146.tar.zst
freebsd-ports-graphics-911dee82be3cc3e4621797f485fed7ef944a4146.zip
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. PR: 118752 Submitted by: Hirohisa Yamaguchi <umq@ueo.co.jp> (maintainer)
Diffstat (limited to 'mail')
-rw-r--r--mail/dkim-milter/Makefile6
-rw-r--r--mail/dkim-milter/files/patch-dkim-filter__Makefile.m432
-rw-r--r--mail/dkim-milter/files/site.config.m42
3 files changed, 36 insertions, 4 deletions
diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index ff11da99e33..66b05dcb516 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -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 --git a/mail/dkim-milter/files/patch-dkim-filter__Makefile.m4 b/mail/dkim-milter/files/patch-dkim-filter__Makefile.m4
new file mode 100644
index 00000000000..20920ae1bea
--- /dev/null
+++ b/mail/dkim-milter/files/patch-dkim-filter__Makefile.m4
@@ -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 --git a/mail/dkim-milter/files/site.config.m4 b/mail/dkim-milter/files/site.config.m4
index 10e9967b3fe..8581f993389 100644
--- a/mail/dkim-milter/files/site.config.m4
+++ b/mail/dkim-milter/files/site.config.m4
@@ -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 ')