aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Brodin <antoine@FreeBSD.org>2014-10-20 19:29:22 +0000
committerAntoine Brodin <antoine@FreeBSD.org>2014-10-20 19:29:22 +0000
commitd11fa3d44494e1878afcb8e76f29887a2a011b27 (patch)
tree4160f76af628c93cf847558f10464a27480bb303
parent953ce7353dcac5c87bc5de4a8447d0010ae1251b (diff)
downloadports-d11fa3d44494e1878afcb8e76f29887a2a011b27.tar.gz
ports-d11fa3d44494e1878afcb8e76f29887a2a011b27.zip
MFH: r371242
japanese/mh: multiple fixes - Add japanese man pages - Don't setuid/setgid to binaries - Use BSD_INSTALL_LIB instead of cp - Remove @dirrm PR: 194352 Submitted by: Watanabe Kazuhiro <CQG00620@nifty.ne.jp> Approved by: mentors (implicit)
Notes
Notes: svn path=/branches/2014Q4/; revision=371292
-rw-r--r--japanese/mh/Makefile5
-rw-r--r--japanese/mh/files/patch-configure39
-rw-r--r--japanese/mh/files/patch-uip:rcvtty.c17
-rw-r--r--japanese/mh/pkg-plist1
4 files changed, 51 insertions, 11 deletions
diff --git a/japanese/mh/Makefile b/japanese/mh/Makefile
index d80aac8b3b4c..788495029678 100644
--- a/japanese/mh/Makefile
+++ b/japanese/mh/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mh
PORTVERSION= ${VERSION}.j${JP_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese mail
MASTER_SITES= ${MASTER_SITE_LOCAL} \
ftp://ftp.laic.u-hyogo.ac.jp/pub/net/mh/
@@ -21,7 +21,8 @@ JP_VERSION= 3.05
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-batchmode \
- --enable-apop=${PREFIX}/etc/pop.auth --enable-rpop
+ --enable-apop=${PREFIX}/etc/pop.auth \
+ --enable-jmandir=${MANPREFIX}/man/ja
MAKE_JOBS_UNSAFE= yes
CFLAGS+= -Wno-return-type
diff --git a/japanese/mh/files/patch-configure b/japanese/mh/files/patch-configure
index 0131d853ffae..948fd52a4ae6 100644
--- a/japanese/mh/files/patch-configure
+++ b/japanese/mh/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig Thu Jun 14 18:41:51 2001
-+++ configure Tue Mar 27 17:56:32 2007
+--- configure.orig 2001-06-15 01:41:51.000000000 +0900
++++ configure 2014-10-08 22:52:42.000000000 +0900
@@ -1397,14 +1397,8 @@
if test "$use_sharedlib" != no
then
@@ -15,3 +15,38 @@
echo __ELF__ | $CC -E - | grep -q __ELF__ || sharedlib=gnuelf
slflags="-fpic"
slibdir=$libdir
+@@ -1748,34 +1742,6 @@
+ pagerpath="$ac_cv_path_pager"
+ fi
+
+-echo $ac_n "checking for broken vi""... $ac_c" 1>&6
+-echo "configure:1753: checking for broken vi" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_vi_bug'+set}'`\" = set"; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- ac_cv_prog_vi_bug=no
+- echo 'r /nonexist-file
+-r /nonexist-file
+-q' | ex > /dev/null 2>&1
+- if test $? = 2
+- then
+- echo 'r /nonexist-file
+-r /nonexist-file
+-r /nonexist-file
+-q' | ex > /dev/null 2>&1
+- if test $? = 3
+- then
+- ac_cv_prog_vi_bug=yes
+- fi
+- fi
+-fi
+-
+-echo "$ac_t""$ac_cv_prog_vi_bug" 1>&6
+-if test "$ac_cv_prog_vi_bug" = yes
+-then
+- ATTVIBUG=ATTVIBUG
+-fi
+-
+ echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
+ echo "configure:1781: checking for gethostbyname" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
diff --git a/japanese/mh/files/patch-uip:rcvtty.c b/japanese/mh/files/patch-uip:rcvtty.c
index 71fc771d2a97..b1f317d06852 100644
--- a/japanese/mh/files/patch-uip:rcvtty.c
+++ b/japanese/mh/files/patch-uip:rcvtty.c
@@ -1,6 +1,11 @@
--- uip/rcvtty.c.orig 2001-04-05 01:05:17.000000000 +0900
-+++ uip/rcvtty.c 2010-04-12 17:36:19.000000000 +0900
-@@ -12,7 +12,11 @@
++++ uip/rcvtty.c 2014-10-13 17:46:24.000000000 +0900
+@@ -8,11 +8,16 @@
+ #endif
+ #include "../h/mh.h"
+ #include "../h/rcvmail.h"
++#include "../h/formatsbr.h"
+ #include "../h/scansbr.h"
#include "../zotnet/tws.h"
#include <signal.h>
#include <sys/stat.h>
@@ -12,7 +17,7 @@
#include <utmp.h>
#ifndef UTMP_FILENAME
#ifdef UTMP_FILE
-@@ -25,6 +29,7 @@
+@@ -25,6 +30,7 @@
#endif
#endif
#endif /* UTMP_FILENAME */
@@ -20,7 +25,7 @@
#endif /* not TTYD */
#ifdef LOCALE
#include <locale.h>
-@@ -110,8 +115,12 @@
+@@ -110,8 +116,12 @@
*vec[MAXARGS];
#ifndef TTYD
char tty[BUFSIZ];
@@ -33,7 +38,7 @@
#endif /* not TTYD */
#ifdef BSD43
-@@ -200,6 +209,13 @@
+@@ -200,6 +210,13 @@
user = getusr ();
#ifndef TTYD
@@ -47,7 +52,7 @@
if ((uf = fopen (UTMP_FILENAME, "r")) == NULL)
exit (RCV_MBX);
while (fread ((char *) &ut, sizeof ut, 1, uf) == 1)
-@@ -212,6 +228,7 @@
+@@ -212,6 +229,7 @@
alert (tty, md);
}
(void) fclose (uf);
diff --git a/japanese/mh/pkg-plist b/japanese/mh/pkg-plist
index b9aa6b63dc15..87bffbd61b13 100644
--- a/japanese/mh/pkg-plist
+++ b/japanese/mh/pkg-plist
@@ -70,7 +70,6 @@ lib/mh/tmac.h
lib/mh/viamail
lib/libmh.so
lib/libmh.so.3
-@dirrm lib/mh
man/ja/man1/ali.1.gz
man/ja/man1/anno.1.gz
man/ja/man1/bbc.1.gz