View | Details | Raw Unified | Return to bug 27310 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-35 / +85 lines)
Lines 1-14 Link Here
1
# New ports collection makefile for:    elm ME+ (unofficial Elm)
1
# New ports collection makefile for:	elm ME+ (unofficial Elm)
2
# Date created:         26 June 1995
2
# Date created:		26 June 1995
3
# Whom:                 ache
3
# Whom:			ache
4
#
4
#
5
# $FreeBSD: ports/mail/elm+ME/Makefile,v 1.67 2001/02/15 17:01:01 sf Exp $
5
# $FreeBSD: ports/mail/elm+ME/Makefile,v 1.67 2001/02/15 17:01:01 sf Exp $
6
#
6
#
7
7
8
PORTNAME=	elm+ME
8
PORTNAME=	elm+ME
9
PORTVERSION=	2.4.88
9
PORTVERSION=	2.4.92
10
PORTREVISION=	1
11
PORTEPOCH=	1
12
CATEGORIES=	mail
10
CATEGORIES=	mail
13
DISTNAME=	${PORTNAME:S/+ME//}-${PORTVERSION:R}ME+${PORTVERSION:E}
11
DISTNAME=	${PORTNAME:S/+ME//}-${PORTVERSION:R}ME+${PORTVERSION:E}
14
12
Lines 17-23 Link Here
17
		http://www.ozone.fmi.fi/KEH/
15
		http://www.ozone.fmi.fi/KEH/
18
16
19
# the following repositories conform to the main repository.
17
# the following repositories conform to the main repository.
20
MASTER_SITES+=	ftp://ftp.tu-darmstadt.de/pub/networking/mail/elm+ME/ \
18
MASTER_SITES+=	ftp://ftp.lip6.fr/pub/unix/mail/elm-me/ \
19
		ftp://ftp.tu-darmstadt.de/pub/networking/mail/elm+ME/ \
21
		ftp://ftp.cs.tu-berlin.de/pub/net/mail/elm-me-plus/ \
20
		ftp://ftp.cs.tu-berlin.de/pub/net/mail/elm-me-plus/ \
22
		ftp://ftp.ntua.gr/pub/net/mail/elm-me/ \
21
		ftp://ftp.ntua.gr/pub/net/mail/elm-me/ \
23
		ftp://ftp.eos.hokudai.ac.jp/pub/network/mail/elm-2.4ME+/ \
22
		ftp://ftp.eos.hokudai.ac.jp/pub/network/mail/elm-2.4ME+/ \
Lines 28-37 Link Here
28
		ftp://ftp.rge.com/pub/mail/elm/elm-2.4ME+/ \
27
		ftp://ftp.rge.com/pub/mail/elm/elm-2.4ME+/ \
29
		ftp://ftp.uni-trier.de/pub/unix/network/mail/elm-me+/
28
		ftp://ftp.uni-trier.de/pub/unix/network/mail/elm-me+/
30
29
31
# fetch doesn't work w/ ftp.lip6.fr and ftp doesn't work w/ the http protocol.
32
# MASTER_SITES+=	ftp://ftp.lip6.fr/pub/unix/mail/elm-me/
33
# FETCH_CMD=	/usr/bin/ftp
34
35
MAINTAINER=	clefevre@poboxes.com
30
MAINTAINER=	clefevre@poboxes.com
36
31
37
# not needed since config.sh is generated by scripts/pre-configure.
32
# not needed since config.sh is generated by scripts/pre-configure.
Lines 40-119 Link Here
40
# BUILD_DEPENDS=	pgp:${PORTSDIR}/security/pgp
35
# BUILD_DEPENDS=	pgp:${PORTSDIR}/security/pgp
41
# BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
36
# BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
42
37
43
WRKSRC=		${WRKDIR}/${DISTNAME:S/-//:S/ME+/.ME+./}
44
45
#
38
#
46
# Global variables
39
# Global variables
47
#
40
#
48
41
42
WRKSRC=		${WRKDIR}/${DISTNAME:S/-//:S/ME+/.ME+./}
43
49
HAS_CONFIGURE=	yes
44
HAS_CONFIGURE=	yes
50
45
51
CONFIGURE_SCRIPT=	Configure
46
CONFIGURE_SCRIPT=	Configure
52
SCRIPTS_ENV=		CFLAGS="${CFLAGS}" PREFIX="${PREFIX}"
47
SCRIPTS_ENV=	CFLAGS="${CFLAGS}" ${PLIST_SUB} \
53
CONFIGURE_ARGS=		-S -d -P${PREFIX}
48
		PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}"
49
CONFIGURE_ARGS=	-S -P ${PREFIX}
50
51
MAKE_ARGS=	MJ="FORMATTER=groff FORMATTER_OPTS=-Tlatin1"
52
ALL_TARGET=	all documentation
53
54
PLIST_SUB=	SO_REV="${SO_REV}" DOC_SUBDIR="${DOC_SUBDIR}" \
55
		LIB_SUBDIR="${LIB_SUBDIR}" SHLIB_SUBDIR="${SHLIB_SUBDIR}"
54
56
55
MAN1=		answer.1 checkalias.1 elm.1 elmalias.1 elmcharset.1 \
57
MAN1=		answer.1 checkalias.1 elm.1 elmalias.1 elmcharset.1 \
56
		elmterminal.1 fastmail.1 frm.1 listalias.1 messages.1 \
58
		elmterminal.1 elmunidata.1 fastmail.1 frm.1 listalias.1 \
57
		newalias.1 newmail.1 printmail.1 readmsg.1
59
		messages.1 newalias.1 newmail.1 printmail.1 readmsg.1
58
MLINKS=		frm.1 nfrm.1	newmail.1 wnewmail.1
60
MLINKS=		frm.1 nfrm.1	newmail.1 wnewmail.1
59
61
60
#
62
#
61
# Local variables
63
# Local variables
62
#
64
#
63
65
64
DESTLIBDIR=	${PREFIX}/lib/${PORTNAME:S/+ME//}
66
SO_REV=		`${AWK} '/SHAREDTAG:/{print $$2}' ${WRKSRC}/hdrs/patchlevel.h`
65
MIMETYPES=	elm.mimetypes
67
MSECS=		1
66
68
69
RCD_SUBDIR=	etc/rc.d
70
LIB_SUBDIR=	lib/elm
71
SHLIB_SUBDIR=	libexec/elm
72
DOC_SUBDIR=	share/doc/elm
73
74
RCD_FILE=	00elm.sh
75
MIME_TYPES=	elm.mimetypes
76
DOC_FILES=	README.ME+ shared_libs/tls/README.TLS \
77
		doc/Alias.fmtd doc/Config.fmtd doc/Cover.fmtd \
78
		doc/Form.fmtd doc/Ref.fmtd doc/Users.fmtd
79
80
AWK?=		awk
81
67
#
82
#
68
# Post-patch
83
# Post-patch
69
#
84
#
70
85
86
post-patch: patch-install-script patch-setgid patch-nls-files
87
88
patch-install-script:
89
	@${SED} -e 's,%%SHLIB_SUBDIR%%,${SHLIB_SUBDIR},' \
90
		${FILESDIR}/${RCD_FILE} > ${WRKSRC}/${RCD_FILE}
91
71
# d_savegrpmboxid is currently broken using setgid(2) instead of setegid(2).
92
# d_savegrpmboxid is currently broken using setgid(2) instead of setegid(2).
72
# will probably be fixed in the next release, for instance, fake a patch.
93
# will probably be fixed in a next release, for instance, fake a patch.
73
# the alternative would be to disable this option in pre-configure script.
94
# the alternative would be to disable this option in pre-configure script.
74
post-patch:
95
patch-setgid:
75
	@${PERL} -pi.fbsd -e 's,setgid,setegid,' \
96
	@${PERL} -pi.fbsd -e 's,setgid,setegid,' \
76
		${WRKSRC}/lib/localmbx.c \
97
		${WRKSRC}/lib/localmbx.c \
77
		${WRKSRC}/src/init.c ${WRKSRC}/src/lock.c
98
		${WRKSRC}/src/init.c ${WRKSRC}/src/lock.c
78
99
79
#
100
patch-nls-files:
80
# Post-configure
81
#
82
83
post-configure:
84
	@${PERL} -pi.fbsd -e 's,/usr/local,${PREFIX},' ${WRKSRC}/nls/LANGS
101
	@${PERL} -pi.fbsd -e 's,/usr/local,${PREFIX},' ${WRKSRC}/nls/LANGS
85
102
86
#
103
#
87
# Post-install
104
# Post-install
88
#
105
#
89
106
90
post-install: install-nls install-mime-types \
107
post-install: install-startup-files install-nls-files \
108
	      install-doc-files install-mime-types \
91
	      remove-catman-files remove-catman-links
109
	      remove-catman-files remove-catman-links
110
111
install-startup-files:
112
	@${INSTALL_SCRIPT} ${WRKSRC}/${RCD_FILE} ${PREFIX}/${RCD_SUBDIR}
92
113
93
install-nls:
114
install-nls-files:
94
	@cd ${WRKSRC}/nls; ${MAKE} install
115
	@cd ${WRKSRC}/nls; ${MAKE} install
95
116
117
install-doc-files:
118
.if !defined(NOPORTSDOC)
119
	@${MKDIR} ${PREFIX}/${DOC_SUBDIR}
120
.for file in ${DOC_FILES}
121
	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/${DOC_SUBDIR}
122
	@${GZIP_CMD} ${PREFIX}/${DOC_SUBDIR}/${file:T}
123
.endfor
124
.endif
125
96
install-mime-types:
126
install-mime-types:
97
	@${INSTALL_DATA} \
127
	@${INSTALL_DATA} ${FILESDIR}/${MIME_TYPES} \
98
		${FILESDIR}/${MIMETYPES} ${DESTLIBDIR}/${MIMETYPES}-dist
128
		${PREFIX}/${LIB_SUBDIR}/${MIME_TYPES}-dist
99
	@if [ ! -f ${DESTLIBDIR}/${MIMETYPES} ]; then \
129
	@if [ ! -f ${PREFIX}/${LIB_SUBDIR}/${MIME_TYPES} ]; then \
100
		${INSTALL_DATA} ${FILESDIR}/${MIMETYPES} ${DESTLIBDIR}; \
130
		${INSTALL_DATA} ${FILESDIR}/${MIME_TYPES} \
131
			${PREFIX}/${LIB_SUBDIR}; \
101
	fi
132
	fi
102
133
103
remove-catman-files:
134
remove-catman-files:
104
.for sect in 1
135
.for sect in ${MSECS}
105
.for page in ${MAN${sect}}
136
.for page in ${MAN${sect}}
106
	@${RM} -f ${MAN${sect}PREFIX}/man/cat${sect}/${page}
137
	@${RM} -f ${MAN${sect}PREFIX}/man/cat${sect}/${page}
107
.endfor
138
.endfor
108
.endfor
139
.endfor
109
140
110
remove-catman-links:
141
remove-catman-links:
111
.for sect in 1
142
.for sect in ${MSECS}
112
.for page in ${MLINKS}
143
.for page in ${MLINKS}
113
.if ${MAN${sect}:M${page}} == ""
144
.if ${MAN${sect}:M${page}} == ""
114
	@${RM} -f ${MAN${sect}PREFIX}/man/cat${sect}/${page}
145
	@${RM} -f ${MAN${sect}PREFIX}/man/cat${sect}/${page}
115
.endif
146
.endif
116
.endfor
147
.endfor
117
.endfor
148
.endfor
149
150
.include <bsd.port.pre.mk>
151
152
# some sketchy hackery
153
FETCH_CMD_INTERIOR=	${FETCH_CMD:M*fetch*}
154
155
# only enable the hack if FETCH_CMD is fetch
156
.if !empty(FETCH_CMD_INTERIOR)
157
158
# lip6 dislike $USER@localhost...
159
FETCH_ENV=	FTP_PASSWORD=${FTP_PASSWORD}
160
161
AWK?=		awk
162
IFCONFIG?=	ifconfig
163
164
# well, this is a hack to make fetch happy on lip6, ugh!
165
HOSTIPADDR=	${IFCONFIG} | ${AWK} '/inet /{print $$2; exit}'
166
FTP_PASSWORD?=	${USER}@`${HOSTIPADDR}`
167
.endif
118
168
119
.include <bsd.port.mk>
169
.include <bsd.port.post.mk>
(-)distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (elm-2.4ME+88.tar.gz) = 96704eae50aace159a752caafb9bcd44
1
MD5 (elm-2.4ME+92.tar.gz) = fd3ebe8318a6f33cc3f42aeda39808d7
(-)pkg-plist (-13 / +30 lines)
Lines 1-3 Link Here
1
@comment $FreeBSD$
1
bin/answer
2
bin/answer
2
bin/checkalias
3
bin/checkalias
3
bin/elm
4
bin/elm
Lines 14-30 Link Here
14
@unexec rm -f %B/wnewmail
15
@unexec rm -f %B/wnewmail
15
bin/printmail
16
bin/printmail
16
bin/readmsg
17
bin/readmsg
17
share/nls/C/elm2.4me+.cat
18
etc/rc.d/00elm.sh
18
lib/elm/elm-help.0
19
%%LIB_SUBDIR%%/elm-help.0
19
lib/elm/elm-help.1
20
%%LIB_SUBDIR%%/elm-help.1
20
lib/elm/elm-help.2
21
%%LIB_SUBDIR%%/elm-help.2
21
lib/elm/elm-help.3
22
%%LIB_SUBDIR%%/elm-help.3
22
lib/elm/elm.mimecharsets
23
%%LIB_SUBDIR%%/elm.map.bin/unidata.bin
23
@unexec if cmp -s %D/lib/elm/elm.mimetypes %D/lib/elm/elm.mimetypes-dist; then rm -f %D/lib/elm/elm.mimetypes; fi
24
%%LIB_SUBDIR%%/elm.mimecharsets
24
lib/elm/elm.mimetypes-dist
25
@unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.mimetypes %D/%%LIB_SUBDIR%%/elm.mimetypes-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.mimetypes; fi
26
%%LIB_SUBDIR%%/elm.mimetypes-dist
25
@exec [ ! -f %B/elm.mimetypes ] && cp %B/%f %B/elm.mimetypes
27
@exec [ ! -f %B/elm.mimetypes ] && cp %B/%f %B/elm.mimetypes
26
lib/elm/elmcharset
28
%%LIB_SUBDIR%%/elmcharset
27
lib/elm/elmrc-info
29
%%LIB_SUBDIR%%/elmrc-info
28
lib/elm/elmterminal
30
%%LIB_SUBDIR%%/elmterminal
29
lib/elm/prlong
31
%%LIB_SUBDIR%%/elmunidata
30
@dirrm lib/elm
32
%%LIB_SUBDIR%%/prlong
33
%%SHLIB_SUBDIR%%/libelmme-base.so%%SO_REV%%
34
%%SHLIB_SUBDIR%%/libelmme-tls.so%%SO_REV%%
35
%%PORTDOCS%%%%DOC_SUBDIR%%/README.ME+.gz
36
%%PORTDOCS%%%%DOC_SUBDIR%%/README.TLS.gz
37
%%PORTDOCS%%%%DOC_SUBDIR%%/Alias.fmtd.gz
38
%%PORTDOCS%%%%DOC_SUBDIR%%/Config.fmtd.gz
39
%%PORTDOCS%%%%DOC_SUBDIR%%/Cover.fmtd.gz
40
%%PORTDOCS%%%%DOC_SUBDIR%%/Form.fmtd.gz
41
%%PORTDOCS%%%%DOC_SUBDIR%%/Ref.fmtd.gz
42
%%PORTDOCS%%%%DOC_SUBDIR%%/Users.fmtd.gz
43
share/nls/C/elm2.4me+.cat
44
@dirrm %%LIB_SUBDIR%%/elm.map.bin
45
@dirrm %%LIB_SUBDIR%%
46
@dirrm %%SHLIB_SUBDIR%%
47
%%PORTDOCS%%@dirrm %%DOC_SUBDIR%%
(-)files/elm.mimetypes (+4 lines)
Lines 1-4 Link Here
1
# $FreeBSD$
2
#
1
# mime.types for Elm 2.4PL24 ME8 (or greater)
3
# mime.types for Elm 2.4PL24 ME8 (or greater)
4
#
5
# Written by Cyrille Lefevre <clefevre@poboxes.com>
2
#
6
#
3
# Format of this file:
7
# Format of this file:
4
# <suffix> <content-type>
8
# <suffix> <content-type>
(-)files/patch-ac (-3 / +20 lines)
Lines 1-5 Link Here
1
--- Configure.orig	Fri Dec 29 20:57:04 2000
1
--- Configure.orig	Fri May 11 19:35:20 2001
2
+++ Configure	Sat Jan  6 23:19:54 2001
2
+++ Configure	Sun May 13 01:26:06 2001
3
@@ -16,10 +16,10 @@
3
@@ -16,10 +16,10 @@
4
 PATH=".:$PATH:/bin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin"
4
 PATH=".:$PATH:/bin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin"
5
 export PATH || (echo "OOPS, this isn't sh.  Desperation time.  I will feed myself to sh."; sh $0; kill $$)
5
 export PATH || (echo "OOPS, this isn't sh.  Desperation time.  I will feed myself to sh."; sh $0; kill $$)
Lines 15-22 Link Here
15
 
15
 
16
 (alias) >/dev/null 2>&1 && \
16
 (alias) >/dev/null 2>&1 && \
17
     echo "(I see you are using the Korn shell.  Some ksh's blow up on Configure," && \
17
     echo "(I see you are using the Korn shell.  Some ksh's blow up on Configure," && \
18
@@ -1926,7 +1926,10 @@
18
@@ -1971,7 +1971,7 @@
19
 	echo "Found shlib directory"
20
     fi
19
 
21
 
22
-    $echo "Trying create chared library"
23
+    $echo "Trying create shared library"
24
 
25
     LibLoc=`cd ..; pwd`/shlib
26
     
27
@@ -2263,7 +2263,10 @@
28
 
20
 : see if crypt exists
29
 : see if crypt exists
21
 echo " "
30
 echo " "
22
-if $contains '^crypt$' libc.list >/dev/null 2>&1; then
31
-if $contains '^crypt$' libc.list >/dev/null 2>&1; then
Lines 27-29 Link Here
27
     echo 'crypt() found.'
36
     echo 'crypt() found.'
28
     d_crypt="$define"
37
     d_crypt="$define"
29
     cryptlib=''
38
     cryptlib=''
39
@@ -2767,6 +2770,7 @@
40
 
41
     $echo $n "Testing if inet_aton can be used ... $c"
42
     $cat > try.c <<'EOF'
43
+#include <sys/types.h>
44
 #include <sys/socket.h>
45
 #include <netinet/in.h>
46
 #include <arpa/inet.h>
(-)scripts/pre-configure (-6 / +31 lines)
Lines 6-12 Link Here
6
6
7
[ -r /usr/include/inttypes.h ] && has_inttypes=define || has_inttypes=undef
7
[ -r /usr/include/inttypes.h ] && has_inttypes=define || has_inttypes=undef
8
8
9
	cat > ${WRKSRC}/config.sh << EOF
9
[ -d  ${WRKSRC}/shlib ] || mkdir ${WRKSRC}/shlib
10
11
cat > ${WRKSRC}/config.sh << EOF
10
#!/bin/sh
12
#!/bin/sh
11
# config.sh
13
# config.sh
12
# This file was produced by running the Configure script.
14
# This file was produced by running the Configure script.
Lines 30-35 Link Here
30
d_connect_reopen='undef'
32
d_connect_reopen='undef'
31
d_netdb='define'
33
d_netdb='define'
32
d_netinet_in='define'
34
d_netinet_in='define'
35
d_use_aton='define'
33
d_inttypes='$has_inttypes'
36
d_inttypes='$has_inttypes'
34
d_nointtypes='undef'
37
d_nointtypes='undef'
35
n='-n'
38
n='-n'
Lines 162-168 Link Here
162
execmail=''
165
execmail=''
163
libswanted='sun nls c_s'
166
libswanted='sun nls c_s'
164
noaddlib='yes'
167
noaddlib='yes'
165
c_date='Wed Feb  7 02:17:00 CET 2001'
168
c_date='Sun May 13 02:00:14 CEST 2001'
166
d_ascii='undef'
169
d_ascii='undef'
167
d_broke_ctype='undef'
170
d_broke_ctype='undef'
168
d_calendar='define'
171
d_calendar='define'
Lines 215-221 Link Here
215
d_putenv='define'
218
d_putenv='define'
216
maxattempts='6'
219
maxattempts='6'
217
d_setgid='define'
220
d_setgid='define'
218
d_savegrpmboxid='define'
219
mailermode='2755'
221
mailermode='2755'
220
d_sigvec='undef'
222
d_sigvec='undef'
221
d_sigvectr='undef'
223
d_sigvectr='undef'
Lines 238-243 Link Here
238
d_strtok='define'
240
d_strtok='define'
239
d_subshell='define'
241
d_subshell='define'
240
d_tempnam='define'
242
d_tempnam='define'
243
d_setlinebuf='define'
244
d_shared='define'
245
d_shared_rev='${SO_REV}'
246
d_dlopen_libs='define'
247
shared_list='tls'
248
d_dynamic_main='define'
249
dynamic_opt='-rdynamic'
250
dlopen_lib=''
251
rpath_opt='-rpath '
252
soname_opt='-shared -soname '
241
tempnamo=''
253
tempnamo=''
242
tempnamc=''
254
tempnamc=''
243
d_termio='undef'
255
d_termio='undef'
Lines 260-273 Link Here
260
i_unistd='define'
272
i_unistd='define'
261
i_utime='define'
273
i_utime='define'
262
i_sysutime='undef'
274
i_sysutime='undef'
263
lib='${PREFIX}/lib/elm'
275
lib='${PREFIX}/${LIB_SUBDIR}'
276
shlib='${PREFIX}/${SHLIB_SUBDIR}'
277
libdirname='lib'
264
libc='/usr/lib/libc.so'
278
libc='/usr/lib/libc.so'
265
linepr='/usr/bin/lp'
279
linepr='/usr/bin/lp'
266
maildir='/var/mail'
280
maildir='/var/mail'
267
mailer='/usr/sbin/sendmail'
281
mailer='/usr/sbin/sendmail'
268
mailgrp='mail'
282
mailgrp='mail'
269
mansrc='${PREFIX}/man/man1'
283
mansrc='${MAN1PREFIX}/man/man1'
270
catmansrc='${PREFIX}/man/cat1'
284
catmansrc='${MAN1PREFIX}/man/cat1'
271
manext='.1'
285
manext='.1'
272
manext_choice='.1'
286
manext_choice='.1'
273
catmanext='.1'
287
catmanext='.1'
Lines 312-317 Link Here
312
special_path2='${PREFIX}/bin'
326
special_path2='${PREFIX}/bin'
313
locale_dir='/usr/share/locale'
327
locale_dir='/usr/share/locale'
314
CONFIG=true
328
CONFIG=true
329
tls_ok='define'
330
EOF
331
332
mv  ${WRKSRC}/shared_libs/tls/README.ME+ ${WRKSRC}/shared_libs/tls/README.TLS
333
334
cat > ${WRKSRC}/shared_libs/tls/config.res << EOF
335
#  Support for TLS
336
tls_ok='define'
337
tls_dir='system'
338
tls_include_dir=''
339
tls_lib_dir=''
315
EOF
340
EOF
316
341
317
exit 0
342
exit 0

Return to bug 27310