Attachment #148297 for bug #194352

View | Details | Raw Unified | Return to bug 194352
Collapse All | Expand All

Lines 3-9 Link Here

(-)mh/Makefile (-2 / +3 lines)
3		3
4	PORTNAME= mh	4	PORTNAME= mh
5	PORTVERSION= ${VERSION}.j${JP_VERSION}	5	PORTVERSION= ${VERSION}.j${JP_VERSION}
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= japanese mail	7	CATEGORIES= japanese mail
8	MASTER_SITES= ${MASTER_SITE_LOCAL} \	8	MASTER_SITES= ${MASTER_SITE_LOCAL} \
9	ftp://ftp.laic.u-hyogo.ac.jp/pub/net/mh/	9	ftp://ftp.laic.u-hyogo.ac.jp/pub/net/mh/
Lines 21-27 Link Here
21		21
22	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
23	CONFIGURE_ARGS= --enable-batchmode \	23	CONFIGURE_ARGS= --enable-batchmode \
24	--enable-apop=${PREFIX}/etc/pop.auth --enable-rpop	24	--enable-apop=${PREFIX}/etc/pop.auth \
		25	--enable-jmandir=${MANPREFIX}/man/ja
25	MAKE_JOBS_UNSAFE= yes	26	MAKE_JOBS_UNSAFE= yes
26	CFLAGS+= -Wno-return-type	27	CFLAGS+= -Wno-return-type
27		28

Line 0 Link Here

(-)mh/files/patch-conf__makefiles__sbr (+11 lines)
	1	--- conf/makefiles/sbr.orig 2014-10-13 21:36:31.000000000 +0900
	2	+++ conf/makefiles/sbr 2014-10-13 21:38:10.000000000 +0900
	3	@@ -189,7 +189,7 @@
	4	@BEGIN: SHAREDLIB
	5	inst-lib: libmh.so $(LIBSA)
	6	-rm -f $(SLIBDIR)/libmh.so.$(SLIBVER)
	7	- cp libmh.so.$(SLIBVER) $(SLIBDIR)/libmh.so.$(SLIBVER)
	8	+ ${BSD_INSTALL_LIB} libmh.so.$(SLIBVER) $(SLIBDIR)/libmh.so.$(SLIBVER)
	9	-@chmod $(PGMPROT) $(SLIBDIR)/libmh.so.$(SLIBVER)
	10	@BEGIN: GELFSHLIB
	11	-@ln -sf libmh.so.$(SLIBVER) $(SLIBDIR)/libmh.so

Line 0 Link Here

(-)mh/files/patch-conf__makefiles__uip (+13 lines)
	1	--- conf/makefiles/uip.orig 2001-05-30 23:57:47.000000000 +0900
	2	+++ conf/makefiles/uip 2014-10-13 17:55:46.000000000 +0900
	3	@@ -995,10 +995,6 @@
	4	-chmod g-s zrcvtty
	5	$(CP) xrcvtty $@
	6	-@chmod $(PGMPROT) $@
	7	-@BEGIN: BSD43
	8	- -@chgrp tty $@
	9	- -@chmod g+s $@
	10	-@END: BSD43
	11	-@ls -l $@
	12	-@echo ""
	13




--- 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

       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

Lines 1-6 Link Here

(-)mh/files/patch-uip:rcvtty.c (-6 / +11 lines)
1	--- uip/rcvtty.c.orig 2001-04-05 01:05:17.000000000 +0900	1	--- uip/rcvtty.c.orig 2001-04-05 01:05:17.000000000 +0900
2	+++ uip/rcvtty.c 2010-04-12 17:36:19.000000000 +0900	2	+++ uip/rcvtty.c 2014-10-13 17:46:24.000000000 +0900
3	@@ -12,7 +12,11 @@	3	@@ -8,11 +8,16 @@
		4	#endif
		5	#include "../h/mh.h"
		6	#include "../h/rcvmail.h"
		7	+#include "../h/formatsbr.h"
		8	#include "../h/scansbr.h"
4	#include "../zotnet/tws.h"	9	#include "../zotnet/tws.h"
5	#include <signal.h>	10	#include <signal.h>
6	#include <sys/stat.h>	11	#include <sys/stat.h>
Lines 12-18 Link Here
12	#include <utmp.h>	17	#include <utmp.h>
13	#ifndef UTMP_FILENAME	18	#ifndef UTMP_FILENAME
14	#ifdef UTMP_FILE	19	#ifdef UTMP_FILE
15	@@ -25,6 +29,7 @@	20	@@ -25,6 +30,7 @@
16	#endif	21	#endif
17	#endif	22	#endif
18	#endif /* UTMP_FILENAME */	23	#endif /* UTMP_FILENAME */
Lines 20-26 Link Here
20	#endif /* not TTYD */	25	#endif /* not TTYD */
21	#ifdef LOCALE	26	#ifdef LOCALE
22	#include <locale.h>	27	#include <locale.h>
23	@@ -110,8 +115,12 @@	28	@@ -110,8 +116,12 @@
24	*vec[MAXARGS];	29	*vec[MAXARGS];
25	#ifndef TTYD	30	#ifndef TTYD
26	char tty[BUFSIZ];	31	char tty[BUFSIZ];
Lines 33-39 Link Here
33	#endif /* not TTYD */	38	#endif /* not TTYD */
34		39
35	#ifdef BSD43	40	#ifdef BSD43
36	@@ -200,6 +209,13 @@	41	@@ -200,6 +210,13 @@
37		42
38	user = getusr ();	43	user = getusr ();
39	#ifndef TTYD	44	#ifndef TTYD
Lines 47-53 Link Here
47	if ((uf = fopen (UTMP_FILENAME, "r")) == NULL)	52	if ((uf = fopen (UTMP_FILENAME, "r")) == NULL)
48	exit (RCV_MBX);	53	exit (RCV_MBX);
49	while (fread ((char *) &ut, sizeof ut, 1, uf) == 1)	54	while (fread ((char *) &ut, sizeof ut, 1, uf) == 1)
50	@@ -212,6 +228,7 @@	55	@@ -212,6 +229,7 @@
51	alert (tty, md);	56	alert (tty, md);
52	}	57	}
53	(void) fclose (uf);	58	(void) fclose (uf);

Lines 70-76 Link Here

(-)mh/pkg-plist (-1 lines)
70	lib/mh/viamail	70	lib/mh/viamail
71	lib/libmh.so	71	lib/libmh.so
72	lib/libmh.so.3	72	lib/libmh.so.3
73	@dirrm lib/mh
74	man/ja/man1/ali.1.gz	73	man/ja/man1/ali.1.gz
75	man/ja/man1/anno.1.gz	74	man/ja/man1/anno.1.gz
76	man/ja/man1/bbc.1.gz	75	man/ja/man1/bbc.1.gz

Return to bug 194352

Lines 1-5 Link Here

(-)mh/files/patch-configure (-2 / +37 lines)
1	--- configure.orig Thu Jun 14 18:41:51 2001	1	--- configure.orig 2001-06-15 01:41:51.000000000 +0900
2	+++ configure Tue Mar 27 17:56:32 2007	2	+++ configure 2014-10-08 22:52:42.000000000 +0900
3	@@ -1397,14 +1397,8 @@	3	@@ -1397,14 +1397,8 @@
4	if test "$use_sharedlib" != no	4	if test "$use_sharedlib" != no
5	then	5	then
Lines 15-17 Link Here
15	echo __ELF__ \| $CC -E - \| grep -q __ELF__ \|\| sharedlib=gnuelf	15	echo __ELF__ \| $CC -E - \| grep -q __ELF__ \|\| sharedlib=gnuelf
16	slflags="-fpic"	16	slflags="-fpic"
17	slibdir=$libdir	17	slibdir=$libdir
		18	@@ -1748,34 +1742,6 @@
		19	pagerpath="$ac_cv_path_pager"
		20	fi
		21
		22	-echo $ac_n "checking for broken vi""... $ac_c" 1>&6
		23	-echo "configure:1753: checking for broken vi" >&5
		24	-if eval "test \"`echo '$''{'ac_cv_prog_vi_bug'+set}'`\" = set"; then
		25	- echo $ac_n "(cached) $ac_c" 1>&6
		26	-else
		27	- ac_cv_prog_vi_bug=no
		28	- echo 'r /nonexist-file
		29	-r /nonexist-file
		30	-q' \| ex > /dev/null 2>&1
		31	- if test $? = 2
		32	- then
		33	- echo 'r /nonexist-file
		34	-r /nonexist-file
		35	-r /nonexist-file
		36	-q' \| ex > /dev/null 2>&1
		37	- if test $? = 3
		38	- then
		39	- ac_cv_prog_vi_bug=yes
		40	- fi
		41	- fi
		42	-fi
		43	-
		44	-echo "$ac_t""$ac_cv_prog_vi_bug" 1>&6
		45	-if test "$ac_cv_prog_vi_bug" = yes
		46	-then
		47	- ATTVIBUG=ATTVIBUG
		48	-fi
		49	-
		50	echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
		51	echo "configure:1781: checking for gethostbyname" >&5
		52	if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then