aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpav <pav@FreeBSD.org>2005-11-17 08:16:01 +0800
committerpav <pav@FreeBSD.org>2005-11-17 08:16:01 +0800
commit8064716634e6e6585d5c93218af5d2c0869ac9cb (patch)
treeaf23caa15c1da94e41d5732867ebe0972d5e3c0f
parent89488249b5a0008273f87ed2dc420a1c6649d9f4 (diff)
downloadfreebsd-ports-gnome-8064716634e6e6585d5c93218af5d2c0869ac9cb.tar.gz
freebsd-ports-gnome-8064716634e6e6585d5c93218af5d2c0869ac9cb.tar.zst
freebsd-ports-gnome-8064716634e6e6585d5c93218af5d2c0869ac9cb.zip
- Respect LOCALBASE
- Update master sites - Portlint PR: ports/88905 Submitted by: Forsite//HPG <forsite@tornado.chbs.ru> (maintainer)
-rw-r--r--mail/ftrack/Makefile8
-rw-r--r--mail/ftrack/files/patch-MakeFiles-FreeBSD-Makefile10
2 files changed, 8 insertions, 10 deletions
diff --git a/mail/ftrack/Makefile b/mail/ftrack/Makefile
index 10f7d82751cc..7797b900404a 100644
--- a/mail/ftrack/Makefile
+++ b/mail/ftrack/Makefile
@@ -7,10 +7,10 @@
PORTNAME= ftrack
PORTVERSION= 3.1
-PORTEPOCH= 1
PORTREVISION= 2
+PORTEPOCH= 1
CATEGORIES= mail
-MASTER_SITES= http://ufm.kgb.ru/files/ \
+MASTER_SITES= http://www.ibch.ru/forsite/ports/ \
http://forsite.ibch.ru/ports/
DISTNAME= ftr${PORTVERSION:S/.//g}sr
@@ -32,7 +32,9 @@ PORTDOCS= ftrack.faq readme report.err
pre-patch:
${REINPLACE_CMD} -e "s@-I../../hpp -I../../.. -O3@-Ihpp -I${LOCALBASE}/include ${CFLAGS}@g; \
s@../../src/@src/@g; \
- s@-L../../../smapi -lsmapibsd@-L${LOCALBASE}/lib -lsmapi@g" ${WRKSRC}/MakeFiles/FreeBSD/Makefile
+ s@-L../../../smapi -lsmapibsd@-L${LOCALBASE}/lib -lsmapi@g; \
+ s@\$$(CC) \$$(LFLAGS) -o ftrack@\$$(CXX) \$$(LFLAGS) -o ftrack@g; \
+ s@-o ftrack \$$(OBJS) -L/usr/local/lib -lsmapi@-o ftrack \$$(OBJS) -L${LOCALBASE}/lib -lsmapi@g" ${WRKSRC}/MakeFiles/FreeBSD/Makefile
${REINPLACE_CMD} -e "s@ftrack.cfg@${PREFIX}/etc/ftrack/ftrack.cfg@g" ${WRKSRC}/hpp/constant.hpp
.for DIR in MakeFiles/FreeBSD src hpp doc/eng samples/tpl
for FILE in ${WRKSRC}/${DIR}/*; do \
diff --git a/mail/ftrack/files/patch-MakeFiles-FreeBSD-Makefile b/mail/ftrack/files/patch-MakeFiles-FreeBSD-Makefile
index 242f0b62d8b0..81d1fc31a871 100644
--- a/mail/ftrack/files/patch-MakeFiles-FreeBSD-Makefile
+++ b/mail/ftrack/files/patch-MakeFiles-FreeBSD-Makefile
@@ -1,13 +1,14 @@
--- MakeFiles/FreeBSD/Makefile.orig Fri Aug 19 17:20:22 2005
+++ MakeFiles/FreeBSD/Makefile Fri Aug 19 17:20:23 2005
-@@ -1,5 +1,4 @@
+@@ -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,23 +33,53 @@
+@@ -34,20 +33,50 @@
utils.o \
mask.o \
script.o \
@@ -63,8 +64,3 @@
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