5 files changed, 49 insertions, 22 deletions

diff --git a/devel/cxref/Makefile b/devel/cxref/Makefile
index a8df5ec51584..d2bc6bb1d790 100644
--- a/devel/cxref/Makefile
+++ b/devel/cxref/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cxref
-PORTVERSION=	1.5b
+PORTVERSION=	1.5c
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		ftp://ftp.demon.co.uk/pub/unix/tools/
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-ALL_TARGET=	cxref-inst cxref-query
+
 MAN1=		cxref.1 cxref-query.1
 
 .include <bsd.port.mk>
diff --git a/devel/cxref/distinfo b/devel/cxref/distinfo
index b27789ae338e..40503ebba23b 100644
--- a/devel/cxref/distinfo
+++ b/devel/cxref/distinfo
@@ -1 +1 @@
-MD5 (cxref-1.5b.tgz) = 70a99f2b801ba0a5b5233c55bfe0393c
+MD5 (cxref-1.5c.tgz) = 38b4b98b7acbf4af6cc3e790efa21165
diff --git a/devel/cxref/files/patch-ad b/devel/cxref/files/patch-ad
index 07e1c799096d..ba2243e0f9a1 100644
--- a/devel/cxref/files/patch-ad
+++ b/devel/cxref/files/patch-ad
@@ -1,23 +1,26 @@
---- Makefile.in.orig	Fri May 21 03:48:04 1999
-+++ Makefile.in	Sun Sep  5 15:41:44 1999
-@@ -115,14 +115,13 @@
+--- Makefile.in.orig	Sun Mar 18 19:29:25 2001
++++ Makefile.in	Fri May 18 05:53:30 2001
+@@ -28,6 +28,9 @@
+ # The installation program.
  
- ########
+ INSTALL=@INSTALL@
++INSTALL_PROGRAM=@INSTALL_PROGRAM@
++INSTALL_SCRIPT=@INSTALL_SCRIPT@
++INSTALL_DATA=@INSTALL_DATA@
  
--install : programs
--	[ -d $(bindir) ] || $(INSTALL) -d $(bindir)
--	$(INSTALL) -m 755 cxref-inst $(bindir)/cxref
--	$(INSTALL) -m 755 cxref-cc $(bindir)
--	[ -d $(mandir)/man1 ] || $(INSTALL) -d $(mandir)/man1
-+install : cxref-query cxref-inst        
-+	$(INSTALL) -c -m 755 cxref-inst $(bindir)/cxref
-+	$(INSTALL) -c -m 755 query/cxref-query $(bindir)  
-+	[ ! -x cpp/cxref-cpp ] || $(INSTALL) -m 755 cpp/cxref-cpp $(bindir)
- 	$(INSTALL) -m 644 README.man $(mandir)/man1/cxref.1
--	cd cpp && $(MAKE) install
--	cd query && $(MAKE) install
-+	$(INSTALL) -m 644 query/README.man $(mandir)/man1/cxref-query.1
-+	[ ! -x cpp/cxref-cpp ] || $(INSTALL) -m 644 cpp/README.man $(mandir)/man1/cxref-cpp.1
+ # The C compiler and linker
+ 
+@@ -121,10 +124,10 @@
  
- install-win32 : programs
+ install : programs
  	[ -d $(bindir) ] || $(INSTALL) -d $(bindir)
+-	$(INSTALL) -m 755 cxref-inst $(bindir)/cxref
+-	$(INSTALL) -m 755 $(srcdir)/cxref-cc $(bindir)
++	$(INSTALL_PROGRAM) cxref-inst $(bindir)/cxref
++	$(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
+ 
diff --git a/devel/cxref/files/patch-ae b/devel/cxref/files/patch-ae
new file mode 100644
index 000000000000..05b2db045442
--- /dev/null
+++ b/devel/cxref/files/patch-ae
@@ -0,0 +1,23 @@
+--- query/Makefile.in.orig	Sun Mar 18 19:29:26 2001
++++ query/Makefile.in	Fri May 18 05:55:49 2001
+@@ -27,6 +27,9 @@
+ # The installation program.
+ 
+ INSTALL=@INSTALL@
++INSTALL_PROGRAM=@INSTALL_PROGRAM@
++INSTALL_SCRIPT=@INSTALL_SCRIPT@
++INSTALL_DATA=@INSTALL_DATA@
+ 
+ # The C compiler and linker
+ 
+@@ -59,8 +62,8 @@
+ ########
+ 
+ install : cxref-query
+-	$(INSTALL) -m 755 cxref-query $(bindir)
+-	$(INSTALL) -m 644 $(srcdir)/README.man $(mandir)/man1/cxref-query.1
++	$(INSTALL_PROGRAM) cxref-query $(bindir)
++	$(INSTALL_DATA) $(srcdir)/README.man $(mandir)/man1/cxref-query.1
+ 
+ install-win32 : cxref-query
+ 	$(INSTALL) -m 755 cxref-query.exe $(bindir)
diff --git a/devel/cxref/pkg-plist b/devel/cxref/pkg-plist
index 1a3ffa7dbc22..99a1ae4cedae 100644
--- a/devel/cxref/pkg-plist
+++ b/devel/cxref/pkg-plist
@@ -1,2 +1,3 @@
 bin/cxref
+bin/cxref-cc
 bin/cxref-query