[csw-devel] SF.net SVN: gar:[11346] csw/mgar/pkg/ndiff/trunk

khabermann at users.sourceforge.net khabermann at users.sourceforge.net
Wed Oct 20 12:23:52 CEST 2010


Revision: 11346
          http://gar.svn.sourceforge.net/gar/?rev=11346&view=rev
Author:   khabermann
Date:     2010-10-20 10:23:52 +0000 (Wed, 20 Oct 2010)

Log Message:
-----------
fixed patch

Modified Paths:
--------------
    csw/mgar/pkg/ndiff/trunk/Makefile
    csw/mgar/pkg/ndiff/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/ndiff/trunk/files/0001-fixed-make-install-target.patch

Removed Paths:
-------------
    csw/mgar/pkg/ndiff/trunk/files/0001-fixed-install-target-in-makefile.patch

Modified: csw/mgar/pkg/ndiff/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ndiff/trunk/Makefile	2010-10-20 10:13:59 UTC (rev 11345)
+++ csw/mgar/pkg/ndiff/trunk/Makefile	2010-10-20 10:23:52 UTC (rev 11346)
@@ -13,8 +13,8 @@
 endef
 
 MASTER_SITES = ftp://ftp.math.utah.edu/pub/misc/
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz 
-PATCHFILES = 0001-fixed-install-target-in-makefile.patch
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+PATCHFILES = 0001-fixed-make-install-target.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz

Modified: csw/mgar/pkg/ndiff/trunk/checksums
===================================================================
--- csw/mgar/pkg/ndiff/trunk/checksums	2010-10-20 10:13:59 UTC (rev 11345)
+++ csw/mgar/pkg/ndiff/trunk/checksums	2010-10-20 10:23:52 UTC (rev 11346)
@@ -1,2 +1,2 @@
 885548b4dc26e72c5455bebb5ba6c16d  ndiff-2.00.tar.gz
-fe48e85a1e214584588c49859f22e1e2  0001-fixed-install-target-in-makefile.patch
+459c0dde5a477d7bf1baa8fa50a3f2ad  0001-fixed-make-install-target.patch

Deleted: csw/mgar/pkg/ndiff/trunk/files/0001-fixed-install-target-in-makefile.patch
===================================================================
--- csw/mgar/pkg/ndiff/trunk/files/0001-fixed-install-target-in-makefile.patch	2010-10-20 10:13:59 UTC (rev 11345)
+++ csw/mgar/pkg/ndiff/trunk/files/0001-fixed-install-target-in-makefile.patch	2010-10-20 10:23:52 UTC (rev 11346)
@@ -1,95 +0,0 @@
-From 933babaed72b895ac309bd1591ba6386e3193002 Mon Sep 17 00:00:00 2001
-From: Kester Habermann <kester at opencsw.org>
-Date: Wed, 20 Oct 2010 11:37:44 +0200
-Subject: [PATCH] fixed install-target in makefile
-
----
- Makefile.in |   38 ++++++++++++++++++++------------------
- 1 files changed, 20 insertions(+), 18 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 78f5e95..1225685 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -61,8 +61,8 @@ DATE		= @DATE@
- 
- prefix		= @prefix@
- bindir		= $(prefix)/bin
--catdir		= $(prefix)/man/cat$(manext)
--mandir		= $(prefix)/man/man$(manext)
-+catdir		= $(prefix)/share/man/cat$(manext)
-+mandir		= $(prefix)/share/man/man$(manext)
- manext		= 1
- shrlibdir	= $(shrlibtop)/$(PROGNAME)-$(VERSION)
- shrlibtop       = $(prefix)/share/lib/$(PROGNAME)
-@@ -599,17 +599,18 @@ html:	$(HTMLFILES)
- install:	install-exe install-shrlib install-man install-show
- 
- install-exe:	uninstall-exe
-+	-$(MKDIR) $(DESTDIR)$(bindir)
- 	if test -f $(PROGNAME) ; \
- 	then \
--		$(CP) $(PROGNAME) $(bindir)/$(PROGNAME) ; \
--		$(LN) $(bindir)/$(PROGNAME) $(bindir)/$(PROGNAME)-$(VERSION) ; \
-+		$(CP) $(PROGNAME) $(DESTDIR)$(bindir)/$(PROGNAME) ; \
-+		$(LN) $(DESTDIR)$(bindir)/$(PROGNAME) $(DESTDIR)$(bindir)/$(PROGNAME)-$(VERSION) ; \
- 	else \
- 		for f in $(SHFILES) ; \
- 		do \
- 			g=`basename $$f .sh` ; \
--			$(SEDCMD) $$f | $(CHECKSUM) > $(bindir)/$$g ; \
--			$(LN) $(bindir)/$$g $(bindir)/$$g-$(VERSION) ; \
--			$(CHMOD) 775 $(bindir)/$$g $(bindir)/$$g-$(VERSION) ; \
-+			$(SEDCMD) $$f | $(CHECKSUM) > $(DESTDIR)$(bindir)/$$g ; \
-+			$(LN) $(DESTDIR)$(bindir)/$$g $(DESTDIR)$(bindir)/$$g-$(VERSION) ; \
-+			$(CHMOD) 775 $(DESTDIR)$(bindir)/$$g $(DESTDIR)$(bindir)/$$g-$(VERSION) ; \
- 		done ; \
- 	fi
- 
-@@ -625,31 +626,32 @@ install-ftp:	dist
- 	$(LS) -l $(FTPDIR)/$(PROGNAME)*
- 
- install-man:	uninstall-man
-+	-$(MKDIR) $(DESTDIR)$(mandir)
- 	for f in $(MANFILES) ; \
- 	do \
- 		g=`basename $$f .man` ; \
--		$(SEDCMD) $$f | $(CHECKSUM) > $(mandir)/$$g.$(manext) ; \
--		$(CHMOD) 664 $(mandir)/$$g.$(manext) ; \
-+		$(SEDCMD) $$f | $(CHECKSUM) > $(DESTDIR)$(mandir)/$$g.$(manext) ; \
-+		$(CHMOD) 664 $(DESTDIR)$(mandir)/$$g.$(manext) ; \
- 	done
- 
- install-show:
- 	@echo ''
- 	@echo Installed files...
--	@$(LS) -l $(bindir)/$(PROGNAME) $(bindir)/$(PROGNAME)-$(VERSION)
--	@$(LS) -l $(mandir)/$(PROGNAME).$(manext)
--	@if test -d $(shrlibdir) ; then $(LS) -lR $(shrlibdir)/* ; fi
-+	@$(LS) -l $(DESTDIR)$(bindir)/$(PROGNAME) $(DESTDIR)$(bindir)/$(PROGNAME)-$(VERSION)
-+	@$(LS) -l $(DESTDIR)$(mandir)/$(PROGNAME).$(manext)
-+	@if test -d $(DESTDIR)$(shrlibdir) ; then $(LS) -lR $(DESTDIR)$(shrlibdir)/* ; fi
- 	@echo ''
- 
- install-shrlib:	uninstall-shrlib
--	-$(MKDIR) $(shrlibtop)
--	@if test -d $(shrlibtop) ; then true ; else echo Cannot create $(shrlibtop) ; exit 1 ; fi
--	-$(MKDIR) $(shrlibdir)
--	@if test -d $(shrlibdir) ; then true ; else echo Cannot create $(shrlibdir) ; exit 1 ; fi
-+	-$(MKDIR) $(DESTDIR)$(shrlibtop)
-+	@if test -d $(DESTDIR)$(shrlibtop) ; then true ; else echo Cannot create $(DESTDIR)$(shrlibtop) ; exit 1 ; fi
-+	-$(MKDIR) $(DESTDIR)$(shrlibdir)
-+	@if test -d $(shrlibdir) ; then true ; else echo Cannot create $(DESTDIR)$(shrlibdir) ; exit 1 ; fi
- 	for f in $(SHRLIBFILES) ; \
- 	do \
--		$(SEDCMD) < $$f > $(shrlibdir)/$$f ; \
-+		$(SEDCMD) < $$f > $(DESTDIR)$(shrlibdir)/$$f ; \
- 	done
--	$(CHMOD) 664 $(shrlibdir)/*
-+	$(CHMOD) 664 $(DESTDIR)$(shrlibdir)/*
- 
- maintainer-clean:	distclean cleandocs
- 	@echo "This command is intended for maintainers to use;"
--- 
-1.7.1
-

Added: csw/mgar/pkg/ndiff/trunk/files/0001-fixed-make-install-target.patch
===================================================================
--- csw/mgar/pkg/ndiff/trunk/files/0001-fixed-make-install-target.patch	                        (rev 0)
+++ csw/mgar/pkg/ndiff/trunk/files/0001-fixed-make-install-target.patch	2010-10-20 10:23:52 UTC (rev 11346)
@@ -0,0 +1,95 @@
+From 384dc4cc022b87aafef94fd1010fadd9ca0ce015 Mon Sep 17 00:00:00 2001
+From: Kester Habermann <kester at opencsw.org>
+Date: Wed, 20 Oct 2010 12:17:04 +0200
+Subject: [PATCH] fixed make-install target
+
+---
+ Makefile.in |   38 ++++++++++++++++++++------------------
+ 1 files changed, 20 insertions(+), 18 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 78f5e95..d0a26bd 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -61,8 +61,8 @@ DATE		= @DATE@
+ 
+ prefix		= @prefix@
+ bindir		= $(prefix)/bin
+-catdir		= $(prefix)/man/cat$(manext)
+-mandir		= $(prefix)/man/man$(manext)
++catdir		= $(prefix)/share/man/cat$(manext)
++mandir		= $(prefix)/share/man/man$(manext)
+ manext		= 1
+ shrlibdir	= $(shrlibtop)/$(PROGNAME)-$(VERSION)
+ shrlibtop       = $(prefix)/share/lib/$(PROGNAME)
+@@ -599,17 +599,18 @@ html:	$(HTMLFILES)
+ install:	install-exe install-shrlib install-man install-show
+ 
+ install-exe:	uninstall-exe
++	-$(MKDIR) $(DESTDIR)$(bindir)
+ 	if test -f $(PROGNAME) ; \
+ 	then \
+-		$(CP) $(PROGNAME) $(bindir)/$(PROGNAME) ; \
+-		$(LN) $(bindir)/$(PROGNAME) $(bindir)/$(PROGNAME)-$(VERSION) ; \
++		$(CP) $(PROGNAME) $(DESTDIR)$(bindir)/$(PROGNAME) ; \
++		$(LN) $(DESTDIR)$(bindir)/$(PROGNAME) $(DESTDIR)$(bindir)/$(PROGNAME)-$(VERSION) ; \
+ 	else \
+ 		for f in $(SHFILES) ; \
+ 		do \
+ 			g=`basename $$f .sh` ; \
+-			$(SEDCMD) $$f | $(CHECKSUM) > $(bindir)/$$g ; \
+-			$(LN) $(bindir)/$$g $(bindir)/$$g-$(VERSION) ; \
+-			$(CHMOD) 775 $(bindir)/$$g $(bindir)/$$g-$(VERSION) ; \
++			$(SEDCMD) $$f | $(CHECKSUM) > $(DESTDIR)$(bindir)/$$g ; \
++			$(LN) $(DESTDIR)$(bindir)/$$g $(DESTDIR)$(bindir)/$$g-$(VERSION) ; \
++			$(CHMOD) 775 $(DESTDIR)$(bindir)/$$g $(DESTDIR)$(bindir)/$$g-$(VERSION) ; \
+ 		done ; \
+ 	fi
+ 
+@@ -625,31 +626,32 @@ install-ftp:	dist
+ 	$(LS) -l $(FTPDIR)/$(PROGNAME)*
+ 
+ install-man:	uninstall-man
++	-$(MKDIR) $(DESTDIR)$(mandir)
+ 	for f in $(MANFILES) ; \
+ 	do \
+ 		g=`basename $$f .man` ; \
+-		$(SEDCMD) $$f | $(CHECKSUM) > $(mandir)/$$g.$(manext) ; \
+-		$(CHMOD) 664 $(mandir)/$$g.$(manext) ; \
++		$(SEDCMD) $$f | $(CHECKSUM) > $(DESTDIR)$(mandir)/$$g.$(manext) ; \
++		$(CHMOD) 664 $(DESTDIR)$(mandir)/$$g.$(manext) ; \
+ 	done
+ 
+ install-show:
+ 	@echo ''
+ 	@echo Installed files...
+-	@$(LS) -l $(bindir)/$(PROGNAME) $(bindir)/$(PROGNAME)-$(VERSION)
+-	@$(LS) -l $(mandir)/$(PROGNAME).$(manext)
+-	@if test -d $(shrlibdir) ; then $(LS) -lR $(shrlibdir)/* ; fi
++	@$(LS) -l $(DESTDIR)$(bindir)/$(PROGNAME) $(DESTDIR)$(bindir)/$(PROGNAME)-$(VERSION)
++	@$(LS) -l $(DESTDIR)$(mandir)/$(PROGNAME).$(manext)
++	@if test -d $(DESTDIR)$(shrlibdir) ; then $(LS) -lR $(DESTDIR)$(shrlibdir)/* ; fi
+ 	@echo ''
+ 
+ install-shrlib:	uninstall-shrlib
+-	-$(MKDIR) $(shrlibtop)
+-	@if test -d $(shrlibtop) ; then true ; else echo Cannot create $(shrlibtop) ; exit 1 ; fi
+-	-$(MKDIR) $(shrlibdir)
+-	@if test -d $(shrlibdir) ; then true ; else echo Cannot create $(shrlibdir) ; exit 1 ; fi
++	-$(MKDIR) $(DESTDIR)$(shrlibtop)
++	@if test -d $(DESTDIR)$(shrlibtop) ; then true ; else echo Cannot create $(DESTDIR)$(shrlibtop) ; exit 1 ; fi
++	-$(MKDIR) $(DESTDIR)$(shrlibdir)
++	@if test -d $(DESTDIR)$(shrlibdir) ; then true ; else echo Cannot create $(DESTDIR)$(shrlibdir) ; exit 1 ; fi
+ 	for f in $(SHRLIBFILES) ; \
+ 	do \
+-		$(SEDCMD) < $$f > $(shrlibdir)/$$f ; \
++		$(SEDCMD) < $$f > $(DESTDIR)$(shrlibdir)/$$f ; \
+ 	done
+-	$(CHMOD) 664 $(shrlibdir)/*
++	$(CHMOD) 664 $(DESTDIR)$(shrlibdir)/*
+ 
+ maintainer-clean:	distclean cleandocs
+ 	@echo "This command is intended for maintainers to use;"
+-- 
+1.7.3
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


More information about the devel mailing list