[arch-commits] Commit in rcs/trunk (PKGBUILD path.patch)
Date: Monday, September 5, 2011 @ 03:45:54
Author: bisson
Revision: 137008
upstream update
Modified:
rcs/trunk/PKGBUILD
Deleted:
rcs/trunk/path.patch
+
PKGBUILD | 28 +++-
path.patch | 67 ---
2 files changed, 13 insertions(+), 82 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-09-05 06:30:50 UTC (rev 137007)
+++ PKGBUILD2011-09-05 07:45:54 UTC (rev 137008)
@@ -3,29 +3,27 @@
# Maintainer: Gaetan Bisson bis...@archlinux.org
pkgname=rcs
-pkgver=5.7
-pkgrel=6
-pkgdesc='Revision Control System'
+pkgver=5.8
+pkgrel=1
+pkgdesc='Revision Control System: manages multiple revisions of files'
+url='http://www.gnu.org/software/rcs/'
+license=('GPL3')
arch=('i686' 'x86_64')
-url=http://www.cs.purdue.edu/homes/trinkle/RCS/;
-license=('GPL')
-source=(http://www.cs.purdue.edu/homes/trinkle/RCS/rcs-${pkgver}.tar.Z; \
-'path.patch')
-sha1sums=('976774bda26a7743b8375797f92fbd18e51ac7a2'
- '0f0be997e5d018e0d638b5f16430423ccb3774be')
+source=(http://ftpmirror.gnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz;)
+sha1sums=('6ba0c3ea2d170990214a26b323feaadb89bb4206')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -p1 -i ../path.patch
./configure --prefix=/usr
make
}
-package() {
+check() {
cd ${srcdir}/${pkgname}-${pkgver}
- make install \
- prefix=${pkgdir}/usr \
- man1dir=${pkgdir}/usr/share/man/man1 \
- man5dir=${pkgdir}/usr/share/man/man5 \
+ make check
+}
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make prefix=${pkgdir}/usr install
}
Deleted: path.patch
===
--- path.patch 2011-09-05 06:30:50 UTC (rev 137007)
+++ path.patch 2011-09-05 07:45:54 UTC (rev 137008)
@@ -1,67 +0,0 @@
-diff -Naur rcs-5.7-orig/src/conf.heg rcs-5.7/src/conf.heg
rcs-5.7-orig/src/conf.heg 1995-06-02 11:19:00.0 -0700
-+++ rcs-5.7/src/conf.heg 2004-11-29 12:41:37.0 -0800
-@@ -210,10 +210,10 @@
- /* Do struct stat s and t describe the same file? Answer d if unknown. */
- #define same_file(s,t,d) ((s).st_ino==(t).st_ino (s).st_dev==(t).st_dev)
- #define has_utimbuf 1 /* Does struct utimbuf work? */
--#define CO /usr/local/bin/co /* name of 'co' program */
-+#define CO /usr/bin/co /* name of 'co' program */
- #define COMPAT2 0 /* Are version 2 files supported? */
--#define DIFF /usr/local/bin/diff /* name of 'diff' program */
--#define DIFF3 /usr/local/bin/diff3 /* name of 'diff3' program */
-+#define DIFF /usr/bin/diff /* name of 'diff' program */
-+#define DIFF3 /usr/bin/diff3 /* name of 'diff3' program */
- #define DIFF3_BIN 1 /* Is diff3 user-visible (not the /usr/lib auxiliary)? */
- #define DIFFFLAGS -an /* Make diff output suitable for RCS. */
- #define DIFF_L 1 /* Does diff -L work? */
-@@ -221,7 +221,7 @@
- #define DIFF_FAILURE 1 /* DIFF status if differences are found */
- #define DIFF_TROUBLE 2 /* DIFF status if trouble */
- #define ED /bin/ed /* name of 'ed' program (used only if !DIFF3_BIN) */
--#define MERGE /usr/local/bin/merge /* name of 'merge' program */
-+#define MERGE /usr/bin/merge /* name of 'merge' program */
- #define TMPDIR /tmp /* default directory for temporary files */
- #define SLASH '/' /* principal filename separator */
- #define SLASHes '/' /* `case SLASHes:' labels all filename separators */
-diff -Naur rcs-5.7-orig/src/conf.sh rcs-5.7/src/conf.sh
rcs-5.7-orig/src/conf.sh 1995-06-15 23:19:24.0 -0700
-+++ rcs-5.7/src/conf.sh2004-11-29 12:42:28.0 -0800
-@@ -32,7 +32,7 @@
- # and can be inspected for clues otherwise.
-
- # The Makefile overrides the following defaults.
--: ${RCSPREFIX=/usr/local/bin/}
-+: ${RCSPREFIX=/usr/bin/}
- : ${ALL_CFLAGS=-Dhas_conf_h}
- : ${CC=cc}
- : ${COMPAT2=0}
-@@ -42,8 +42,8 @@
- : ${DIFFFLAGS=-an}
- : ${DIFF_L=1}
- : ${DIFF_SUCCESS=0} ${DIFF_FAILURE=1} ${DIFF_TROUBLE=2}
--: ${ED=/bin/ed}
--: ${SENDMAIL='/usr/lib/sendmail'}
-+: ${ED=/usr/bin/ed}
-+: ${SENDMAIL='/usr/sbin/sendmail'}
- # : ${LDFLAGS=} ${LIBS=} tickles old shell bug
-
- C=$CC $ALL_CFLAGS
-@@ -73,17 +73,6 @@
- ech='echo -n' dots='... '
- esac
-
--$ech 3 $0: testing permissions $dots
--rm -f a.d
--date a.d
--chmod 0 a.d
--{ test -w a.d || cp /dev/null a.d 2/dev/null; } {
-- echo 3 $n$0: This command should not be run with superuser
permissions.
-- exit 1
--}
--echo 3 OK
--rm -f a.d || exit
--
- $ech 3 $0: testing compiler for plausibility $dots
- echo 'main() { return 0; }' a.c
- rm -f a.exe a.out || exit
[arch-commits] Commit in rcs/trunk (PKGBUILD path.patch rcs-5.7.patch)
Date: Friday, June 17, 2011 @ 06:04:08
Author: bisson
Revision: 127635
PKGBUILD cleanup and fresh rebuild
Added:
rcs/trunk/path.patch
(from rev 127462, rcs/trunk/rcs-5.7.patch)
Modified:
rcs/trunk/PKGBUILD
Deleted:
rcs/trunk/rcs-5.7.patch
---+
PKGBUILD | 35 ++---
path.patch| 67
rcs-5.7.patch | 67
3 files changed, 89 insertions(+), 80 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-06-17 10:02:46 UTC (rev 127634)
+++ PKGBUILD2011-06-17 10:04:08 UTC (rev 127635)
@@ -1,22 +1,31 @@
# $Id$
-# Maintainer: dorphell dorph...@archlinux.org
+# Contributor: dorphell dorph...@archlinux.org
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+
pkgname=rcs
pkgver=5.7
-pkgrel=5
-pkgdesc=Revision Control System
+pkgrel=6
+pkgdesc='Revision Control System'
arch=('i686' 'x86_64')
url=http://www.cs.purdue.edu/homes/trinkle/RCS/;
license=('GPL')
-depends=('glibc')
-source=(http://www.cs.purdue.edu/homes/trinkle/RCS/rcs-${pkgver}.tar.Z \
-rcs-5.7.patch)
-md5sums=('423282f0edb353296d9f3498ab683abf' '7ae4b7cb79259ccdf5eee0ab94fe2a2a')
+source=(http://www.cs.purdue.edu/homes/trinkle/RCS/rcs-${pkgver}.tar.Z; \
+'path.patch')
+sha1sums=('976774bda26a7743b8375797f92fbd18e51ac7a2'
+ '0f0be997e5d018e0d638b5f16430423ccb3774be')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i ../rcs-5.7.patch || return 1
- ./configure --prefix=/usr || return 1
- make || return 1
- make prefix=${pkgdir}/usr man1dir=${pkgdir}/usr/share/man/man1 \
-man5dir=${pkgdir}/usr/share/man/man5 install || return 1
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -p1 -i ../path.patch
+ ./configure --prefix=/usr
+ make
}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make install \
+ prefix=${pkgdir}/usr \
+ man1dir=${pkgdir}/usr/share/man/man1 \
+ man5dir=${pkgdir}/usr/share/man/man5 \
+
+}
Copied: rcs/trunk/path.patch (from rev 127462, rcs/trunk/rcs-5.7.patch)
===
--- path.patch (rev 0)
+++ path.patch 2011-06-17 10:04:08 UTC (rev 127635)
@@ -0,0 +1,67 @@
+diff -Naur rcs-5.7-orig/src/conf.heg rcs-5.7/src/conf.heg
+--- rcs-5.7-orig/src/conf.heg 1995-06-02 11:19:00.0 -0700
rcs-5.7/src/conf.heg 2004-11-29 12:41:37.0 -0800
+@@ -210,10 +210,10 @@
+ /* Do struct stat s and t describe the same file? Answer d if unknown. */
+ #define same_file(s,t,d) ((s).st_ino==(t).st_ino (s).st_dev==(t).st_dev)
+ #define has_utimbuf 1 /* Does struct utimbuf work? */
+-#define CO /usr/local/bin/co /* name of 'co' program */
++#define CO /usr/bin/co /* name of 'co' program */
+ #define COMPAT2 0 /* Are version 2 files supported? */
+-#define DIFF /usr/local/bin/diff /* name of 'diff' program */
+-#define DIFF3 /usr/local/bin/diff3 /* name of 'diff3' program */
++#define DIFF /usr/bin/diff /* name of 'diff' program */
++#define DIFF3 /usr/bin/diff3 /* name of 'diff3' program */
+ #define DIFF3_BIN 1 /* Is diff3 user-visible (not the /usr/lib auxiliary)? */
+ #define DIFFFLAGS -an /* Make diff output suitable for RCS. */
+ #define DIFF_L 1 /* Does diff -L work? */
+@@ -221,7 +221,7 @@
+ #define DIFF_FAILURE 1 /* DIFF status if differences are found */
+ #define DIFF_TROUBLE 2 /* DIFF status if trouble */
+ #define ED /bin/ed /* name of 'ed' program (used only if !DIFF3_BIN) */
+-#define MERGE /usr/local/bin/merge /* name of 'merge' program */
++#define MERGE /usr/bin/merge /* name of 'merge' program */
+ #define TMPDIR /tmp /* default directory for temporary files */
+ #define SLASH '/' /* principal filename separator */
+ #define SLASHes '/' /* `case SLASHes:' labels all filename separators */
+diff -Naur rcs-5.7-orig/src/conf.sh rcs-5.7/src/conf.sh
+--- rcs-5.7-orig/src/conf.sh 1995-06-15 23:19:24.0 -0700
rcs-5.7/src/conf.sh2004-11-29 12:42:28.0 -0800
+@@ -32,7 +32,7 @@
+ # and can be inspected for clues otherwise.
+
+ # The Makefile overrides the following defaults.
+-: ${RCSPREFIX=/usr/local/bin/}
++: ${RCSPREFIX=/usr/bin/}
+ : ${ALL_CFLAGS=-Dhas_conf_h}
+ : ${CC=cc}
+ : ${COMPAT2=0}
+@@ -42,8 +42,8 @@
+ : ${DIFFFLAGS=-an}
+ : ${DIFF_L=1}
+ : ${DIFF_SUCCESS=0} ${DIFF_FAILURE=1} ${DIFF_TROUBLE=2}
+-: ${ED=/bin/ed}
+-: ${SENDMAIL='/usr/lib/sendmail'}
++: ${ED=/usr/bin/ed}
++: ${SENDMAIL='/usr/sbin/sendmail'}
+ # : ${LDFLAGS=} ${LIBS=} tickles old shell bug
+
+ C=$CC $ALL_CFLAGS
+@@ -73,17 +73,6 @@
+ ech='echo -n' dots='... '
+ esac
+
+-$ech 3 $0: testing permissions $dots
+-rm -f a.d
+-date a.d
+-chmod 0 a.d
+-{ test -w a.d || cp /dev/null a.d 2/dev/null; } {
+- echo 3 $n$0: This command should not be run with superuser
