[arch-commits] Commit in checkinstall/repos (8 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Tue May 28 13:24:53 EDT 2013


    Date: Tuesday, May 28, 2013 @ 19:24:53
  Author: spupykin
Revision: 91846

archrelease: copy trunk to community-i686, community-x86_64

Added:
  checkinstall/repos/community-i686/PKGBUILD
    (from rev 91845, checkinstall/trunk/PKGBUILD)
  checkinstall/repos/community-i686/build-fix.patch
    (from rev 91845, checkinstall/trunk/build-fix.patch)
  checkinstall/repos/community-x86_64/PKGBUILD
    (from rev 91845, checkinstall/trunk/PKGBUILD)
  checkinstall/repos/community-x86_64/build-fix.patch
    (from rev 91845, checkinstall/trunk/build-fix.patch)
Deleted:
  checkinstall/repos/community-i686/PKGBUILD
  checkinstall/repos/community-i686/build-fix.patch
  checkinstall/repos/community-x86_64/PKGBUILD
  checkinstall/repos/community-x86_64/build-fix.patch

----------------------------------+
 /PKGBUILD                        |   54 ++++++
 /build-fix.patch                 |  308 +++++++++++++++++++++++++++++++++++++
 community-i686/PKGBUILD          |   23 --
 community-i686/build-fix.patch   |  154 ------------------
 community-x86_64/PKGBUILD        |   23 --
 community-x86_64/build-fix.patch |  154 ------------------
 6 files changed, 362 insertions(+), 354 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-05-28 17:24:37 UTC (rev 91845)
+++ community-i686/PKGBUILD	2013-05-28 17:24:53 UTC (rev 91846)
@@ -1,23 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=checkinstall
-pkgver=1.6.2
-pkgrel=2
-pkgdesc="spy for 'make install' and build rpm or deb"
-arch=('i686' 'x86_64')
-url="http://asic-linux.com.mx/~izto/checkinstall/"
-license=('GPL')
-backup=(etc/checkinstall/checkinstallrc)
-source=(http://asic-linux.com.mx/~izto/checkinstall/files/source/$pkgname-$pkgver.tar.gz
-	build-fix.patch)
-md5sums=('d7b43c92001e68243a93bcce8b1e5480'
-         '5c68cb7e29cf6da4b845ce57fb5ea080')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 <../build-fix.patch
-  make
-  make DESTDIR=$pkgdir install
-}

Copied: checkinstall/repos/community-i686/PKGBUILD (from rev 91845, checkinstall/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-05-28 17:24:53 UTC (rev 91846)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=checkinstall
+pkgver=1.6.2
+pkgrel=3
+pkgdesc="spy for 'make install' and build rpm or deb"
+arch=('i686' 'x86_64')
+url="http://asic-linux.com.mx/~izto/checkinstall/"
+license=('GPL')
+backup=(etc/checkinstall/checkinstallrc)
+source=(http://asic-linux.com.mx/~izto/checkinstall/files/source/$pkgname-$pkgver.tar.gz
+	build-fix.patch)
+md5sums=('d7b43c92001e68243a93bcce8b1e5480'
+         'eac0c843781c300e7bc15c55be262e51')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  patch -Np1 <../build-fix.patch
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+}

Deleted: community-i686/build-fix.patch
===================================================================
--- community-i686/build-fix.patch	2013-05-28 17:24:37 UTC (rev 91845)
+++ community-i686/build-fix.patch	2013-05-28 17:24:53 UTC (rev 91846)
@@ -1,154 +0,0 @@
-diff -wbBur checkinstall-1.6.2/checkinstall checkinstall-1.6.2.my/checkinstall
---- checkinstall-1.6.2/checkinstall	2009-12-26 22:17:24.000000000 +0300
-+++ checkinstall-1.6.2.my/checkinstall	2010-01-15 18:31:55.212907700 +0300
-@@ -869,7 +869,7 @@
- 
- ################################################################
- # User-configurable variables were moved to the checkinstallrc #
--# file which is probably found at /usr/local/lib/checkinstall  #          
-+# file which is probably found at /usr/lib/checkinstall        #
- #                                                              #
- #                  DO NOT modify them here!!                   #
- ################################################################
-@@ -1851,11 +1851,11 @@
-  COMPRESS="gzip -9"
-  COMPRESS_EXT=.gz
-  
-- for d in ./usr/local/man/man* ./usr/local/man/*/man* ./usr/local/info \
-- 	./usr/local/share/man/man* ./usr/local/share/man/*/man* \
-- 	./usr/local/share/info \
-- 	./usr/local/kerberos/man \
-- 	./usr/local/share/doc/*/man/man* ./usr/local/lib/*/man/man* \
-+ for d in ./usr/man/man* ./usr/man/*/man* ./usr/info \
-+ 	./usr/share/man/man* ./usr/share/man/*/man* \
-+ 	./usr/share/info \
-+ 	./usr/kerberos/man \
-+ 	./usr/share/doc/*/man/man* ./usr/lib/*/man/man* \
-  	././usr/man/man* ./usr/man/*/man* ./usr/info \
-  	./usr/share/man/man* ./usr/share/man/*/man* ./usr/share/info \
-  	./usr/kerberos/man ./usr/X11R6/man/man* ./usr/lib/perl5/man/man* \
-diff -wbBur checkinstall-1.6.2/checkinstallrc-dist checkinstall-1.6.2.my/checkinstallrc-dist
---- checkinstall-1.6.2/checkinstallrc-dist	2008-11-11 22:10:34.000000000 +0300
-+++ checkinstall-1.6.2.my/checkinstallrc-dist	2010-01-15 18:31:55.212907700 +0300
-@@ -16,7 +16,7 @@
- DEBUG=0
- 
- # Location of the "installwatch" program
--INSTALLWATCH_PREFIX="/usr/local"
-+INSTALLWATCH_PREFIX="/usr"
- INSTALLWATCH=${INSTALLWATCH_PREFIX}/bin/installwatch
- 
- # Location of the makepkg program. "makepak" is the default, and is 
-diff -wbBur checkinstall-1.6.2/installwatch/installwatch.c checkinstall-1.6.2.my/installwatch/installwatch.c
---- checkinstall-1.6.2/installwatch/installwatch.c	2008-11-16 19:20:53.000000000 +0300
-+++ checkinstall-1.6.2.my/installwatch/installwatch.c	2010-01-15 18:55:50.112716628 +0300
-@@ -2938,13 +2938,8 @@
- 	return result;
- }
- 
--#if (GLIBC_MINOR <= 4)
--int readlink(const char *path,char *buf,size_t bufsiz) {
--	int result;
--#else
- ssize_t readlink(const char *path,char *buf,size_t bufsiz) {
- 	ssize_t result;
--#endif
- 	instw_t instw;
- 	int status;
- 
-@@ -3077,9 +3072,12 @@
- 	return result;
- }
- 
--int scandir(	const char *dir,struct dirent ***namelist,
--		int (*select)(const struct dirent *),
--		int (*compar)(const void *,const void *)	) {
-+extern int scandir (__const char *__restrict dir,
-+		    struct dirent ***__restrict namelist,
-+		    int (*select) (__const struct dirent *),
-+		    int (*compar) (__const struct dirent **,
-+				  __const struct dirent **))
-+{
- 	int result;
- 
- 	if (!libc_handle)
-@@ -3689,9 +3687,13 @@
- 	return result;
- }
- 
--int scandir64(	const char *dir,struct dirent64 ***namelist,
--		int (*select)(const struct dirent64 *),
--		int (*compar)(const void *,const void *)	) {
-+extern int scandir64 (__const char *__restrict dir,
-+		      struct dirent64 ***__restrict namelist,
-+		      int (*select) (__const struct dirent64 *),
-+		      int (*compar) (__const struct dirent64 **,
-+				    __const struct dirent64 **))
-+//     __nonnull ((1, 2))
-+{
- 	int result;
- 
- 	if (!libc_handle)
-Only in checkinstall-1.6.2.my/installwatch: installwatch.o
-Only in checkinstall-1.6.2.my/installwatch: installwatch.so
-Only in checkinstall-1.6.2.my/installwatch: localdecls.h
-diff -wbBur checkinstall-1.6.2/installwatch/Makefile checkinstall-1.6.2.my/installwatch/Makefile
---- checkinstall-1.6.2/installwatch/Makefile	2008-11-16 19:20:53.000000000 +0300
-+++ checkinstall-1.6.2.my/installwatch/Makefile	2010-01-15 18:31:55.219536411 +0300
-@@ -4,14 +4,14 @@
- # Well, the only configurable part is the following variable.
- # Make sure the directory you specify exists.
- 
--PREFIX=/usr/local
-+PREFIX=/usr
- 
- # End of configurable part
- 
- VERSION=0.7.0beta7
- 
--BINDIR=$(PREFIX)/bin
--LIBDIR=$(PREFIX)/lib
-+BINDIR=$(DESTDIR)$(PREFIX)/bin
-+LIBDIR=$(DESTDIR)$(PREFIX)/lib
- 
- all: installwatch.so
- 
-Only in checkinstall-1.6.2.my/locale: checkinstall-de.mo
-Only in checkinstall-1.6.2.my/locale: checkinstall-es.mo
-Only in checkinstall-1.6.2.my/locale: checkinstall-id.mo
-Only in checkinstall-1.6.2.my/locale: checkinstall-it.mo
-Only in checkinstall-1.6.2.my/locale: checkinstall-ja.mo
-Only in checkinstall-1.6.2.my/locale: checkinstall-no.mo
-Only in checkinstall-1.6.2.my/locale: checkinstall-pt_BR.mo
-Only in checkinstall-1.6.2.my/locale: checkinstall-ru.mo
-Only in checkinstall-1.6.2.my/locale: checkinstall-zh_CN.mo
-diff -wbBur checkinstall-1.6.2/Makefile checkinstall-1.6.2.my/Makefile
---- checkinstall-1.6.2/Makefile	2008-11-12 05:43:53.000000000 +0300
-+++ checkinstall-1.6.2.my/Makefile	2010-01-15 18:31:55.219536411 +0300
-@@ -1,10 +1,10 @@
- # $Id: Makefile,v 1.6.2.1 2008/11/09 07:48:18 izto Exp $
- 
- # Where to install.
--PREFIX=/usr/local
--BINDIR=$(PREFIX)/sbin
--LCDIR=$(PREFIX)/lib/checkinstall/locale
--CONFDIR=$(PREFIX)/lib/checkinstall
-+PREFIX=/usr
-+BINDIR=$(DESTDIR)/$(PREFIX)/sbin
-+LCDIR=$(DESTDIR)/$(PREFIX)/share/locale
-+CONFDIR=$(DESTDIR)/etc/checkinstall
- 
- all:
- 	for file in locale/checkinstall-*.po ; do \
-@@ -25,7 +25,11 @@
- 	export
- 	$(MAKE) -C installwatch install
- 	
-+	mkdir -p $(DESTDIR)/usr/bin
- 	mkdir -p $(BINDIR)
-+	mkdir -p $(CONFDIR)
-+	mkdir -p $(DESTDIR)/etc/checkinstall
-+	
- 	install checkinstall makepak $(BINDIR)
- 	for file in locale/*.mo ; do \
- 		LANG=`echo $$file | sed -e 's|locale/checkinstall-||' \

Copied: checkinstall/repos/community-i686/build-fix.patch (from rev 91845, checkinstall/trunk/build-fix.patch)
===================================================================
--- community-i686/build-fix.patch	                        (rev 0)
+++ community-i686/build-fix.patch	2013-05-28 17:24:53 UTC (rev 91846)
@@ -0,0 +1,154 @@
+diff -wbBur checkinstall-1.6.2/checkinstall checkinstall-1.6.2.my/checkinstall
+--- checkinstall-1.6.2/checkinstall	2009-12-26 22:17:24.000000000 +0300
++++ checkinstall-1.6.2.my/checkinstall	2010-01-15 18:31:55.212907700 +0300
+@@ -869,7 +869,7 @@
+ 
+ ################################################################
+ # User-configurable variables were moved to the checkinstallrc #
+-# file which is probably found at /usr/local/lib/checkinstall  #          
++# file which is probably found at /usr/lib/checkinstall        #
+ #                                                              #
+ #                  DO NOT modify them here!!                   #
+ ################################################################
+@@ -1851,11 +1851,11 @@
+  COMPRESS="gzip -9"
+  COMPRESS_EXT=.gz
+  
+- for d in ./usr/local/man/man* ./usr/local/man/*/man* ./usr/local/info \
+- 	./usr/local/share/man/man* ./usr/local/share/man/*/man* \
+- 	./usr/local/share/info \
+- 	./usr/local/kerberos/man \
+- 	./usr/local/share/doc/*/man/man* ./usr/local/lib/*/man/man* \
++ for d in ./usr/man/man* ./usr/man/*/man* ./usr/info \
++ 	./usr/share/man/man* ./usr/share/man/*/man* \
++ 	./usr/share/info \
++ 	./usr/kerberos/man \
++ 	./usr/share/doc/*/man/man* ./usr/lib/*/man/man* \
+  	././usr/man/man* ./usr/man/*/man* ./usr/info \
+  	./usr/share/man/man* ./usr/share/man/*/man* ./usr/share/info \
+  	./usr/kerberos/man ./usr/X11R6/man/man* ./usr/lib/perl5/man/man* \
+diff -wbBur checkinstall-1.6.2/checkinstallrc-dist checkinstall-1.6.2.my/checkinstallrc-dist
+--- checkinstall-1.6.2/checkinstallrc-dist	2008-11-11 22:10:34.000000000 +0300
++++ checkinstall-1.6.2.my/checkinstallrc-dist	2010-01-15 18:31:55.212907700 +0300
+@@ -16,7 +16,7 @@
+ DEBUG=0
+ 
+ # Location of the "installwatch" program
+-INSTALLWATCH_PREFIX="/usr/local"
++INSTALLWATCH_PREFIX="/usr"
+ INSTALLWATCH=${INSTALLWATCH_PREFIX}/bin/installwatch
+ 
+ # Location of the makepkg program. "makepak" is the default, and is 
+diff -wbBur checkinstall-1.6.2/installwatch/installwatch.c checkinstall-1.6.2.my/installwatch/installwatch.c
+--- checkinstall-1.6.2/installwatch/installwatch.c	2008-11-16 19:20:53.000000000 +0300
++++ checkinstall-1.6.2.my/installwatch/installwatch.c	2010-01-15 18:55:50.112716628 +0300
+@@ -2938,13 +2938,8 @@
+ 	return result;
+ }
+ 
+-#if (GLIBC_MINOR <= 4)
+-int readlink(const char *path,char *buf,size_t bufsiz) {
+-	int result;
+-#else
+ ssize_t readlink(const char *path,char *buf,size_t bufsiz) {
+ 	ssize_t result;
+-#endif
+ 	instw_t instw;
+ 	int status;
+ 
+@@ -3077,9 +3072,12 @@
+ 	return result;
+ }
+ 
+-int scandir(	const char *dir,struct dirent ***namelist,
+-		int (*select)(const struct dirent *),
+-		int (*compar)(const void *,const void *)	) {
++extern int scandir (__const char *__restrict dir,
++		    struct dirent ***__restrict namelist,
++		    int (*select) (__const struct dirent *),
++		    int (*compar) (__const struct dirent **,
++				  __const struct dirent **))
++{
+ 	int result;
+ 
+ 	if (!libc_handle)
+@@ -3689,9 +3687,13 @@
+ 	return result;
+ }
+ 
+-int scandir64(	const char *dir,struct dirent64 ***namelist,
+-		int (*select)(const struct dirent64 *),
+-		int (*compar)(const void *,const void *)	) {
++extern int scandir64 (__const char *__restrict dir,
++		      struct dirent64 ***__restrict namelist,
++		      int (*select) (__const struct dirent64 *),
++		      int (*compar) (__const struct dirent64 **,
++				    __const struct dirent64 **))
++//     __nonnull ((1, 2))
++{
+ 	int result;
+ 
+ 	if (!libc_handle)
+Only in checkinstall-1.6.2.my/installwatch: installwatch.o
+Only in checkinstall-1.6.2.my/installwatch: installwatch.so
+Only in checkinstall-1.6.2.my/installwatch: localdecls.h
+diff -wbBur checkinstall-1.6.2/installwatch/Makefile checkinstall-1.6.2.my/installwatch/Makefile
+--- checkinstall-1.6.2/installwatch/Makefile	2008-11-16 19:20:53.000000000 +0300
++++ checkinstall-1.6.2.my/installwatch/Makefile	2010-01-15 18:31:55.219536411 +0300
+@@ -4,14 +4,14 @@
+ # Well, the only configurable part is the following variable.
+ # Make sure the directory you specify exists.
+ 
+-PREFIX=/usr/local
++PREFIX=/usr
+ 
+ # End of configurable part
+ 
+ VERSION=0.7.0beta7
+ 
+-BINDIR=$(PREFIX)/bin
+-LIBDIR=$(PREFIX)/lib
++BINDIR=$(DESTDIR)$(PREFIX)/bin
++LIBDIR=$(DESTDIR)$(PREFIX)/lib
+ 
+ all: installwatch.so
+ 
+Only in checkinstall-1.6.2.my/locale: checkinstall-de.mo
+Only in checkinstall-1.6.2.my/locale: checkinstall-es.mo
+Only in checkinstall-1.6.2.my/locale: checkinstall-id.mo
+Only in checkinstall-1.6.2.my/locale: checkinstall-it.mo
+Only in checkinstall-1.6.2.my/locale: checkinstall-ja.mo
+Only in checkinstall-1.6.2.my/locale: checkinstall-no.mo
+Only in checkinstall-1.6.2.my/locale: checkinstall-pt_BR.mo
+Only in checkinstall-1.6.2.my/locale: checkinstall-ru.mo
+Only in checkinstall-1.6.2.my/locale: checkinstall-zh_CN.mo
+diff -wbBur checkinstall-1.6.2/Makefile checkinstall-1.6.2.my/Makefile
+--- checkinstall-1.6.2/Makefile	2008-11-12 05:43:53.000000000 +0300
++++ checkinstall-1.6.2.my/Makefile	2010-01-15 18:31:55.219536411 +0300
+@@ -1,10 +1,10 @@
+ # $Id: Makefile,v 1.6.2.1 2008/11/09 07:48:18 izto Exp $
+ 
+ # Where to install.
+-PREFIX=/usr/local
+-BINDIR=$(PREFIX)/sbin
+-LCDIR=$(PREFIX)/lib/checkinstall/locale
+-CONFDIR=$(PREFIX)/lib/checkinstall
++PREFIX=/usr
++BINDIR=$(DESTDIR)/$(PREFIX)/bin
++LCDIR=$(DESTDIR)/$(PREFIX)/share/locale
++CONFDIR=$(DESTDIR)/etc/checkinstall
+ 
+ all:
+ 	for file in locale/checkinstall-*.po ; do \
+@@ -25,7 +25,11 @@
+ 	export
+ 	$(MAKE) -C installwatch install
+ 	
++	mkdir -p $(DESTDIR)/usr/bin
+ 	mkdir -p $(BINDIR)
++	mkdir -p $(CONFDIR)
++	mkdir -p $(DESTDIR)/etc/checkinstall
++	
+ 	install checkinstall makepak $(BINDIR)
+ 	for file in locale/*.mo ; do \
+ 		LANG=`echo $$file | sed -e 's|locale/checkinstall-||' \

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-05-28 17:24:37 UTC (rev 91845)
+++ community-x86_64/PKGBUILD	2013-05-28 17:24:53 UTC (rev 91846)
@@ -1,23 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=checkinstall
-pkgver=1.6.2
-pkgrel=2
-pkgdesc="spy for 'make install' and build rpm or deb"
-arch=('i686' 'x86_64')
-url="http://asic-linux.com.mx/~izto/checkinstall/"
-license=('GPL')
-backup=(etc/checkinstall/checkinstallrc)
-source=(http://asic-linux.com.mx/~izto/checkinstall/files/source/$pkgname-$pkgver.tar.gz
-	build-fix.patch)
-md5sums=('d7b43c92001e68243a93bcce8b1e5480'
-         '5c68cb7e29cf6da4b845ce57fb5ea080')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 <../build-fix.patch
-  make
-  make DESTDIR=$pkgdir install
-}

Copied: checkinstall/repos/community-x86_64/PKGBUILD (from rev 91845, checkinstall/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-05-28 17:24:53 UTC (rev 91846)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=checkinstall
+pkgver=1.6.2
+pkgrel=3
+pkgdesc="spy for 'make install' and build rpm or deb"
+arch=('i686' 'x86_64')
+url="http://asic-linux.com.mx/~izto/checkinstall/"
+license=('GPL')
+backup=(etc/checkinstall/checkinstallrc)
+source=(http://asic-linux.com.mx/~izto/checkinstall/files/source/$pkgname-$pkgver.tar.gz
+	build-fix.patch)
+md5sums=('d7b43c92001e68243a93bcce8b1e5480'
+         'eac0c843781c300e7bc15c55be262e51')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  patch -Np1 <../build-fix.patch
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+}

Deleted: community-x86_64/build-fix.patch
===================================================================
--- community-x86_64/build-fix.patch	2013-05-28 17:24:37 UTC (rev 91845)
+++ community-x86_64/build-fix.patch	2013-05-28 17:24:53 UTC (rev 91846)
@@ -1,154 +0,0 @@
-diff -wbBur checkinstall-1.6.2/checkinstall checkinstall-1.6.2.my/checkinstall
---- checkinstall-1.6.2/checkinstall	2009-12-26 22:17:24.000000000 +0300
-+++ checkinstall-1.6.2.my/checkinstall	2010-01-15 18:31:55.212907700 +0300
-@@ -869,7 +869,7 @@
- 
- ################################################################
- # User-configurable variables were moved to the checkinstallrc #
--# file which is probably found at /usr/local/lib/checkinstall  #          
-+# file which is probably found at /usr/lib/checkinstall        #
- #                                                              #
- #                  DO NOT modify them here!!                   #
- ################################################################
-@@ -1851,11 +1851,11 @@
-  COMPRESS="gzip -9"
-  COMPRESS_EXT=.gz
-  
-- for d in ./usr/local/man/man* ./usr/local/man/*/man* ./usr/local/info \
-- 	./usr/local/share/man/man* ./usr/local/share/man/*/man* \
-- 	./usr/local/share/info \
-- 	./usr/local/kerberos/man \
-- 	./usr/local/share/doc/*/man/man* ./usr/local/lib/*/man/man* \
-+ for d in ./usr/man/man* ./usr/man/*/man* ./usr/info \
-+ 	./usr/share/man/man* ./usr/share/man/*/man* \
-+ 	./usr/share/info \
-+ 	./usr/kerberos/man \
-+ 	./usr/share/doc/*/man/man* ./usr/lib/*/man/man* \
-  	././usr/man/man* ./usr/man/*/man* ./usr/info \
-  	./usr/share/man/man* ./usr/share/man/*/man* ./usr/share/info \
-  	./usr/kerberos/man ./usr/X11R6/man/man* ./usr/lib/perl5/man/man* \
-diff -wbBur checkinstall-1.6.2/checkinstallrc-dist checkinstall-1.6.2.my/checkinstallrc-dist
---- checkinstall-1.6.2/checkinstallrc-dist	2008-11-11 22:10:34.000000000 +0300
-+++ checkinstall-1.6.2.my/checkinstallrc-dist	2010-01-15 18:31:55.212907700 +0300
-@@ -16,7 +16,7 @@
- DEBUG=0
- 
- # Location of the "installwatch" program
--INSTALLWATCH_PREFIX="/usr/local"
-+INSTALLWATCH_PREFIX="/usr"
- INSTALLWATCH=${INSTALLWATCH_PREFIX}/bin/installwatch
- 
- # Location of the makepkg program. "makepak" is the default, and is 
-diff -wbBur checkinstall-1.6.2/installwatch/installwatch.c checkinstall-1.6.2.my/installwatch/installwatch.c
---- checkinstall-1.6.2/installwatch/installwatch.c	2008-11-16 19:20:53.000000000 +0300
-+++ checkinstall-1.6.2.my/installwatch/installwatch.c	2010-01-15 18:55:50.112716628 +0300
-@@ -2938,13 +2938,8 @@
- 	return result;
- }
- 
--#if (GLIBC_MINOR <= 4)
--int readlink(const char *path,char *buf,size_t bufsiz) {
--	int result;
--#else
- ssize_t readlink(const char *path,char *buf,size_t bufsiz) {
- 	ssize_t result;
--#endif
- 	instw_t instw;
- 	int status;
- 
-@@ -3077,9 +3072,12 @@
- 	return result;
- }
- 
--int scandir(	const char *dir,struct dirent ***namelist,
--		int (*select)(const struct dirent *),
--		int (*compar)(const void *,const void *)	) {
-+extern int scandir (__const char *__restrict dir,
-+		    struct dirent ***__restrict namelist,
-+		    int (*select) (__const struct dirent *),
-+		    int (*compar) (__const struct dirent **,
-+				  __const struct dirent **))
-+{
- 	int result;
- 
- 	if (!libc_handle)
-@@ -3689,9 +3687,13 @@
- 	return result;
- }
- 
--int scandir64(	const char *dir,struct dirent64 ***namelist,
--		int (*select)(const struct dirent64 *),
--		int (*compar)(const void *,const void *)	) {
-+extern int scandir64 (__const char *__restrict dir,
-+		      struct dirent64 ***__restrict namelist,
-+		      int (*select) (__const struct dirent64 *),
-+		      int (*compar) (__const struct dirent64 **,
-+				    __const struct dirent64 **))
-+//     __nonnull ((1, 2))
-+{
- 	int result;
- 
- 	if (!libc_handle)
-Only in checkinstall-1.6.2.my/installwatch: installwatch.o
-Only in checkinstall-1.6.2.my/installwatch: installwatch.so
-Only in checkinstall-1.6.2.my/installwatch: localdecls.h
-diff -wbBur checkinstall-1.6.2/installwatch/Makefile checkinstall-1.6.2.my/installwatch/Makefile
---- checkinstall-1.6.2/installwatch/Makefile	2008-11-16 19:20:53.000000000 +0300
-+++ checkinstall-1.6.2.my/installwatch/Makefile	2010-01-15 18:31:55.219536411 +0300
-@@ -4,14 +4,14 @@
- # Well, the only configurable part is the following variable.
- # Make sure the directory you specify exists.
- 
--PREFIX=/usr/local
-+PREFIX=/usr
- 
- # End of configurable part
- 
- VERSION=0.7.0beta7
- 
--BINDIR=$(PREFIX)/bin
--LIBDIR=$(PREFIX)/lib
-+BINDIR=$(DESTDIR)$(PREFIX)/bin
-+LIBDIR=$(DESTDIR)$(PREFIX)/lib
- 
- all: installwatch.so
- 
-Only in checkinstall-1.6.2.my/locale: checkinstall-de.mo
-Only in checkinstall-1.6.2.my/locale: checkinstall-es.mo
-Only in checkinstall-1.6.2.my/locale: checkinstall-id.mo
-Only in checkinstall-1.6.2.my/locale: checkinstall-it.mo
-Only in checkinstall-1.6.2.my/locale: checkinstall-ja.mo
-Only in checkinstall-1.6.2.my/locale: checkinstall-no.mo
-Only in checkinstall-1.6.2.my/locale: checkinstall-pt_BR.mo
-Only in checkinstall-1.6.2.my/locale: checkinstall-ru.mo
-Only in checkinstall-1.6.2.my/locale: checkinstall-zh_CN.mo
-diff -wbBur checkinstall-1.6.2/Makefile checkinstall-1.6.2.my/Makefile
---- checkinstall-1.6.2/Makefile	2008-11-12 05:43:53.000000000 +0300
-+++ checkinstall-1.6.2.my/Makefile	2010-01-15 18:31:55.219536411 +0300
-@@ -1,10 +1,10 @@
- # $Id: Makefile,v 1.6.2.1 2008/11/09 07:48:18 izto Exp $
- 
- # Where to install.
--PREFIX=/usr/local
--BINDIR=$(PREFIX)/sbin
--LCDIR=$(PREFIX)/lib/checkinstall/locale
--CONFDIR=$(PREFIX)/lib/checkinstall
-+PREFIX=/usr
-+BINDIR=$(DESTDIR)/$(PREFIX)/sbin
-+LCDIR=$(DESTDIR)/$(PREFIX)/share/locale
-+CONFDIR=$(DESTDIR)/etc/checkinstall
- 
- all:
- 	for file in locale/checkinstall-*.po ; do \
-@@ -25,7 +25,11 @@
- 	export
- 	$(MAKE) -C installwatch install
- 	
-+	mkdir -p $(DESTDIR)/usr/bin
- 	mkdir -p $(BINDIR)
-+	mkdir -p $(CONFDIR)
-+	mkdir -p $(DESTDIR)/etc/checkinstall
-+	
- 	install checkinstall makepak $(BINDIR)
- 	for file in locale/*.mo ; do \
- 		LANG=`echo $$file | sed -e 's|locale/checkinstall-||' \

Copied: checkinstall/repos/community-x86_64/build-fix.patch (from rev 91845, checkinstall/trunk/build-fix.patch)
===================================================================
--- community-x86_64/build-fix.patch	                        (rev 0)
+++ community-x86_64/build-fix.patch	2013-05-28 17:24:53 UTC (rev 91846)
@@ -0,0 +1,154 @@
+diff -wbBur checkinstall-1.6.2/checkinstall checkinstall-1.6.2.my/checkinstall
+--- checkinstall-1.6.2/checkinstall	2009-12-26 22:17:24.000000000 +0300
++++ checkinstall-1.6.2.my/checkinstall	2010-01-15 18:31:55.212907700 +0300
+@@ -869,7 +869,7 @@
+ 
+ ################################################################
+ # User-configurable variables were moved to the checkinstallrc #
+-# file which is probably found at /usr/local/lib/checkinstall  #          
++# file which is probably found at /usr/lib/checkinstall        #
+ #                                                              #
+ #                  DO NOT modify them here!!                   #
+ ################################################################
+@@ -1851,11 +1851,11 @@
+  COMPRESS="gzip -9"
+  COMPRESS_EXT=.gz
+  
+- for d in ./usr/local/man/man* ./usr/local/man/*/man* ./usr/local/info \
+- 	./usr/local/share/man/man* ./usr/local/share/man/*/man* \
+- 	./usr/local/share/info \
+- 	./usr/local/kerberos/man \
+- 	./usr/local/share/doc/*/man/man* ./usr/local/lib/*/man/man* \
++ for d in ./usr/man/man* ./usr/man/*/man* ./usr/info \
++ 	./usr/share/man/man* ./usr/share/man/*/man* \
++ 	./usr/share/info \
++ 	./usr/kerberos/man \
++ 	./usr/share/doc/*/man/man* ./usr/lib/*/man/man* \
+  	././usr/man/man* ./usr/man/*/man* ./usr/info \
+  	./usr/share/man/man* ./usr/share/man/*/man* ./usr/share/info \
+  	./usr/kerberos/man ./usr/X11R6/man/man* ./usr/lib/perl5/man/man* \
+diff -wbBur checkinstall-1.6.2/checkinstallrc-dist checkinstall-1.6.2.my/checkinstallrc-dist
+--- checkinstall-1.6.2/checkinstallrc-dist	2008-11-11 22:10:34.000000000 +0300
++++ checkinstall-1.6.2.my/checkinstallrc-dist	2010-01-15 18:31:55.212907700 +0300
+@@ -16,7 +16,7 @@
+ DEBUG=0
+ 
+ # Location of the "installwatch" program
+-INSTALLWATCH_PREFIX="/usr/local"
++INSTALLWATCH_PREFIX="/usr"
+ INSTALLWATCH=${INSTALLWATCH_PREFIX}/bin/installwatch
+ 
+ # Location of the makepkg program. "makepak" is the default, and is 
+diff -wbBur checkinstall-1.6.2/installwatch/installwatch.c checkinstall-1.6.2.my/installwatch/installwatch.c
+--- checkinstall-1.6.2/installwatch/installwatch.c	2008-11-16 19:20:53.000000000 +0300
++++ checkinstall-1.6.2.my/installwatch/installwatch.c	2010-01-15 18:55:50.112716628 +0300
+@@ -2938,13 +2938,8 @@
+ 	return result;
+ }
+ 
+-#if (GLIBC_MINOR <= 4)
+-int readlink(const char *path,char *buf,size_t bufsiz) {
+-	int result;
+-#else
+ ssize_t readlink(const char *path,char *buf,size_t bufsiz) {
+ 	ssize_t result;
+-#endif
+ 	instw_t instw;
+ 	int status;
+ 
+@@ -3077,9 +3072,12 @@
+ 	return result;
+ }
+ 
+-int scandir(	const char *dir,struct dirent ***namelist,
+-		int (*select)(const struct dirent *),
+-		int (*compar)(const void *,const void *)	) {
++extern int scandir (__const char *__restrict dir,
++		    struct dirent ***__restrict namelist,
++		    int (*select) (__const struct dirent *),
++		    int (*compar) (__const struct dirent **,
++				  __const struct dirent **))
++{
+ 	int result;
+ 
+ 	if (!libc_handle)
+@@ -3689,9 +3687,13 @@
+ 	return result;
+ }
+ 
+-int scandir64(	const char *dir,struct dirent64 ***namelist,
+-		int (*select)(const struct dirent64 *),
+-		int (*compar)(const void *,const void *)	) {
++extern int scandir64 (__const char *__restrict dir,
++		      struct dirent64 ***__restrict namelist,
++		      int (*select) (__const struct dirent64 *),
++		      int (*compar) (__const struct dirent64 **,
++				    __const struct dirent64 **))
++//     __nonnull ((1, 2))
++{
+ 	int result;
+ 
+ 	if (!libc_handle)
+Only in checkinstall-1.6.2.my/installwatch: installwatch.o
+Only in checkinstall-1.6.2.my/installwatch: installwatch.so
+Only in checkinstall-1.6.2.my/installwatch: localdecls.h
+diff -wbBur checkinstall-1.6.2/installwatch/Makefile checkinstall-1.6.2.my/installwatch/Makefile
+--- checkinstall-1.6.2/installwatch/Makefile	2008-11-16 19:20:53.000000000 +0300
++++ checkinstall-1.6.2.my/installwatch/Makefile	2010-01-15 18:31:55.219536411 +0300
+@@ -4,14 +4,14 @@
+ # Well, the only configurable part is the following variable.
+ # Make sure the directory you specify exists.
+ 
+-PREFIX=/usr/local
++PREFIX=/usr
+ 
+ # End of configurable part
+ 
+ VERSION=0.7.0beta7
+ 
+-BINDIR=$(PREFIX)/bin
+-LIBDIR=$(PREFIX)/lib
++BINDIR=$(DESTDIR)$(PREFIX)/bin
++LIBDIR=$(DESTDIR)$(PREFIX)/lib
+ 
+ all: installwatch.so
+ 
+Only in checkinstall-1.6.2.my/locale: checkinstall-de.mo
+Only in checkinstall-1.6.2.my/locale: checkinstall-es.mo
+Only in checkinstall-1.6.2.my/locale: checkinstall-id.mo
+Only in checkinstall-1.6.2.my/locale: checkinstall-it.mo
+Only in checkinstall-1.6.2.my/locale: checkinstall-ja.mo
+Only in checkinstall-1.6.2.my/locale: checkinstall-no.mo
+Only in checkinstall-1.6.2.my/locale: checkinstall-pt_BR.mo
+Only in checkinstall-1.6.2.my/locale: checkinstall-ru.mo
+Only in checkinstall-1.6.2.my/locale: checkinstall-zh_CN.mo
+diff -wbBur checkinstall-1.6.2/Makefile checkinstall-1.6.2.my/Makefile
+--- checkinstall-1.6.2/Makefile	2008-11-12 05:43:53.000000000 +0300
++++ checkinstall-1.6.2.my/Makefile	2010-01-15 18:31:55.219536411 +0300
+@@ -1,10 +1,10 @@
+ # $Id: Makefile,v 1.6.2.1 2008/11/09 07:48:18 izto Exp $
+ 
+ # Where to install.
+-PREFIX=/usr/local
+-BINDIR=$(PREFIX)/sbin
+-LCDIR=$(PREFIX)/lib/checkinstall/locale
+-CONFDIR=$(PREFIX)/lib/checkinstall
++PREFIX=/usr
++BINDIR=$(DESTDIR)/$(PREFIX)/bin
++LCDIR=$(DESTDIR)/$(PREFIX)/share/locale
++CONFDIR=$(DESTDIR)/etc/checkinstall
+ 
+ all:
+ 	for file in locale/checkinstall-*.po ; do \
+@@ -25,7 +25,11 @@
+ 	export
+ 	$(MAKE) -C installwatch install
+ 	
++	mkdir -p $(DESTDIR)/usr/bin
+ 	mkdir -p $(BINDIR)
++	mkdir -p $(CONFDIR)
++	mkdir -p $(DESTDIR)/etc/checkinstall
++	
+ 	install checkinstall makepak $(BINDIR)
+ 	for file in locale/*.mo ; do \
+ 		LANG=`echo $$file | sed -e 's|locale/checkinstall-||' \



More information about the arch-commits mailing list