ports/72316: Update port: devel/cxref to 1.6

[KATO Tsuguru]

>Number:         72316
>Category:       ports
>Synopsis:       Update port: devel/cxref to 1.6
>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:   Mon Oct 04 17:10:30 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.10-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 1.6

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/devel/cxref/Makefile devel/cxref/Makefile
--- /usr/ports/devel/cxref/Makefile	Thu Jul  1 19:35:55 2004
+++ devel/cxref/Makefile	Fri Oct  1 21:20:45 2004
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cxref
-PORTVERSION=	1.5g
-PORTREVISION=	1
+PORTVERSION=	1.6
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		http://www.gedanken.demon.co.uk/download-cxref/
@@ -21,6 +20,8 @@
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	--without-cxref-cpp
+ALL_TARGET=	programs
 
 MAN1=		cxref.1 cxref-query.1
 PLIST_FILES=	bin/cxref bin/cxref-cc bin/cxref-query
diff -urN /usr/ports/devel/cxref/distinfo devel/cxref/distinfo
--- /usr/ports/devel/cxref/distinfo	Mon Jun 28 22:57:45 2004
+++ devel/cxref/distinfo	Fri Oct  1 20:56:52 2004
@@ -1,2 +1,2 @@
-MD5 (cxref-1.5g.tgz) = cf54c31438f9e5de17614f7c41fb63a5
-SIZE (cxref-1.5g.tgz) = 343174
+MD5 (cxref-1.6.tgz) = ce66211f29d73c2ffaed5a3758493afc
+SIZE (cxref-1.6.tgz) = 392060
diff -urN /usr/ports/devel/cxref/files/patch-ad devel/cxref/files/patch-ad
--- /usr/ports/devel/cxref/files/patch-ad	Tue Jun 12 23:25:45 2001
+++ devel/cxref/files/patch-ad	Fri Oct  1 21:13:40 2004
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sun Mar 18 19:29:25 2001
-+++ Makefile.in	Fri May 18 05:53:30 2001
-@@ -28,6 +28,9 @@
+--- src/Makefile.in.orig	Wed Sep  8 01:46:17 2004
++++ src/Makefile.in	Fri Oct  1 20:59:36 2004
+@@ -27,6 +27,9 @@
  # The installation program.
  
  INSTALL=@INSTALL@
@@ -10,7 +10,7 @@
  
  # The C compiler and linker
  
-@@ -121,10 +124,10 @@
+@@ -70,10 +73,10 @@
  
  install : programs
  	[ -d $(bindir) ] || $(INSTALL) -d $(bindir)
@@ -20,7 +20,7 @@
 +	$(INSTALL_SCRIPT) $(srcdir)/cxref-cc $(bindir)
  	[ -d $(mandir)/man1 ] || $(INSTALL) -d $(mandir)/man1
 -	$(INSTALL) -m 644 $(srcdir)/README.man $(mandir)/man1/cxref.1
-+	$(INSTALL_DATA) $(srcdir)/README.man $(mandir)/man1/cxref.1
- 	cd cpp && $(MAKE) install
- 	cd query && $(MAKE) install
++	$(INSTALL_DATA) $(srcdir)/../doc/README.man $(mandir)/man1/cxref.1
  
+ install-win32 : programs
+ 	[ -d $(bindir) ] || $(INSTALL) -d $(bindir)
diff -urN /usr/ports/devel/cxref/files/patch-ae devel/cxref/files/patch-ae
--- /usr/ports/devel/cxref/files/patch-ae	Tue Jun 12 23:25:45 2001
+++ devel/cxref/files/patch-ae	Fri Oct  1 21:01:35 2004
@@ -1,5 +1,5 @@
---- query/Makefile.in.orig	Sun Mar 18 19:29:26 2001
-+++ query/Makefile.in	Fri May 18 05:55:49 2001
+--- query/Makefile.in.orig	Wed Jun 23 02:31:53 2004
++++ query/Makefile.in	Fri Oct  1 21:01:20 2004
 @@ -27,6 +27,9 @@
  # The installation program.
  
@@ -10,14 +10,15 @@
  
  # The C compiler and linker
  
-@@ -59,8 +62,8 @@
- ########
+@@ -49,9 +52,9 @@
  
  install : cxref-query
+ 	[ -d $(bindir) ] || $(INSTALL) -d $(bindir)
 -	$(INSTALL) -m 755 cxref-query $(bindir)
--	$(INSTALL) -m 644 $(srcdir)/README.man $(mandir)/man1/cxref-query.1
 +	$(INSTALL_PROGRAM) cxref-query $(bindir)
+ 	[ -d $(mandir)/man1 ] || $(INSTALL) -d $(mandir)/man1
+-	$(INSTALL) -m 644 $(srcdir)/README.man $(mandir)/man1/cxref-query.1
 +	$(INSTALL_DATA) $(srcdir)/README.man $(mandir)/man1/cxref-query.1
  
  install-win32 : cxref-query
- 	$(INSTALL) -m 755 cxref-query.exe $(bindir)
+ 	[ -d $(bindir) ] || $(INSTALL) -d $(bindir)
>Release-Note:
>Audit-Trail:
>Unformatted: