[csw-devel] SF.net SVN: gar:[7742] csw/mgar/pkg/qt4/trunk

[rthurner at users.sourceforge.net]

Revision: 7742
          http://gar.svn.sourceforge.net/gar/?rev=7742&view=rev
Author:   rthurner
Date:     2009-12-24 16:36:19 +0000 (Thu, 24 Dec 2009)

Log Message:
-----------
qt4 - upgrade to gar-v2, first try. also upgrade to qt-4.6.0

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

Modified: csw/mgar/pkg/qt4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/qt4/trunk/Makefile	2009-12-24 15:41:02 UTC (rev 7741)
+++ csw/mgar/pkg/qt4/trunk/Makefile	2009-12-24 16:36:19 UTC (rev 7742)
@@ -1,33 +1,37 @@
 GARNAME = qt4
-GARVERSION = 4.3.3
+GARVERSION = 4.6.0
 CATEGORIES = lib
 
 DESCRIPTION = TrollTech C++ application framework
 define BLURB
-  Qt is a comprehensive cross-platform C++ application framework. Qt 4.3
-  introduces new features and many improvements over the 3.x series. See
-  http://doc.trolltech.com/4.3/qt4-intro.html for details.
+  Qt is a comprehensive cross-platform C++ application framework. Qt 4
+  introduces new features and many improvements over the 3.x series.
 endef
 
-MASTER_SITES = ftp://ftp.trolltech.com/qt/source/
-DISTFILES    = qt-x11-opensource-src-$(GARVERSION).tar.gz
-DISTFILES   += $(call admfiles,CSWqt4,depend prototype-sparc prototype-i386)
-DISTFILES   += $(call admfiles,CSWqt4-devel,depend prototype-sparc prototype-i386)
-DISTFILES   += $(call admfiles,CSWqt4-docs,prototype)
+MASTER_SITES = http://get.qt.nokia.com/qt/source/
+DISTFILES    = qt-everywhere-opensource-src-$(GARVERSION).tar.gz
+#DISTFILES   += $(call admfiles,CSWqt4,depend prototype-sparc prototype-i386)
+#DISTFILES   += $(call admfiles,CSWqt4-devel,depend prototype-sparc prototype-i386)
+#DISTFILES   += $(call admfiles,CSWqt4-docs,prototype)
 
 # We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = qt-x11-opensource-src-(\d+(?:\.\d+)*).tar.gz
+UFILES_REGEX = qt-everywhere-opensource-src-(\d+(?:\.\d+)*).tar.gz
 
-ifndef DO64
-PLATFORM=solaris-cc
-else
-PLATFORM=solaris-cc-64
-endif
+# The PACKAGES variable tell GAR which packages to build
+#PACKAGES  = CSWqt4 CSWqt4-devel
 
-WORKSRC = $(WORKDIR)/qt-x11-opensource-src-$(GARVERSION)
+WORKSRC = $(WORKDIR)/qt-everywhere-opensource-src-$(GARVERSION)
+REQUIRED_PKGS_CSWqt4 = CSWfconfig CSWftype2 CSWggettext CSWglib2 CSWjpeg CSWlibxrender CSWpng CSWtiff CSWzlib 
+#REQUIRED_PKGS_CSWqt4-devel = CSWqt4
 
-PREREQUISITE_PKGS = CSWpkgconfig CSWfconfig CSWlibdbusdev
+#ifndef DO64
+#PLATFORM=solaris-cc
+#else
+#PLATFORM=solaris-cc-64
+#endif
 
+#PREREQUISITE_PKGS = CSWpkgconfig CSWfconfig CSWlibdbusdev
+
 CONFIGURE_ARGS = -prefix $(prefix) \
 			-bindir $(bindir) \
 			-libdir $(libdir) \
@@ -41,13 +45,13 @@
 			-demosdir $(sharedstatedir)/qt4/demos \
 			-I$(includedir) \
 			-L$(libdir) \
-			-platform $(PLATFORM) \
 			-confirm-license \
+			-opensource \
 			-verbose
 
 # SKIPTEST = 1
 
-INSTALL_ENV += INSTALL_ROOT=$(DESTDIR)
+#INSTALL_ENV += INSTALL_ROOT=$(DESTDIR)
 
 SRC_CLEAN_TARGET = confclean
 

Modified: csw/mgar/pkg/qt4/trunk/checksums
===================================================================
--- csw/mgar/pkg/qt4/trunk/checksums	2009-12-24 15:41:02 UTC (rev 7741)
+++ csw/mgar/pkg/qt4/trunk/checksums	2009-12-24 16:36:19 UTC (rev 7742)
@@ -1,11 +1 @@
-19678fe35170559cd6a6fa531c57799c  download/qt-x11-opensource-src-4.3.3.tar.gz
-1971c2c7513b65cd7a8d33b9a637a908  download/CSWqt4.gspec
-abca6ced15fc6cc1f47ca35ebe1af99b  download/CSWqt4.depend
-46107c5b0ec8d00a3a19008f251e98f3  download/CSWqt4.prototype-sparc
-bc95d6a21e682b5b410919a192dd4648  download/CSWqt4.prototype-i386
-c7ea9cb16a10cd68abf79b0e678fd6e1  download/CSWqt4-devel.gspec
-11a7ff5c7eed0535b6862f87652543c6  download/CSWqt4-devel.depend
-bd96ed7a6599ea24019d3ad5289d1f45  download/CSWqt4-devel.prototype-sparc
-9c5efb8ab82e7c54a74d15e80497d999  download/CSWqt4-devel.prototype-i386
-a4448803a657c547f6423d6c54f78540  download/CSWqt4-docs.gspec
-8124363ef956332860628abab54504d4  download/CSWqt4-docs.prototype
+2a7b5126f2450d8525af355fc4c12ad6  qt-everywhere-opensource-src-4.6.0.tar.gz


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