[arch-commits] Commit in xorg-xman/trunk (PKGBUILD git-fixes.patch)

Jan de Groot jgc at archlinux.org
Sun Nov 14 17:23:29 UTC 2010


    Date: Sunday, November 14, 2010 @ 12:23:29
  Author: jgc
Revision: 99422

upgpkg: xorg-xman 1.1.1-1
Update to 1.1.1

Modified:
  xorg-xman/trunk/PKGBUILD
Deleted:
  xorg-xman/trunk/git-fixes.patch

-----------------+
 PKGBUILD        |   10 --
 git-fixes.patch |  247 ------------------------------------------------------
 2 files changed, 3 insertions(+), 254 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-14 17:22:18 UTC (rev 99421)
+++ PKGBUILD	2010-11-14 17:23:29 UTC (rev 99422)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xorg-xman
-pkgver=1.1.0
+pkgver=1.1.1
 pkgrel=1
 pkgdesc="Unix manual page viewer"
 arch=(i686 x86_64)
@@ -10,15 +10,11 @@
 license=('custom')
 depends=('libxaw' 'libxt')
 makedepends=('xorg-util-macros' 'xproto' 'libxmu')
-source=(http://xorg.freedesktop.org/archive/individual/app/xman-${pkgver}.tar.bz2
-        git-fixes.patch)
-sha1sums=('645d8910f0febd0c4f00fee964221883a12d4af3'
-          '20b72da444fb34c95e010c3c2cd9b990a3f8fd98')
+source=(http://xorg.freedesktop.org/archive/individual/app/xman-${pkgver}.tar.bz2)
+sha1sums=('c8e1170e837da4bc280ee907030b3f9245608ef2')
 
 build() {
   cd "${srcdir}/xman-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-  autoreconf
   ./configure --prefix=/usr
   make
   make DESTDIR="${pkgdir}" install

Deleted: git-fixes.patch
===================================================================
--- git-fixes.patch	2010-11-14 17:22:18 UTC (rev 99421)
+++ git-fixes.patch	2010-11-14 17:23:29 UTC (rev 99422)
@@ -1,247 +0,0 @@
-diff --git a/AUTHORS b/AUTHORS
-deleted file mode 100644
-index e69de29..0000000
-diff --git a/COPYING b/COPYING
-index 7f33cbf..f31ebf9 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,12 +1,47 @@
--This is a stub file.  This package has not yet had its complete licensing
--information compiled.  Please see the individual source files for details on
--your rights to use and modify this software.
-+Copyright (c) 1987, 1988, 1989, 1991  X Consortium
- 
--Please submit updated COPYING files to the Xorg bugzilla:
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
- 
--https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-+The above copyright notice and this permission notice shall be included
-+in all copies or substantial portions of the Software.
- 
--All licensing questions regarding this software should be directed at the
--Xorg mailing list:
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+OTHER DEALINGS IN THE SOFTWARE.
- 
--http://lists.freedesktop.org/mailman/listinfo/xorg
-+Except as contained in this notice, the name of the X Consortium shall
-+not be used in advertising or otherwise to promote the sale, use or
-+other dealings in this Software without prior written authorization
-+from the X Consortium.
-+
-+Copyright 2004 Roland Mainz <roland.mainz at nrubsig.org>
-+
-+Permission to use, copy, modify, distribute, and sell this software and its
-+documentation for any purpose is hereby granted without fee, provided that
-+the above copyright notice appear in all copies and that both that
-+copyright notice and this permission notice appear in supporting
-+documentation.
-+
-+The above copyright notice and this permission notice shall be included in
-+all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+Except as contained in this notice, the name of The Open Group shall not be
-+used in advertising or otherwise to promote the sale, use or other dealings
-+in this Software without prior written authorization from The Open Group.
-diff --git a/INSTALL b/INSTALL
-deleted file mode 100644
-index e69de29..0000000
-diff --git a/Makefile.am b/Makefile.am
-index 91ffb81..e917b83 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -48,8 +48,7 @@ xman_SOURCES =	\
-         search.c \
-         tkfuncs.c \
-         vendor.c \
--        vendor.h \
--        version.h
-+        vendor.h
- 
- appman_PRE = \
-         xman.man
-@@ -67,6 +66,7 @@ appmandir = $(APP_MAN_DIR)
- appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
- 
- EXTRA_DIST = $(appman_PRE)
-+MAINTAINERCLEANFILES = ChangeLog INSTALL
- CLEANFILES = $(appman_DATA)
- 
- SED = sed
-@@ -93,12 +93,13 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
- .man.$(APP_MAN_SUFFIX):
- 	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
- 
--EXTRA_DIST += ChangeLog
--MAINTAINERCLEANFILES = ChangeLog
- 
--.PHONY: ChangeLog
-+.PHONY: ChangeLog INSTALL
-+
-+INSTALL:
-+	$(INSTALL_CMD)
- 
- ChangeLog:
- 	$(CHANGELOG_CMD)
- 
--dist-hook: ChangeLog
-+dist-hook: ChangeLog INSTALL
-diff --git a/NEWS b/NEWS
-deleted file mode 100644
-index e69de29..0000000
-diff --git a/configure.ac b/configure.ac
-index 619b033..34270ff 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,13 +23,14 @@ dnl Process this file with autoconf to create configure.
- 
- AC_PREREQ([2.57])
- AC_INIT(xman, [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xman)
--AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_INIT_AUTOMAKE([foreign dist-bzip2])
- AM_MAINTAINER_MODE
- 
- # Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
- m4_ifndef([XORG_MACROS_VERSION],
- 	  [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
- XORG_MACROS_VERSION(1.3)
-+XORG_DEFAULT_OPTIONS
- 
- AM_CONFIG_HEADER(config.h)
- 
-@@ -37,8 +38,6 @@ AC_PROG_CC
- AC_PROG_INSTALL
- AC_CANONICAL_HOST
- 
--XORG_DEFAULT_OPTIONS
--
- AC_CHECK_FUNC([mkstemp], 
-    AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the "mkstemp" function.]))
- 
-@@ -67,8 +66,8 @@ if test x$LOCALMANPATH != x; then
- 	[Default local man page search path (default: none)])
- fi
- 
--# Checks for pkg-config packages
--PKG_CHECK_MODULES(XMAN, xaw7)
-+# Obtain compiler/linker options from depedencies
-+PKG_CHECK_MODULES(XMAN, xproto xaw7 xmu xt)
- 
- AC_ARG_WITH(manconfig,
-         AC_HELP_STRING([--with-manconfig=<filename>],
-@@ -130,15 +129,17 @@ if test x$MANCONF != x ; then
- 	    AC_MSG_ERROR([Could not determine man page file config format.])
-     esac
- fi
--AC_SUBST(XMAN_CFLAGS)
--AC_SUBST(XMAN_LIBS)
- 
- PKG_CHECK_MODULES(APPDEFS, xt)
--xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
-+xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
- AC_ARG_WITH(appdefaultdir,
- 	AC_HELP_STRING([--with-appdefaultdir=<pathname>],
- 	  [specify directory for app-defaults files (default is autodetected)]),
- 	[appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"])
- AC_SUBST(appdefaultdir)
- 
-+if test "x$RELEASE_VERSION" != "x"; then
-+	AC_DEFINE_UNQUOTED([RELEASE_VERSION], "$RELEASE_VERSION", 
-+		[Release version string if set])
-+fi
- AC_OUTPUT([Makefile])
-diff --git a/handler.c b/handler.c
-index 497a768..cf2d83a 100644
---- a/handler.c
-+++ b/handler.c
-@@ -35,6 +35,9 @@ from the X Consortium.
-  * Author:    Chris D. Peterson, MIT Project Athena
-  * Created:   October 29, 1987
-  */
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -45,6 +48,12 @@ from the X Consortium.
- #include "print.h"
- #endif /* INCLUDE_XPRINT_SUPPORT */
- 
-+#ifdef RELEASE_VERSION
-+#define XMAN_VERSION "Xman Version " PACKAGE_VERSION " - X11R" RELEASE_VERSION
-+#else
-+#define XMAN_VERSION "Xman Version " PACKAGE_VERSION
-+#endif
-+
- static void PutUpManpage(ManpageGlobals * man_globals, FILE * file);
- static void ToggleBothShownState(ManpageGlobals * man_globals);
- 
-diff --git a/man.h b/man.h
-index f7f04b4..73b17bb 100644
---- a/man.h
-+++ b/man.h
-@@ -70,7 +70,6 @@ from the X Consortium.
- 
- #include "ScrollByL.h"
- 
--#include "version.h"
- #include "defs.h"
- 
- /* Turn a NULL pointer string into an empty string */
-diff --git a/version.h b/version.h
-deleted file mode 100644
-index f10367d..0000000
---- a/version.h
-+++ /dev/null
-@@ -1,32 +0,0 @@
--/* $XConsortium: version.h,v 1.11 94/04/17 20:44:00 gildea Exp $ */
--/*
--
--Copyright (c) 1987, 1988  X Consortium
--
--Permission is hereby granted, free of charge, to any person obtaining
--a copy of this software and associated documentation files (the
--"Software"), to deal in the Software without restriction, including
--without limitation the rights to use, copy, modify, merge, publish,
--distribute, sublicense, and/or sell copies of the Software, and to
--permit persons to whom the Software is furnished to do so, subject to
--the following conditions:
--
--The above copyright notice and this permission notice shall be included
--in all copies or substantial portions of the Software.
--
--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
--OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
--IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
--OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
--ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
--OTHER DEALINGS IN THE SOFTWARE.
--
--Except as contained in this notice, the name of the X Consortium shall
--not be used in advertising or otherwise to promote the sale, use or
--other dealings in this Software without prior written authorization
--from the X Consortium.
--
--*/
--
--#define XMAN_VERSION "Xman Version 3.2.0 - X11R7.0"




More information about the arch-commits mailing list