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

Collapse All | Expand All

(-)Makefile (-10 / +12 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	elm+ME
8
PORTNAME=	elm+ME
9
PORTVERSION=	${ELM_VERSION}.${ELM_REVISION}${ELM_PATCHLEVEL}
9
PORTVERSION=	${ELM_VERSION}.${ELM_REVISION}${ELM_PATCHLEVEL:S/_//}
10
CATEGORIES=	mail
10
CATEGORIES=	mail
11
DISTNAME=	elm-${ELM_VERSION}ME+${ELM_REVISION}
11
DISTNAME=	elm-${ELM_VERSION}ME+${ELM_REVISION}
12
12
Lines 45-50 Link Here
45
WRKSRC=		${WRKDIR}/${DISTNAME:S/-//:S/ME+/.ME+./}
45
WRKSRC=		${WRKDIR}/${DISTNAME:S/-//:S/ME+/.ME+./}
46
46
47
HAS_CONFIGURE=	yes
47
HAS_CONFIGURE=	yes
48
USE_REINPLACE=	yes
48
49
49
CONFIGURE_SCRIPT=	Configure
50
CONFIGURE_SCRIPT=	Configure
50
SCRIPTS_ENV=	CFLAGS="${CFLAGS}" ${PLIST_SUB} PREFIX="${PREFIX}" \
51
SCRIPTS_ENV=	CFLAGS="${CFLAGS}" ${PLIST_SUB} PREFIX="${PREFIX}" \
Lines 61-81 Link Here
61
		LIB_SUBDIR="${LIB_SUBDIR}" SHLIB_SUBDIR="${SHLIB_SUBDIR}"
62
		LIB_SUBDIR="${LIB_SUBDIR}" SHLIB_SUBDIR="${SHLIB_SUBDIR}"
62
63
63
MAN1=		answer.1 checkalias.1 elm.1 elmalias.1 elmcharset.1 \
64
MAN1=		answer.1 checkalias.1 elm.1 elmalias.1 elmcharset.1 \
64
		elmrc-write.1 elmterminal.1 elmunidata.1 fastmail.1 frm.1 \
65
		elmrc-write.1 elmstringconvert.1 elmterminal.1 \
65
		listalias.1 messages.1 newalias.1 newmail.1 printmail.1 \
66
		elmunidata.1 fastmail.1 frm.1 listalias.1 messages.1 \
66
		readmsg.1
67
		newalias.1 newmail.1 printmail.1 readmsg.1
67
MLINKS=		frm.1 nfrm.1	newmail.1 wnewmail.1
68
MLINKS=		frm.1 nfrm.1	newmail.1 wnewmail.1
68
69
69
# Local variables
70
# Local variables
70
#
71
#
71
72
72
ELM_VERSION=	2.4
73
ELM_VERSION=	2.4
73
ELM_REVISION=	98
74
ELM_REVISION=	99
74
ELM_PATCHLEVEL=	b
75
ELM_PATCHLEVEL=	_
75
76
76
ELM_PATCHDONE=	false
77
ELM_PATCHDONE=	false
77
.for level in a b c d e f
78
.for level in _ a b c d e f
78
.if ${ELM_PATCHDONE} == false
79
_level=${level}
80
.if ${_level} != _ && ${ELM_PATCHDONE} == false
79
PATCHFILES+=	${DISTNAME:S/+/+PL/}${level}.patch.gz
81
PATCHFILES+=	${DISTNAME:S/+/+PL/}${level}.patch.gz
80
.endif
82
.endif
81
.if ${ELM_PATCHLEVEL} == ${level}
83
.if ${ELM_PATCHLEVEL} == ${level}
Lines 121-132 Link Here
121
# will probably be fixed in a next release, for instance, fake a patch.
123
# will probably be fixed in a next release, for instance, fake a patch.
122
# the alternative would be to disable this option in pre-configure script.
124
# the alternative would be to disable this option in pre-configure script.
123
patch-setgid:
125
patch-setgid:
124
	@${PERL} -pi.fbsd -e 's,setgid,setegid,' \
126
	@${REINPLACE_CMD} -e 's|setgid|setegid|' \
125
		${WRKSRC}/lib/localmbx.c \
127
		${WRKSRC}/lib/localmbx.c \
126
		${WRKSRC}/src/init.c ${WRKSRC}/src/lock.c
128
		${WRKSRC}/src/init.c ${WRKSRC}/src/lock.c
127
129
128
patch-nls-files:
130
patch-nls-files:
129
	@${PERL} -pi.fbsd -e 's,/usr/local,${PREFIX},' ${WRKSRC}/nls/LANGS
131
	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/nls/LANGS
130
132
131
# Pre-install
133
# Pre-install
132
#
134
#
(-)distinfo (-3 / +1 lines)
Lines 1-3 Link Here
1
MD5 (elm-2.4ME+98.tar.gz) = fa75d7ce8cf6fbbba864a029b846a2c5
1
MD5 (elm-2.4ME+99.tar.gz) = 014e2a606fb1a7e80d048680c80dfb60
2
MD5 (elm-2.4ME+PL98a.patch.gz) = fe7b89436aae9cb8d82ccb304d432ebe
3
MD5 (elm-2.4ME+PL98b.patch.gz) = 8f2aed9d2b27259203038adb16134882
(-)pkg-plist (-13 / +14 lines)
Lines 3-8 Link Here
3
bin/checkalias
3
bin/checkalias
4
bin/elm
4
bin/elm
5
bin/elmalias
5
bin/elmalias
6
bin/elmstringconvert
6
bin/fastmail
7
bin/fastmail
7
bin/frm
8
bin/frm
8
@exec ln -f %B/%f %B/nfrm
9
@exec ln -f %B/%f %B/nfrm
Lines 31-49 Link Here
31
%%LIB_SUBDIR%%/elm.map.txt/8859-7.TXT
32
%%LIB_SUBDIR%%/elm.map.txt/8859-7.TXT
32
%%LIB_SUBDIR%%/elm.map.txt/8859-8.TXT
33
%%LIB_SUBDIR%%/elm.map.txt/8859-8.TXT
33
%%LIB_SUBDIR%%/elm.map.txt/8859-9.TXT
34
%%LIB_SUBDIR%%/elm.map.txt/8859-9.TXT
34
@unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.mimecharsets %D/%%LIB_SUBDIR%%/elm.mimecharsets-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.mimecharsets; fi
35
%%LIB_SUBDIR%%/elm.mimecharsets-dist
36
@exec [ -f %B/elm.mimecharsets ] || cp %B/%f %B/elm.mimecharsets
37
@unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.mimetypes %D/%%LIB_SUBDIR%%/elm.mimetypes-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.mimetypes; fi
38
%%LIB_SUBDIR%%/elm.mimetypes-dist
39
@exec [ -f %B/elm.mimetypes ] || cp %B/%f %B/elm.mimetypes
40
@unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.rc %D/%%LIB_SUBDIR%%/elm.rc-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.rc; fi
41
%%LIB_SUBDIR%%/elm.rc-dist
42
@exec if [ -f %B/elm.rc ]; then %D/%%LIB_SUBDIR%%/elmrc-write -G -I; fi
43
@exec [ -f %B/elm.rc ] || cp %B/%f %B/elm.rc
44
@unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.terminalinfo %D/%%LIB_SUBDIR%%/elm.terminalinfo-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.terminalinfo; fi
45
%%LIB_SUBDIR%%/elm.terminalinfo-dist
46
@exec [ -f %B/elm.terminalinfo ] || cp %B/%f %B/elm.terminalinfo
47
%%LIB_SUBDIR%%/elmcharset
35
%%LIB_SUBDIR%%/elmcharset
48
%%LIB_SUBDIR%%/elmrc-info
36
%%LIB_SUBDIR%%/elmrc-info
49
%%LIB_SUBDIR%%/elmrc-write
37
%%LIB_SUBDIR%%/elmrc-write
Lines 65-70 Link Here
65
%%PORTDOCS%%%%DOC_SUBDIR%%/Ref.fmtd.gz
53
%%PORTDOCS%%%%DOC_SUBDIR%%/Ref.fmtd.gz
66
%%PORTDOCS%%%%DOC_SUBDIR%%/Users.fmtd.gz
54
%%PORTDOCS%%%%DOC_SUBDIR%%/Users.fmtd.gz
67
share/nls/C/elm2.4me+.cat
55
share/nls/C/elm2.4me+.cat
56
@unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.mimecharsets %D/%%LIB_SUBDIR%%/elm.mimecharsets-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.mimecharsets; fi
57
%%LIB_SUBDIR%%/elm.mimecharsets-dist
58
@exec [ -f %B/elm.mimecharsets ] || cp %B/%f %B/elm.mimecharsets
59
@unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.mimetypes %D/%%LIB_SUBDIR%%/elm.mimetypes-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.mimetypes; fi
60
%%LIB_SUBDIR%%/elm.mimetypes-dist
61
@exec [ -f %B/elm.mimetypes ] || cp %B/%f %B/elm.mimetypes
62
@unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.rc %D/%%LIB_SUBDIR%%/elm.rc-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.rc; fi
63
%%LIB_SUBDIR%%/elm.rc-dist
64
@exec if [ -f %B/elm.rc ]; then %D/%%LIB_SUBDIR%%/elmrc-write -G -I; fi
65
@exec [ -f %B/elm.rc ] || cp %B/%f %B/elm.rc
66
@unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.terminalinfo %D/%%LIB_SUBDIR%%/elm.terminalinfo-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.terminalinfo; fi
67
%%LIB_SUBDIR%%/elm.terminalinfo-dist
68
@exec [ -f %B/elm.terminalinfo ] || cp %B/%f %B/elm.terminalinfo
68
%%PORTDOCS%%@dirrm %%DOC_SUBDIR%%
69
%%PORTDOCS%%@dirrm %%DOC_SUBDIR%%
69
@dirrm %%SHLIB_SUBDIR%%
70
@dirrm %%SHLIB_SUBDIR%%
70
@dirrm %%LIB_SUBDIR%%/elm.map.txt
71
@dirrm %%LIB_SUBDIR%%/elm.map.txt

Return to bug 39752