Attachment #46424 for bug #71277

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




#

PORTNAME=	global
PORTVERSION=	4.8
CATEGORIES=	devel
MASTER_SITES=	${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR=	${PORTNAME}


GNU_CONFIGURE=	yes
USE_PERL5=	yes
USE_REINPLACE=	yes
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}

MAN1=		gctags.1 global.1 gozilla.1 gtags.1 htags.1
INFO=		global

post-patch:
	${REINPLACE_CMD} -E 's,^(gtags_DATA = )AUTHORS .* THANKS( \\$$),\1\2,' ${WRKSRC}/Makefile.in

post-install:
	install-info ${PREFIX}/info/global.info ${PREFIX}/info/dir
.if !defined(NOPORTDOCS)
	${MKDIR} ${PREFIX}/share/doc/global
.for file in AUTHORS COPYING ChangeLog FAQ INSTALL LICENSE NEWS README \

Lines 1-2 Link Here

(-)global/distinfo (-2 / +2 lines)
1	MD5 (global-4.6.1.tar.gz) = 6430ca736a74a734b10201d28fe0a64a	1	MD5 (global-4.8.tar.gz) = 1c1c80f3bd6bd8eea16124fa0a8006bf
2	SIZE (global-4.6.1.tar.gz) = 504379	2	SIZE (global-4.8.tar.gz) = 591811




--- doc/Makefile.in.orig	Fri Oct  3 11:16:01 2003
+++ doc/Makefile.in	Mon Oct 20 13:53:50 2003
@@ -358,15 +358,7 @@
 	  done; \
 	done
 	@$(POST_INSTALL)
-	@if (install-info --version && \
-	     install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
-	  list='$(INFO_DEPS)'; \
-	  for file in $$list; do \
-	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
-	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile";\
-	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile || :;\
-	  done; \
-	else : ; fi
+
 install-man:
 
 installcheck-am:




--- htags/htags.c	2004/09/01 14:44:33	1.14
+++ htags/htags.c	2004/09/01 21:58:28	1.15
@@ -61,7 +61,6 @@
 char *save_config;
 char *save_argv;
 
-char rootpath[MAXPATHLEN];
 char cwdpath[MAXPATHLEN];
 char dbpath[MAXPATHLEN];
 char distpath[MAXPATHLEN];
@@ -1481,11 +1480,14 @@
 		strbuf_close(sb);
 	}
 	/*
-	 * get root, cwd and dbpath.
+	 * get dbpath.
 	 */
-	getdbpath(cwdpath, rootpath, dbpath, 0);
+	if (!getcwd(cwdpath, sizeof(cwdpath)))
+		die("cannot get current directory.");
 	if (arg_dbpath[0])
 		strlimcpy(dbpath, arg_dbpath, sizeof(dbpath));
+	else
+		strlimcpy(dbpath, cwdpath, sizeof(cwdpath));
 
 	if (cflag && !usable("gzip")) {
 		warning("'gzip' command not found. -c option ignored.");

Lines 3-8 Link Here

(-)global/pkg-plist (+9 lines)
3	bin/gozilla	3	bin/gozilla
4	bin/gtags	4	bin/gtags
5	bin/htags	5	bin/htags
		6	bin/htags.pl
6	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS	7	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
7	%%PORTDOCS%%%%DOCSDIR%%/COPYING	8	%%PORTDOCS%%%%DOCSDIR%%/COPYING
8	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog	9	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
Lines 12-15 Link Here
12	%%PORTDOCS%%%%DOCSDIR%%/NEWS	13	%%PORTDOCS%%%%DOCSDIR%%/NEWS
13	%%PORTDOCS%%%%DOCSDIR%%/README	14	%%PORTDOCS%%%%DOCSDIR%%/README
14	%%PORTDOCS%%%%DOCSDIR%%/THANKS	15	%%PORTDOCS%%%%DOCSDIR%%/THANKS
		16	share/gtags/globash.rc
		17	share/gtags/gtags.conf
		18	share/gtags/gtags.el
		19	share/gtags/gtags.pl
		20	share/gtags/gtags.vim
		21	share/gtags/nvi-1.79-gtags.diff
		22	share/gtags/bless.sh.tmpl
		23	share/gtags/global.cgi.tmpl
15	%%PORTDOCS%%@dirrm %%DOCSDIR%%	24	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 71277

Lines 6-12 Link Here

(-)global/Makefile (-2 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= global	8	PORTNAME= global
9	PORTVERSION= 4.6.1	9	PORTVERSION= 4.8
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= ${MASTER_SITE_GNU}	11	MASTER_SITES= ${MASTER_SITE_GNU}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 16-28 Link Here
16		16
17	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
18	USE_PERL5= yes	18	USE_PERL5= yes
		19	USE_REINPLACE= yes
19	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	20	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
20		21
21	MAN1= gctags.1 global.1 gozilla.1 gtags.1 htags.1	22	MAN1= gctags.1 global.1 gozilla.1 gtags.1 htags.1
22	INFO= global	23	INFO= global
23		24
		25	post-patch:
		26	${REINPLACE_CMD} -E 's,^(gtags_DATA = )AUTHORS .* THANKS( \\$$),\1\2,' ${WRKSRC}/Makefile.in
		27
24	post-install:	28	post-install:
25	install-info ${PREFIX}/info/global.info ${PREFIX}/info/dir
26	.if !defined(NOPORTDOCS)	29	.if !defined(NOPORTDOCS)
27	${MKDIR} ${PREFIX}/share/doc/global	30	${MKDIR} ${PREFIX}/share/doc/global
28	.for file in AUTHORS COPYING ChangeLog FAQ INSTALL LICENSE NEWS README \	31	.for file in AUTHORS COPYING ChangeLog FAQ INSTALL LICENSE NEWS README \

Lines 1-19 Link Here

(-)global/files/patch-aa (-19 lines)
1	--- doc/Makefile.in.orig Fri Oct 3 11:16:01 2003
2	+++ doc/Makefile.in Mon Oct 20 13:53:50 2003
3	@@ -358,15 +358,7 @@
4	done; \
5	done
6	@$(POST_INSTALL)
7	- @if (install-info --version && \
8	- install-info --version \| grep -i -v debian) >/dev/null 2>&1; then \
9	- list='$(INFO_DEPS)'; \
10	- for file in $$list; do \
11	- relfile=`echo "$$file" \| sed 's\|^.*/\|\|'`; \
12	- echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile";\
13	- install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile \|\| :;\
14	- done; \
15	- else : ; fi
16	+
17	install-man:
18
19	installcheck-am:

Line 0 Link Here

(-)global/files/patch-htags::htags.c-fix-d (+27 lines)
	1	--- htags/htags.c 2004/09/01 14:44:33 1.14
	2	+++ htags/htags.c 2004/09/01 21:58:28 1.15
	3	@@ -61,7 +61,6 @@
	4	char *save_config;
	5	char *save_argv;
	6
	7	-char rootpath[MAXPATHLEN];
	8	char cwdpath[MAXPATHLEN];
	9	char dbpath[MAXPATHLEN];
	10	char distpath[MAXPATHLEN];
	11	@@ -1481,11 +1480,14 @@
	12	strbuf_close(sb);
	13	}
	14	/*
	15	- * get root, cwd and dbpath.
	16	+ * get dbpath.
	17	*/
	18	- getdbpath(cwdpath, rootpath, dbpath, 0);
	19	+ if (!getcwd(cwdpath, sizeof(cwdpath)))
	20	+ die("cannot get current directory.");
	21	if (arg_dbpath[0])
	22	strlimcpy(dbpath, arg_dbpath, sizeof(dbpath));
	23	+ else
	24	+ strlimcpy(dbpath, cwdpath, sizeof(cwdpath));
	25
	26	if (cflag && !usable("gzip")) {
	27	warning("'gzip' command not found. -c option ignored.");