[Glibc-bsd-commits] r2573 - trunk/freebsd-libs/debian

[Aurelien Jarno]

Author: aurel32
Date: 2009-06-06 19:26:24 +0000 (Sat, 06 Jun 2009)
New Revision: 2573

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/rules
Log:
  * Use SVN server instead of the deprecated CVS server in get-orig-source.



Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2009-06-06 18:59:22 UTC (rev 2572)
+++ trunk/freebsd-libs/debian/changelog	2009-06-06 19:26:24 UTC (rev 2573)
@@ -11,8 +11,9 @@
 
   [ Aurelien Jarno ]
   * Tighten build-depends on libbsd-dev.
+  * Use SVN server instead of the deprecated CVS server in get-orig-source.
 
- -- Aurelien Jarno <aurel32 at debian.org>  Sat, 06 Jun 2009 20:58:57 +0200
+ -- Aurelien Jarno <aurel32 at debian.org>  Sat, 06 Jun 2009 21:25:42 +0200
 
 freebsd-libs (7.1-2) unstable; urgency=low
 

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2009-06-06 18:59:22 UTC (rev 2572)
+++ trunk/freebsd-libs/debian/rules	2009-06-06 19:26:24 UTC (rev 2573)
@@ -17,9 +17,9 @@
 	CFLAGS += -O2
 endif
 
-ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-RELENG=RELENG_7_2_0_RELEASE
-VERSION=7.2
+VERSION=$(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
+SVN=svn://svn.freebsd.org/base/releng/$(VERSION)
+ORIGDIR=freebsd-libs-$(VERSION)
 PATH:=/usr/lib/freebsd:$(PATH)
 DESTDIR=$(CURDIR)/debian/tmp
 PMAKE=COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
@@ -29,19 +29,19 @@
 build: build-arch build-indep
 
 get-orig-source:
-	rm -rf freebsd-libs-$(VERSION)
+	rm -rf $(ORIGDIR)
 	for i in lib/libcam lib/libdevstat lib/libgeom lib/libipx lib/libkiconv \
-	         lib/libkvm lib/libsbuf lib/libusbhid sys/cam sys/kern/subr_sbuf.c ; do \
-	    cvs -d $(ANONCVS) export -r $(RELENG) -N -d freebsd-libs-$(VERSION) src/$$i ; \
+	         lib/libkvm lib/libsbuf lib/libusbhid sys/cam ; do \
+	    svn export $(SVN)/$$i $(ORIGDIR)/$$i ; \
 	done
-	mv freebsd-libs-$(VERSION)/src/* freebsd-libs-$(VERSION)
-	rmdir freebsd-libs-$(VERSION)/src
+	mkdir -p freebsd-libs-$(VERSION)/sys/kern ; \
+	    svn cat $(SVN)/$$i/sys/kern/subr_sbuf.c > $(ORIGDIR)/sys/kern/subr_sbuf.c
 	# Remove unused files with non GPL compatible license (eg BSD 4 clauses)
-	rm -f freebsd-libs-$(VERSION)/sys/cam/scsi/scsi_ch.*
-	rm -f freebsd-libs-$(VERSION)/lib/libkvm/kvm_ia64.c
-	rm -f freebsd-libs-$(VERSION)/lib/libkvm/kvm_powerpc.c
-	tar -czf ../freebsd-libs_$(VERSION).orig.tar.gz freebsd-libs-$(VERSION)
-	rm -rf freebsd-libs-$(VERSION)
+	rm -f $(ORIGDIR)/sys/cam/scsi/scsi_ch.*
+	rm -f $(ORIGDIR)/lib/libkvm/kvm_ia64.c
+	rm -f $(ORIGDIR)/lib/libkvm/kvm_powerpc.c
+	tar -czf ../freebsd-libs_$(VERSION).orig.tar.gz $(ORIGDIR)
+	rm -rf $(ORIGDIR)
 
 patch: patch-stamp
 patch-stamp: