[csw-devel] SF.net SVN: gar:[14588] csw/mgar/pkg/liboggz/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Tue May 17 14:29:38 CEST 2011


Revision: 14588
          http://gar.svn.sourceforge.net/gar/?rev=14588&view=rev
Author:   dmichelsen
Date:     2011-05-17 12:29:38 +0000 (Tue, 17 May 2011)

Log Message:
-----------
liboggz: Update to 1.1.1, split packages and update to new standards

Modified Paths:
--------------
    csw/mgar/pkg/liboggz/trunk/Makefile
    csw/mgar/pkg/liboggz/trunk/checksums
    csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch

Removed Paths:
-------------
    csw/mgar/pkg/liboggz/trunk/files/0002-Add-getopt.h.patch

Modified: csw/mgar/pkg/liboggz/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liboggz/trunk/Makefile	2011-05-17 08:22:46 UTC (rev 14587)
+++ csw/mgar/pkg/liboggz/trunk/Makefile	2011-05-17 12:29:38 UTC (rev 14588)
@@ -1,5 +1,5 @@
 NAME = liboggz
-VERSION = 1.1.0
+VERSION = 1.1.1
 CATEGORIES = lib
 
 DESCRIPTION = A commandline tool for manipulating Ogg files
@@ -14,27 +14,36 @@
 endef
 
 MASTER_SITES = http://downloads.xiph.org/releases/liboggz/
-DISTFILES = $(NAME)-$(VERSION).tar.gz
+DISTFILES = $(DISTNAME).tar.gz
 PATCHFILES = 0001-Remove-linker-version.patch
-PATCHFILES += 0002-Add-getopt.h.patch
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+VENDOR_URL = http://www.xiph.org/oggz/
 
 BUILD_DEP_PKGS = CSWdoxygen
-RUNTIME_DEP_PKGS = CSWlibogg
 
+PACKAGES += CSWliboggz2
+SPKG_DESC_CSWliboggz2 = Ogg file manipulatin library, liboggz.so.2
+PKGFILES_CSWliboggz2 = $(call pkgfiles_lib,liboggz.so.2)
+RUNTIME_DEP_PKGS_CSWliboggz2 += CSWlibogg0
+
+PACKAGES += CSWliboggz-dev
+SPKG_DESC_CSWliboggz-dev = Development files for liboggz.so.2
+PKGFILES_CSWliboggz-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWliboggz-dev += $(docdir)/.*
+RUNTIME_DEP_PKGS_CSWliboggz-dev += CSWliboggz2
+
+PACKAGES += CSWoggz
+SPKG_DESC_CSWoggz = Commandline tools for manipulating Ogg files
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWoggz += CSWlibogg0
+RUNTIME_DEP_PKGS_CSWoggz += CSWliboggz2
+OBSOLETED_BY_CSWoggz = CSWliboggz
+CATALOGNAME_CSWliboggz = liboggz_stub
+
 BUILD64 = 1
-NOISAEXEC = 1
-CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
+# This is just docs
+CHECKPKG_OVERRIDES_CSWliboggz-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/liboggz/html/group__install.html
+CHECKPKG_OVERRIDES_CSWliboggz-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/liboggz/latex/group__install.tex
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 include gar/category.mk
-
-# Solaris 10 does have getopt.h which interferes with the shipped one included first.
-post-configure-isa-amd64:
-	rm -f $(WORKSRC)/include/getopt.h
-	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/liboggz/trunk/checksums
===================================================================
--- csw/mgar/pkg/liboggz/trunk/checksums	2011-05-17 08:22:46 UTC (rev 14587)
+++ csw/mgar/pkg/liboggz/trunk/checksums	2011-05-17 12:29:38 UTC (rev 14588)
@@ -1,3 +1 @@
-2bcd76f053e973f82df1593400ca94fb  0001-Remove-linker-version.patch
-008aac5337ca7e23490927baa4a38589  0002-Add-getopt.h.patch
-f97f1d57820a9fc1d080409cf203b38a  liboggz-1.1.0.tar.gz
+3649a657f8e368b881ba8b1b57381ff7  liboggz-1.1.1.tar.gz

Modified: csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch
===================================================================
--- csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch	2011-05-17 08:22:46 UTC (rev 14587)
+++ csw/mgar/pkg/liboggz/trunk/files/0001-Remove-linker-version.patch	2011-05-17 12:29:38 UTC (rev 14588)
@@ -1,23 +1,22 @@
-From 98520890bdf48d718490927f04197c48a1958647 Mon Sep 17 00:00:00 2001
-From: dam <dam at lcsw.(none)>
-Date: Mon, 9 Nov 2009 03:55:19 +0100
+From ded5e4cdfd4ee2c3091f159db81425e4ae442ab7 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 17 May 2011 14:02:20 +0200
 Subject: [PATCH] Remove linker version
 
 ---
- configure    |    8 --------
- configure.ac |   12 ------------
- 2 files changed, 0 insertions(+), 20 deletions(-)
+ configure |    8 --------
+ 1 files changed, 0 insertions(+), 8 deletions(-)
 
 diff --git a/configure b/configure
-index 9342074..cafccae 100755
+index ae375d5..b28749d 100755
 --- a/configure
 +++ b/configure
-@@ -15629,14 +15629,6 @@ if test "x${ac_enable_gcc_werror}" = xyes ; then
+@@ -12747,14 +12747,6 @@ if test "x${ac_enable_gcc_werror}" = xyes ; then
  fi
  
  
 -case "$target_os" in
--  linux* | solaris*|k*bsd*-gnu*|gnu-*)
+-  linux* | solaris*|k*bsd*-gnu*|gnu*)
 -    SHLIB_VERSION_ARG="-Wl,--version-script=Version_script"
 -    ;;
 -  *)
@@ -28,5 +27,5 @@
  
  
 -- 
-1.6.3.2
+1.7.3.2
 

Deleted: csw/mgar/pkg/liboggz/trunk/files/0002-Add-getopt.h.patch
===================================================================
--- csw/mgar/pkg/liboggz/trunk/files/0002-Add-getopt.h.patch	2011-05-17 08:22:46 UTC (rev 14587)
+++ csw/mgar/pkg/liboggz/trunk/files/0002-Add-getopt.h.patch	2011-05-17 12:29:38 UTC (rev 14588)
@@ -1,38 +0,0 @@
-From e404bd5d314bbd97a2d4579607679667bc4d099f Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Tue, 24 Nov 2009 22:12:30 +0100
-Subject: [PATCH] Add getopt.h
-
----
- include/getopt.h |   19 +++++++++++++++++++
- 1 files changed, 19 insertions(+), 0 deletions(-)
- create mode 100644 include/getopt.h
-
-diff --git a/include/getopt.h b/include/getopt.h
-new file mode 100644
-index 0000000..0e98fed
---- /dev/null
-+++ b/include/getopt.h
-@@ -0,0 +1,19 @@
-+/**
-+ * @file getopt.h
-+ * @ingroup wbxml2xml_tool
-+ * @ingroup xml2wbxml_tool
-+ *
-+ * @author Kannel Team (http://www.kannel.org/)
-+ *
-+ * @brief getopt() implementation
-+ */
-+
-+#ifndef WBXML_GETOPT_H
-+#define WBXML_GETOPT_H
-+
-+extern int opterr;
-+extern int optind;
-+extern int optopt;
-+extern char *optarg;
-+
-+#endif
--- 
-1.6.5.1
-


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