[csw-devel] SF.net SVN: gar:[17320] csw/mgar/pkg/autoconf/branches/autoconf-2.13

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Wed Mar 7 01:50:47 CET 2012


Revision: 17320
          http://gar.svn.sourceforge.net/gar/?rev=17320&view=rev
Author:   wahwah
Date:     2012-03-07 00:50:47 +0000 (Wed, 07 Mar 2012)
Log Message:
-----------
autoconf/branches/autoconf-2.13: Using a version specific suffix

Modified Paths:
--------------
    csw/mgar/pkg/autoconf/branches/autoconf-2.13/Makefile
    csw/mgar/pkg/autoconf/branches/autoconf-2.13/checksums

Added Paths:
-----------
    csw/mgar/pkg/autoconf/branches/autoconf-2.13/files/0002-Use-DESTDIR.patch

Modified: csw/mgar/pkg/autoconf/branches/autoconf-2.13/Makefile
===================================================================
--- csw/mgar/pkg/autoconf/branches/autoconf-2.13/Makefile	2012-03-07 00:32:39 UTC (rev 17319)
+++ csw/mgar/pkg/autoconf/branches/autoconf-2.13/Makefile	2012-03-07 00:50:47 UTC (rev 17320)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = autoconf
-VERSION = 2.68
+VERSION = 2.13
 CATEGORIES = devel
 GARTYPE = v2
 
@@ -16,8 +16,12 @@
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES = $(NAME)-$(VERSION).tar.gz
 
-PATCHFILES = 0001-Prefer-CSW-tools.patch
+# PATCHFILES = 0001-Prefer-CSW-tools.patch
+PATCHFILES += 0002-Use-DESTDIR.patch
 
+PACKAGES += CSWautoconf2-13
+ARCHALL_CSWautoconf2-13 = 1
+
 BUILD_DEP_PKGS = CSWhelp2man
 
 # We need the Fortran runtime libs or the Fortran tests with fail
@@ -27,16 +31,21 @@
 
 VENDOR_URL = http://www.gnu.org/software/autoconf/
 
+datadir = $(prefix)/share/autoconf-$(VERSION)
 CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --program-suffix="-$(VERSION)"
 
 # Tests take a loooooonnng time.
 # TEST_SCRIPTS =
 
 EXTRA_MERGE_EXCLUDE_FILES = $(infodir)/standards.info
+EXTRA_MERGE_EXCLUDE_FILES += $(infodir)/autoconf.info
 
-CHECKPKG_OVERRIDES_CSWautoconf += missing-dependency|CSWemacscommon
-CHECKPKG_OVERRIDES_CSWautoconf += surplus-dependency|CSWgm4
-CHECKPKG_OVERRIDES_CSWautoconf += surplus-dependency|CSWgawk
+CHECKPKG_OVERRIDES_CSWautoconf2-13 += missing-dependency|CSWemacscommon
+CHECKPKG_OVERRIDES_CSWautoconf2-13 += surplus-dependency|CSWgm4
+CHECKPKG_OVERRIDES_CSWautoconf2-13 += surplus-dependency|CSWgawk
+CHECKPKG_OVERRIDES_CSWautoconf2-13 += surplus-dependency|CSWperl
+CHECKPKG_OVERRIDES_CSWautoconf2-13 += file-with-bad-content
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/autoconf/branches/autoconf-2.13/checksums
===================================================================
--- csw/mgar/pkg/autoconf/branches/autoconf-2.13/checksums	2012-03-07 00:32:39 UTC (rev 17319)
+++ csw/mgar/pkg/autoconf/branches/autoconf-2.13/checksums	2012-03-07 00:50:47 UTC (rev 17320)
@@ -1 +1 @@
-c3b5247592ce694f7097873aa07d66fe  autoconf-2.68.tar.gz
+9de56d4a161a723228220b0f425dc711  autoconf-2.13.tar.gz

Added: csw/mgar/pkg/autoconf/branches/autoconf-2.13/files/0002-Use-DESTDIR.patch
===================================================================
--- csw/mgar/pkg/autoconf/branches/autoconf-2.13/files/0002-Use-DESTDIR.patch	                        (rev 0)
+++ csw/mgar/pkg/autoconf/branches/autoconf-2.13/files/0002-Use-DESTDIR.patch	2012-03-07 00:50:47 UTC (rev 17320)
@@ -0,0 +1,75 @@
+From caba82c5071bff904afef3f403fd442394503a16 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Wed, 7 Mar 2012 01:43:01 +0100
+Subject: [PATCH] Use DESTDIR
+
+---
+ Makefile.in |   24 ++++++++++++------------
+ 1 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index a6c94d4..c07bdf6 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -137,23 +137,23 @@ installcheck: all install
+ 	cd testsuite && ${MAKE} AUTOCONF=${bindir}/autoconf $@
+ 
+ installdirs:
+-	$(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(acdatadir)
++	$(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(infodir) $(DESTDIR)$(acdatadir)
+ 
+ install: all $(M4FILES) acconfig.h installdirs install-info
+ 	for p in $(ASCRIPTS); do \
+-	  $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
++	  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+ 	done
+ 	for i in $(M4FROZEN); do \
+-	  $(INSTALL_DATA) $$i $(acdatadir)/$$i; \
++	  $(INSTALL_DATA) $$i $(DESTDIR)$(acdatadir)/$$i; \
+ 	done
+ 	for i in $(M4FILES) acconfig.h; do \
+-	  $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
++	  $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(acdatadir)/$$i; \
+ 	done
+ 	-if test -f autoscan; then \
+-	$(INSTALL_PROGRAM) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \
++	$(INSTALL_PROGRAM) autoscan $(DESTDIR)$(bindir)/`echo autoscan|sed '$(transform)'`; \
+ 	for i in acfunctions acheaders acidentifiers acprograms \
+ 	  acmakevars; do \
+-	$(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
++	$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(acdatadir)/$$i; \
+ 	done; \
+ 	else :; fi
+ 
+@@ -161,22 +161,22 @@ install: all $(M4FILES) acconfig.h installdirs install-info
+ install-info: info installdirs
+ 	if test -f autoconf.info; then \
+ 	  for i in *.info*; do \
+-	    $(INSTALL_DATA) $$i $(infodir)/$$i; \
++	    $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \
+ 	  done; \
+ 	else \
+ 	  for i in $(srcdir)/*.info*; do \
+-	    $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
++	    $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
+ 	  done; \
+ 	fi
+ 
+ uninstall:
+ 	for p in $(SCRIPTS); do \
+-	  rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
++	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+ 	done
+-	rm -fr $(acdatadir)
+-	cd $(infodir) && rm -f autoconf.info*
++	rm -fr $(DESTDIR)$(acdatadir)
++	cd $(DESTDIR)$(infodir) && rm -f autoconf.info*
+ 	if test -f standards.info || test -f $(srcdir)/standards.info; \
+-	then cd $(infodir) && rm -f standards.info*; fi
++	then cd $(DESTDIR)$(infodir) && rm -f standards.info*; fi
+ 
+ ${srcdir}/configure: configure.in $(M4FILES)
+ 	cd $(srcdir) && \
+-- 
+1.7.9
+

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