Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Nov 2005 03:10:06 +0300 (MSK)
From:      Forsite//HPG <forsite@tornado.chbs.ru>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        kris@obsecurity.org
Subject:   ports/88905: Make the port respect non-standard LOCALBASE settings
Message-ID:  <200511130010.jAD0A6od001684@tornado.chbs.ru>
Resent-Message-ID: <200511130010.jAD0AH4M053267@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         88905
>Category:       ports
>Synopsis:       Make the port respect non-standard LOCALBASE settings
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 13 00:10:16 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Forsite//HPG
>Release:        FreeBSD 6.0-RELEASE i386
>Organization:
private person	
>Environment:
System: FreeBSD tornado.chbs.ru 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Thu Nov 3 09:36:13 UTC 2005 root@x64.samsco.home:/usr/obj/usr/src/sys/GENERIC i386
>Description:
	Make the port respect non-standard LOCALBASE settings, which is a requirement that all FreeBSD ports should satisfy.	
>How-To-Repeat:
	n/a
>Fix:
	diff ftrack-3.1_2,1 -> ftracj-3.1_3,1

--- ftrack.diff begins here ---
diff -uNr ftrack.bak/Makefile ftrack/Makefile
--- ftrack.bak/Makefile	Fri Aug 19 17:01:20 2005
+++ ftrack/Makefile	Sun Nov 13 01:39:04 2005
@@ -8,9 +8,9 @@
 PORTNAME=	ftrack
 PORTVERSION=	3.1
 PORTEPOCH=	1
-PORTREVISION=	2
+PORTREVISION=	3
 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 @@
 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 -uNr ftrack.bak/files/patch-MakeFiles-FreeBSD-Makefile ftrack/files/patch-MakeFiles-FreeBSD-Makefile
--- ftrack.bak/files/patch-MakeFiles-FreeBSD-Makefile	Fri Aug 19 17:01:21 2005
+++ ftrack/files/patch-MakeFiles-FreeBSD-Makefile	Sat Nov 12 22:39:38 2005
@@ -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
--- ftrack.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200511130010.jAD0A6od001684>