Skip site navigation (1)Skip section navigation (2)
Date:      28 Apr 2003 21:07:38 -0000
From:      Sergei Kolobov <sergei@kolobov.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/51522: [PATCH] Convert devel/fastdep to USE_GETOPT_LONG
Message-ID:  <20030428210738.2113.qmail@kolobov.com>
Resent-Message-ID: <200304282140.h3SLe9lb094336@freefall.freebsd.org>

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

>Number:         51522
>Category:       ports
>Synopsis:       [PATCH] Convert devel/fastdep to USE_GETOPT_LONG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 28 14:40:08 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Sergei Kolobov
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD elf.chetwood.ru 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Sun Apr 13 01:13:44 MSD 2003
>Description:
- Properly conditionalize getopt_long dependency by USE_GETOPT_LONG=yes
- Simplify Makefile
- Install additional documentation
- Add Author line to pkg-descr
- Bump PORTREVISION
- Take maintainership

Added files:
- files/patch-Makefile

Tested on:	-STABLE, -CURRENT
>How-To-Repeat:
>Fix:

--- fastdep-0.15.patch begins here ---
diff -ruN --exclude=CVS fastdep/Makefile fastdep-0.15/Makefile
--- fastdep/Makefile	Tue Apr 29 00:55:28 2003
+++ fastdep-0.15/Makefile	Tue Apr 29 00:53:53 2003
@@ -8,33 +8,27 @@
 
 PORTNAME=	fastdep
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.irule.be/bvh/c++/fastdep/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sergei@kolobov.com
 COMMENT=	Fast dependency generator for C/C++ files
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+USE_GMAKE=		yes
+USE_GETOPT_LONG= 	yes
+HAS_CONFIGURE=		yes
+CONFIGURE_ARGS= 	--disable-local-gnugetopt
+MAKE_ENV=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-USE_REINPLACE=	yes
-USE_GMAKE=	yes
-HAS_CONFIGURE=	yes
-MAKE_ENV=	CXX="${CXX} -I${LOCALBASE}/include -DHAVE_DECL_GETOPT=1" \
-		CXXFLAGS="${CXXFLAGS}"
-
-post-patch:
-.for file in Makefile config/link.mk build/dependencies.mk
-	@${REINPLACE_CMD} -e 's|g++|\$$\(CXX\)|g ; \
-		 s|[\$$][(]CFLAGS[)]||g ; \
-		 s|\. -l|\$$\{LOCALBASE\}/lib -l|g' ${WRKSRC}/${file}
-.endfor
-	@${REINPLACE_CMD} -e 's|PREFIX=|PREFIX?=|g' ${WRKSRC}/Makefile.options
+DOCS=		AUTHORS CHANGELOG INSTALL README \
+		doc/fastdep.html doc/fastdep.pdf doc/c*.htm
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fastdep ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.* ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS fastdep/files/patch-Makefile fastdep-0.15/files/patch-Makefile
--- fastdep/files/patch-Makefile	Thu Jan  1 03:00:00 1970
+++ fastdep-0.15/files/patch-Makefile	Mon Apr 28 20:41:26 2003
@@ -0,0 +1,20 @@
+--- Makefile.orig	Mon Apr 28 20:40:22 2003
++++ Makefile	Mon Apr 28 20:41:03 2003
+@@ -26,7 +26,7 @@
+ $(OBJECTS): config/config.me $(ALLMAKEFILES)
+ 
+ $(BINARY): $(OBJECTS) $(ALLMAKEFILES)
+-	g++ $(CFLAGS) $(CXXFLAGS) -o $(BINARY) $(OBJECTS)
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o $(BINARY) $(OBJECTS)
+ # Here is a trick on how to get fastdep linking on older cygwins.
+ # It's probably also needed to get it working on VC 6.0.
+ # However, since I am still reworking the build environment for now,
+@@ -38,7 +38,7 @@
+ #endif
+ 
+ .cc.o: $(ALLMAKEFILES)
+-	g++ $(CFLAGS) $(CXXFLAGS) -c $< -o $@
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
+ 
+ clean:
+ 	-rm -f $(OBJECTS) $(BINARY) .depends-all
diff -ruN --exclude=CVS fastdep/pkg-plist fastdep-0.15/pkg-plist
--- fastdep/pkg-plist	Tue Apr 29 00:55:28 2003
+++ fastdep-0.15/pkg-plist	Mon Apr 28 20:05:56 2003
@@ -1,12 +1,14 @@
 bin/fastdep
-%%PORTDOCS%%%%DOCSDIR%%/book1.htm
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/c100.htm
 %%PORTDOCS%%%%DOCSDIR%%/c23.htm
 %%PORTDOCS%%%%DOCSDIR%%/c34.htm
 %%PORTDOCS%%%%DOCSDIR%%/c49.htm
 %%PORTDOCS%%%%DOCSDIR%%/c63.htm
 %%PORTDOCS%%%%DOCSDIR%%/c90.htm
-%%PORTDOCS%%%%DOCSDIR%%/fastdep.docbook
 %%PORTDOCS%%%%DOCSDIR%%/fastdep.html
 %%PORTDOCS%%%%DOCSDIR%%/fastdep.pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
--- fastdep-0.15.patch ends here ---

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



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