[csw-devel] SF.net SVN: gar:[11158] csw/mgar/pkg/libunique/trunk/Makefile

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Tue Oct 5 12:56:48 CEST 2010


Revision: 11158
          http://gar.svn.sourceforge.net/gar/?rev=11158&view=rev
Author:   dmichelsen
Date:     2010-10-05 10:56:48 +0000 (Tue, 05 Oct 2010)

Log Message:
-----------
libunique: Remove doc-package and go back to SUNW X11

Modified Paths:
--------------
    csw/mgar/pkg/libunique/trunk/Makefile

Modified: csw/mgar/pkg/libunique/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libunique/trunk/Makefile	2010-10-05 10:33:39 UTC (rev 11157)
+++ csw/mgar/pkg/libunique/trunk/Makefile	2010-10-05 10:56:48 UTC (rev 11158)
@@ -17,55 +17,55 @@
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
 DISTNAME  = $(GARNAME)-$(GARVERSION)
 
-PACKAGES = CSWlibunique CSWlibuniquedevel CSWlibuniquedoc
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
+
+PACKAGES = CSWlibunique CSWlibuniquedevel
 CATALOGNAME_CSWlibunique = libunique
 CATALOGNAME_CSWlibuniquedevel = libunique_devel
-CATALOGNAME_CSWlibuniquedoc = libunique_doc
 
 SPKG_DESC_CSWlibunique += Library for writing single instance application
 SPKG_DESC_CSWlibuniquedevel += Library for writing single instance application - developer package
-SPKG_DESC_CSWlibuniquedoc += Library for writing single instance application - documentation
 
 RUNTIME_DEP_PKGS_CSWlibunique += CSWfconfig CSWftype2 CSWggettextrt CSWglib2
-RUNTIME_DEP_PKGS_CSWlibunique += CSWgtk2 CSWlibatk CSWlibcairo CSWlibx11 CSWpango
-RUNTIME_DEP_PKGS_CSWlibunique += CSWdbusglib CSWlibdbus CSWlibxext
-RUNTIME_DEP_PKGS_CSWlibuniquedevel += CSWlibunique
-RUNTIME_DEP_PKGS_CSWlibuniquedoc += CSWlibunique
+RUNTIME_DEP_PKGS_CSWlibunique += CSWgtk2 CSWlibatk CSWlibcairo CSWpango
+RUNTIME_DEP_PKGS_CSWlibunique += CSWdbusglib CSWlibdbus
+RUNTIME_DEP_PKGS_CSWlibuniquedevel += CSWlibunique CSWglib2devel CSWgtk2devel CSWlibatkdevel CSWlibcairodevel CSWpangodevel
 
 BUILD_DEP_PKGS += CSWdbusglibdev
 
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
-
 SPKG_SOURCEURL = http://live.gnome.org/LibUnique
 
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
-EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+NOISAEXEC = 1
+NOISALIST = 1
 
-#NOISAEXEC = 1
-#NOISALIST = 1
-# libdbus not 64-bit yet
+# This needs to be fixed first before we can build 64 bit:
+#   https://www.opencsw.org/mantis/view.php?id=4565
 #BUILD64 = 1
 
-PKGFILES_CSWlibuniquedevel = $(PKGFILES_DEVEL)
-PKGFILES_CSWlibuniquedoc = $(sharedstatedir)/gtk-doc/.*
+EXTRA_LINKER_FLAGS = -lsocket -lnsl
 
-ARCHALL_CSWlibuniquedoc = 1
-
-LIBS = -lsocket -lnsl
-export LIBS
-
 STRIP_LIBTOOL = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-static=no
 CONFIGURE_ARGS += --enable-gtk-doc
-CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
-CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+# This needs a newer GTK, 2.18.x does not have it, reenable when GTK has been updated
+CONFIGURE_ARGS += --enable-introspection=no
 
 TEST_TARGET = check
 
+ARCHALL_CSWlibuniquedoc = 1
+
+PKGFILES_CSWlibuniquedevel  = $(PKGFILES_DEVEL)
+PKGFILES_CSWlibuniquedevel += $(sharedstatedir)/gtk-doc/.*
+
+CHECKPKG_OVERRIDES_CSWlibuniquedevel += surplus-dependency|CSWlibunique
+CHECKPKG_OVERRIDES_CSWlibuniquedevel += surplus-dependency|CSWlibcairodevel
+CHECKPKG_OVERRIDES_CSWlibuniquedevel += surplus-dependency|CSWpangodevel
+CHECKPKG_OVERRIDES_CSWlibuniquedevel += surplus-dependency|CSWlibatkdevel
+CHECKPKG_OVERRIDES_CSWlibuniquedevel += surplus-dependency|CSWglib2devel
+CHECKPKG_OVERRIDES_CSWlibuniquedevel += surplus-dependency|CSWgtk2devel
+
 include gar/category.mk
 
 PATH := /opt/csw/gnu:$(PATH)


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