Attachment #59053 for bug #88905

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

Lines 8-16 Link Here

(-)ftrack/Makefile (-3 / +5 lines)
8	PORTNAME= ftrack	8	PORTNAME= ftrack
9	PORTVERSION= 3.1	9	PORTVERSION= 3.1
10	PORTEPOCH= 1	10	PORTEPOCH= 1
11	PORTREVISION= 2	11	PORTREVISION= 3
12	CATEGORIES= mail	12	CATEGORIES= mail
13	MASTER_SITES= http://ufm.kgb.ru/files/ \	13	MASTER_SITES= http://www.ibch.ru/forsite/ports/ \
14	http://forsite.ibch.ru/ports/	14	http://forsite.ibch.ru/ports/
15	DISTNAME= ftr${PORTVERSION:S/.//g}sr	15	DISTNAME= ftr${PORTVERSION:S/.//g}sr
16		16
Lines 32-38 Link Here
32	pre-patch:	32	pre-patch:
33	${REINPLACE_CMD} -e "s@-I../../hpp -I../../.. -O3@-Ihpp -I${LOCALBASE}/include ${CFLAGS}@g; \	33	${REINPLACE_CMD} -e "s@-I../../hpp -I../../.. -O3@-Ihpp -I${LOCALBASE}/include ${CFLAGS}@g; \
34	s@../../src/@src/@g; \	34	s@../../src/@src/@g; \
35	s@-L../../../smapi -lsmapibsd@-L${LOCALBASE}/lib -lsmapi@g" ${WRKSRC}/MakeFiles/FreeBSD/Makefile	35	s@-L../../../smapi -lsmapibsd@-L${LOCALBASE}/lib -lsmapi@g; \
		36	s@\$$(CC) \$$(LFLAGS) -o ftrack@\$$(CXX) \$$(LFLAGS) -o ftrack@g; \
		37	s@-o ftrack \$$(OBJS) -L/usr/local/lib -lsmapi@-o ftrack \$$(OBJS) -L${LOCALBASE}/lib -lsmapi@g" ${WRKSRC}/MakeFiles/FreeBSD/Makefile
36	${REINPLACE_CMD} -e "s@ftrack.cfg@${PREFIX}/etc/ftrack/ftrack.cfg@g" ${WRKSRC}/hpp/constant.hpp	38	${REINPLACE_CMD} -e "s@ftrack.cfg@${PREFIX}/etc/ftrack/ftrack.cfg@g" ${WRKSRC}/hpp/constant.hpp
37	.for DIR in MakeFiles/FreeBSD src hpp doc/eng samples/tpl	39	.for DIR in MakeFiles/FreeBSD src hpp doc/eng samples/tpl
38	for FILE in ${WRKSRC}/${DIR}/*; do \	40	for FILE in ${WRKSRC}/${DIR}/*; do \




--- MakeFiles/FreeBSD/Makefile.orig	Fri Aug 19 17:20:22 2005
+++ MakeFiles/FreeBSD/Makefile	Fri Aug 19 17:20:23 2005
@@ -1,5 +1,5 @@
-CC=	cc
+CC=	g++
-CFLAGS=	-Wall -W -fno-rtti `perl -MExtUtils::Embed -e ccopts`
+CFLAGS+=-Wall -W -fno-rtti `perl -MExtUtils::Embed -e ccopts`
 CDEFS=	-DUNIX
 COPT=	-Ihpp -I/usr/local/include -O -pipe 
 LFLAGS= -s
@@ -34,20 +33,50 @@
 	utils.o \
 	mask.o \
 	script.o \

 
 
 ftrack: $(OBJS)
-	$(CC) $(LFLAGS) -o ftrack $(OBJS) -L/usr/local/lib -lsmapi `perl -MExtUtils::Embed -e ccopts -e ldopts`
+	$(CXX) $(LFLAGS) -o ftrack $(OBJS) -L/usr/local/lib -lsmapi `perl -MExtUtils::Embed -e ccopts -e ldopts`
 
 clean:
 	-rm -f *.o

Return to bug 88905

Lines 1-13 Link Here

(-)ftrack/files/patch-MakeFiles-FreeBSD-Makefile (-7 / +3 lines)
1	--- MakeFiles/FreeBSD/Makefile.orig Fri Aug 19 17:20:22 2005	1	--- MakeFiles/FreeBSD/Makefile.orig Fri Aug 19 17:20:22 2005
2	+++ MakeFiles/FreeBSD/Makefile Fri Aug 19 17:20:23 2005	2	+++ MakeFiles/FreeBSD/Makefile Fri Aug 19 17:20:23 2005
3	@@ -1,5 +1,4 @@	3	@@ -1,5 +1,5 @@
4	-CC= cc	4	-CC= cc
		5	+CC= g++
5	-CFLAGS= -Wall -W -fno-rtti `perl -MExtUtils::Embed -e ccopts`	6	-CFLAGS= -Wall -W -fno-rtti `perl -MExtUtils::Embed -e ccopts`
6	+CFLAGS+=-Wall -W -fno-rtti `perl -MExtUtils::Embed -e ccopts`	7	+CFLAGS+=-Wall -W -fno-rtti `perl -MExtUtils::Embed -e ccopts`
7	CDEFS= -DUNIX	8	CDEFS= -DUNIX
8	COPT= -Ihpp -I/usr/local/include -O -pipe	9	COPT= -Ihpp -I/usr/local/include -O -pipe
9	LFLAGS= -s	10	LFLAGS= -s
10	@@ -34,23 +33,53 @@	11	@@ -34,20 +33,50 @@
11	utils.o \	12	utils.o \
12	mask.o \	13	mask.o \
13	script.o \	14	script.o \
Lines 63-70 Link Here
63		64
64		65
65	ftrack: $(OBJS)	66	ftrack: $(OBJS)
66	- $(CC) $(LFLAGS) -o ftrack $(OBJS) -L/usr/local/lib -lsmapi `perl -MExtUtils::Embed -e ccopts -e ldopts`
67	+ $(CXX) $(LFLAGS) -o ftrack $(OBJS) -L/usr/local/lib -lsmapi `perl -MExtUtils::Embed -e ccopts -e ldopts`
68
69	clean:
70	-rm -f *.o