[csw-devel] SF.net SVN: gar:[13610] csw/mgar/pkg/vorbistools/trunk

[dmichelsen at users.sourceforge.net]

Revision: 13610
          http://gar.svn.sourceforge.net/gar/?rev=13610&view=rev
Author:   dmichelsen
Date:     2011-03-06 21:41:59 +0000 (Sun, 06 Mar 2011)

Log Message:
-----------
vorbistools: Update to 1.4.0

Modified Paths:
--------------
    csw/mgar/pkg/vorbistools/trunk/Makefile
    csw/mgar/pkg/vorbistools/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/vorbistools/trunk/files/fixme.sh

Modified: csw/mgar/pkg/vorbistools/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vorbistools/trunk/Makefile	2011-03-06 20:46:02 UTC (rev 13609)
+++ csw/mgar/pkg/vorbistools/trunk/Makefile	2011-03-06 21:41:59 UTC (rev 13610)
@@ -1,5 +1,5 @@
 NAME = vorbistools
-VERSION = 1.2.0
+VERSION = 1.4.0
 CATEGORIES = utils
 
 DESCRIPTION = Vorbis audio tools
@@ -13,34 +13,34 @@
 DISTNAME = vorbis-tools-$(VERSION)
 MASTER_SITES = http://downloads.xiph.org/releases/vorbis/
 DISTFILES = $(DISTNAME).tar.gz
-DISTFILES += fixme.sh
 
-SPKG_SOURCEURL = http://www.vorbis.com
+VENDOR_URL = http://www.vorbis.com
 
 PACKAGES = CSWvtools
 CATALOGNAME = vorbistools
 
 BUILD_DEP_PKGS = CSWcurldevel
 
-RUNTIME_DEP_PKGS = CSWcurlrt CSWflac CSWggettextrt CSWiconv CSWlibao
-RUNTIME_DEP_PKGS += CSWlibogg CSWspeex CSWsunmath CSWvorbis
+RUNTIME_DEP_PKGS += CSWcurlrt
+RUNTIME_DEP_PKGS += CSWflac
+RUNTIME_DEP_PKGS += CSWggettextrt
+RUNTIME_DEP_PKGS += CSWiconv
+RUNTIME_DEP_PKGS += CSWlibao
+RUNTIME_DEP_PKGS += CSWlibogg
+RUNTIME_DEP_PKGS += CSWspeex
+RUNTIME_DEP_PKGS += CSWsunmath
+RUNTIME_DEP_PKGS += CSWvorbis
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = (\d+(?:\.\d+)*)
 
+EXTRA_LINKER_FLAGS += -lrt
+
 BUILD64 = 1
 EXTRA_BUILD_ISAS = sparcv8plus+vis pentium_pro
 
-EXTRA_LINKER_FLAGS += -lrt
-
 CONFIGURE_ARGS = $(DIRPATHS)
 
 TEST_TARGET = check
 
 include gar/category.mk
-
-post-configure-modulated:
-	@echo " ==> Fixing libtool files"
-	@$(DOWNLOADDIR)/fixme.sh $(WORKSRC)
-	@$(MAKECOOKIE)
-

Modified: csw/mgar/pkg/vorbistools/trunk/checksums
===================================================================
--- csw/mgar/pkg/vorbistools/trunk/checksums	2011-03-06 20:46:02 UTC (rev 13609)
+++ csw/mgar/pkg/vorbistools/trunk/checksums	2011-03-06 21:41:59 UTC (rev 13610)
@@ -1,2 +1 @@
-34f5b20f6caf282b2533784fbb1b4395  download/fixme.sh
-df976d24e51ef3d87cd462edf747bf9a  download/vorbis-tools-1.2.0.tar.gz
+567e0fb8d321b2cd7124f8208b8b90e6  vorbis-tools-1.4.0.tar.gz

Deleted: csw/mgar/pkg/vorbistools/trunk/files/fixme.sh
===================================================================
--- csw/mgar/pkg/vorbistools/trunk/files/fixme.sh	2011-03-06 20:46:02 UTC (rev 13609)
+++ csw/mgar/pkg/vorbistools/trunk/files/fixme.sh	2011-03-06 21:41:59 UTC (rev 13610)
@@ -1,51 +0,0 @@
-#!/bin/bash
-####################################################
-#
-#  fixme.sh
-#  Intended to remove the use of libtool's 
-#  pseudo-libraries for opencsw builds.
-#
-#  Author: Mike Watters  mwatters_at_opencsw.org
-#  Initial Version: 0.1
-#
-####################################################
-
-umask 0022
-PATH=/opt/csw/bin
-
-if [ $# -ne 1 ]; then
-    gecho "USAGE: $(basename $0) WORKSRC"
-    exit 1
-fi
-BASEPATH=$1
-
-## Fix Makefiles
-for mk in $(gfind ${BASEPATH} -name Makefile -print); do
-    LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \
-        gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/")
-    
-    for file in ${LT_FILES}; do
-        LIB_NAME=$(ggrep 'dlname=' ${file} | \
-            gsed -e "s/.*'\(.*\)'/\1/" \
-                -e "s/^lib//" \
-                -e "s/\.so.*$//")
-        fixpath=$(gecho $file |gsed 's/\//\\\//g')
-        gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new
-        gmv Makefile.new ${mk}
-        gchmod +x ${mk}
-    done
-done
-
-## Fix libtool Script
-for lt in $(gfind ${BASEPATH} -name libtool -print); do
-    gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new
-    gmv ${lt}.new ${lt}
-    gchmod +x ${lt}
-done
-
-for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do
-    gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new
-    gmv ${LTMAIN}.new ${LTMAIN}
-    gchmod +x ${LTMAIN}
-done
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.