Attachment #198423 for bug #232493

Lines 2-9 Link Here

(-)mail/bmf/Makefile (-9 / +12 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= bmf	4	PORTNAME= bmf
5	PORTVERSION= 0.9.4	5	PORTVERSION= 0.84
6	PORTREVISION= 3
7	CATEGORIES= mail	6	CATEGORIES= mail
8	MASTER_SITES= SF	7	MASTER_SITES= SF
9		8
Lines 14-21 Link Here
14	LICENSE_FILE= ${WRKSRC}/LICENSE	13	LICENSE_FILE= ${WRKSRC}/LICENSE
15		14
16	HAS_CONFIGURE= yes	15	HAS_CONFIGURE= yes
		16	ALL_TARGET= apps
17		17
18	OPTIONS_DEFINE= BDB MYSQL DEBUG DOCS	18	OPTIONS_DEFINE= BDB DEBUG DOCS MYSQL
19	OPTIONS_DEFAULT=BDB	19	OPTIONS_DEFAULT=BDB
20		20
21	BDB_USES= bdb	21	BDB_USES= bdb
Lines 26-44 Link Here
26		26
27	DEBUG_CONFIGURE_ON= --debug=yes	27	DEBUG_CONFIGURE_ON= --debug=yes
28		28
29	MYSQL_USE= MYSQL=client	29	MYSQL_BUILD_DEPENDS= mysql80-client>0:databases/mysql80-client
30	MYSQL_CONFIGURE_WITH= mysql	30	MYSQL_CONFIGURE_WITH= mysql
		31	MYSQL_VARS= MAKE_ARGS=CFLAGS+="-I${WRKSRC} -I${LOCALBASE}/include" \
		32	LDFLAGS+=-L${LOCALBASE}/lib/mysql
31		33
32	post-patch:	34	post-patch:
33	@${REINPLACE_CMD} -e 's\|@@CC\|${CC}\|;s\|@@CXX\|${CXX}\|' ${WRKSRC}/configure	35	@${REINPLACE_CMD} -e 's\|@@CC\|${CC}\|;s\|@@CXX\|${CXX}\|' ${WRKSRC}/configure
34	@${REINPLACE_CMD} -e 's/: checkroot/: /g' ${WRKSRC}/Makefile.in
35		36
36	post-install:	37	do-install:
37	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bmf	38	(cd ${WRKSRC} ; ${INSTALL_PROGRAM} bmf bmfconv ${STAGEDIR}${PREFIX}/bin)
38	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bmfconv
39		39
40	post-install-DOCS-on:	40	do-install-DOCS-on:
41	@${MKDIR} ${STAGEDIR}${DOCSDIR}	41	@${MKDIR} ${STAGEDIR}${DOCSDIR}
42	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}	42	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
43		43
		44	post-install:
		45	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bmf ${STAGEDIR}${PREFIX}/bin/bmfconv
		46
44	.include <bsd.port.mk>	47	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)mail/bmf/distinfo (-2 / +3 lines)
1	SHA256 (bmf-0.9.4.tar.gz) = 7eed21802f95df2321ac4c958f99e14d2809852a5708700b633e1abb032c9ce1	1	TIMESTAMP = 1540059041
2	SIZE (bmf-0.9.4.tar.gz) = 36740	2	SHA256 (bmf-0.84.tar.gz) = 28df6d808c4c6fef0e646cc736283fccecd02c4e6fa09f5fd095bb9d63004038
		3	SIZE (bmf-0.84.tar.gz) = 40101

Lines 1-17 Link Here

(-)mail/bmf/files/patch-Makefile.in (-17 lines)
1	--- ./Makefile.in.orig 2002-10-20 22:27:56.000000000 +0200
2	+++ ./Makefile.in 2014-01-03 01:50:13.000000000 +0100
3	@@ -1,11 +1,11 @@
4	# Makefile for bmf
5
6	-BINDIR=/usr/bin
7	-MANDIR=/usr/share/man
8	+BINDIR=${PREFIX}/bin
9	+MANDIR=${PREFIX}/man
10
11	VERSION=0.9.4
12
13	-CC=@CC@
14	+CC?=@CC@
15	CFLAGS=@CFLAGS@
16	LDFLAGS=@LDFLAGS@
17	SYSLIBS=@SYSLIBS@




--- configure.orig	2002-10-09 16:29:26 UTC
+++ configure
@@ -128,16 +128,16 @@ case "$UNAME_S" in
       CCDBG="-DNDEBUG"
       LDDBG=""
     fi
-    CC=gcc
+    CC=cc
     CFLAGS="$CCDBG -D_UNIX -D_BSD=$OSVER -Wall"
-    CXX=g++
+    CXX=c++
     CXXFLAGS=${CFLAGS}
     AR=ar
     ARFLAGS="-rc"
-    LD=gcc
-    LDFLAGS="$LDDBG"
+    LD=cc
+    LDFLAGS="${LDFLAGS}"
     SYSLIBS=""
-    LIBDB_LIB=""

Lines 1-5 Link Here

(-)mail/bmf/pkg-plist (-2 lines)
1	bin/bmf	1	bin/bmf
2	bin/bmfconv	2	bin/bmfconv
3	man/man1/bmf.1.gz
4	man/man1/bmfconv.1.gz
5	%%PORTDOCS%%%%DOCSDIR%%/README	3	%%PORTDOCS%%%%DOCSDIR%%/README

Return to bug 232493

Lines 1-20 Link Here

(-)mail/bmf/files/patch-configure (-6 / +6 lines)
1	--- ./configure.orig 2002-10-19 11:44:49.000000000 +0200	1	--- configure.orig 2002-10-09 16:29:26 UTC
2	+++ ./configure 2014-01-03 01:50:13.000000000 +0100	2	+++ configure
3	@@ -127,16 +127,16 @@	3	@@ -128,16 +128,16 @@ case "$UNAME_S" in
4	CCDBG="-DNDEBUG"	4	CCDBG="-DNDEBUG"
5	LDDBG=""	5	LDDBG=""
6	fi	6	fi
7	- CC=gcc	7	- CC=gcc
8	+ CC=@@CC	8	+ CC=cc
9	CFLAGS="$CCDBG -D_UNIX -D_BSD=$OSVER -Wall"	9	CFLAGS="$CCDBG -D_UNIX -D_BSD=$OSVER -Wall"
10	- CXX=g++	10	- CXX=g++
11	+ CXX=@@CXX	11	+ CXX=c++
12	CXXFLAGS=${CFLAGS}	12	CXXFLAGS=${CFLAGS}
13	AR=ar	13	AR=ar
14	ARFLAGS="-rc"	14	ARFLAGS="-rc"
15	- LD=gcc	15	- LD=gcc
16	- LDFLAGS="$LDDBG"	16	- LDFLAGS="$LDDBG"
17	+ LD=@@CC	17	+ LD=cc
18	+ LDFLAGS="${LDFLAGS}"	18	+ LDFLAGS="${LDFLAGS}"
19	SYSLIBS=""	19	SYSLIBS=""
20	- LIBDB_LIB=""	20	- LIBDB_LIB=""