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

[Maciej (Matchek) Bliziński]

Hi Carsten,

Overall, it looks like you've submitted the change without testing if the
build works and produces the output you want. If you can, try to build and
review first, and submit second, so that you don't submit things like silly
typos.

More comments below.

2012/9/21 <cgrzemba at users.sourceforge.net>

> Revision: 19258
>           http://gar.svn.sourceforge.net/gar/?rev=19258&view=rev
> Author:   cgrzemba
> Date:     2012-09-21 10:53:43 +0000 (Fri, 21 Sep 2012)
> Log Message:
> -----------
> libsoup2/trunk: rework packaging
>
> Modified Paths:
> --------------
>     csw/mgar/pkg/libsoup2/trunk/Makefile
>
> Modified: csw/mgar/pkg/libsoup2/trunk/Makefile
> ===================================================================
> --- csw/mgar/pkg/libsoup2/trunk/Makefile        2012-09-21 10:21:43 UTC
> (rev 19257)
> +++ csw/mgar/pkg/libsoup2/trunk/Makefile        2012-09-21 10:53:43 UTC
> (rev 19258)
> @@ -10,34 +10,56 @@
>  MASTER_SITES = $(GNOME_MIRROR)
>  DISTFILES  = $(NAME)-$(VERSION).tar.bz2
>
> +PACKAGING_PLATFORMS = Solaris10-sparc Solaris10-i386
>
>  # We define upstream file regex so we can be notifed of new upstream
> software release
>  UFILES_REGEX = -(\d+(?:\.\d+)*).tar.bz2
>

The above line is not necessary any more, there's a function that
constructs these regexes on the fly.


>
> -PACKAGES  = CSWlibsoup2
> -PACKAGES  += CSWlibsoup2dev
> -SPKG_DESC_CSWlibsoup2 = HTTP client/server library for GNOME
> -SPKG_DESC_CSWlibsoup2dev = HTTP client/server library for GNOME, dev files
> +PACKAGES += CSWlibsoup2-4-1
> +CATALOGNAME_CSWlibsoup2-4-1 = libsoup2_4_1
> +PKGFILES_CSWlibsoup2-4-1 += $(call
> baseisadirs,$(libdir),libsoup-2\.4\.so\.1\.3\.0)
> +PKGFILES_CSWlibsoup2-4-1 += $(call
> baseisadirs,$(libdir),libsoup-2\.4\.so\.1(\.\d+)*)
>

You only need one line of the two lines above. Checkpkg shows both, and
it's your job to choose which one you really need. I'd say, throw away the
first one.


> +SPKG_DESC_CSWlibsoup2-4-1 += $(DESCRIPTION), libsoup-2.4.so.1
> +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibgthread2-0-0
> +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibgmodule2-0-0
> +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibz1
> +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibintl8
> +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibgobject2-0-0
> +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibglib2-0-0
> +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibxml2-2
> +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibgio2-0-0
> +OBSOLTED_BY_CSWlibsoup2-4-1 = CSWlibsoup
>

Typo, should be OBSOLETED_BY.


>
> -RUNTIME_DEP_PKGS_CSWlibsoup2 = CSWgconf2
> -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWgcrypt
> -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWggettextrt
> -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWglib2
> -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWgnutls
> -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWgpgerr
> -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWlibproxy
> -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWlibxml2
> -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWsqlite3rt
> +PACKAGES += CSWlibsoup-gnome2-4-1
> +CATALOGNAME_CSWlibsoup-gnome2-4-1 = libsoup_gnome2_4_1
>

The CATALOGNAME line is not necessary, gar guesses that dashes should be
substituted by underscores.


> +PKGFILES_CSWlibsoup-gnome2-4-1 += $(call
> baseisadirs,$(libdir),libsoup-gnome-2\.4\.so\.1\.3\.0)
> +PKGFILES_CSWlibsoup-gnome2-4-1 += $(call
> baseisadirs,$(libdir),libsoup-gnome-2\.4\.so\.1(\.\d+)*)
>

Same comment, only one line needed.


> +SPKG_DESC_CSWlibsoup-gnome2-4-1 += $(DESCRIPTION), libsoup-gnome-2.4.so.1
> +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibgthread2-0-0
> +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibsqlite3-0
> +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibgmodule2-0-0
> +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibz1
> +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibintl8
> +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibgnome-keyring0
> +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibsoup2-4-1
> +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibgobject2-0-0
> +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibgio2-0-0
> +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibxml2-2
> +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibglib2-0-0
> +OBSOLTED_BY_CSWlibsoup-gnome2-4-1 = CSWlibsoup
>

The same typo.


>
> -RUNTIME_DEP_PKGS_CSWlibsoup2dev += CSWlibsoup2
> +PACKAGES += CSWlibsoup2-dev
> +CATALOGNAME_CSWlibsoup2-dev = libsoup2_dev
>

Not necessary.


> +SPKG_DESC_CSWlibsoup2-dev += $(DESCRIPTION), development files
> +# PKGFILES_CSWlibsoup2-dev += /opt/csw/lib/libsoup-2.4.so
> +PKGFILES_CSWlibsoup2-dev += $(PKGFILES_DEVEL)
> +RUNTIME_DEP_PKGS_CSWlibsoup2-dev += CSWlibsoup2-4-1
> +RUNTIME_DEP_PKGS_CSWlibsoup2-dev += CSWlibsoup-gnome2-4-1
> +OBSOLETED_BY_CSWlibsoup2-dev = CSWlibsoupdevel
> +CATALOGNAME_CSWlibsoupdevel = libsoup_devel_stub
>
> -
> -PKGFILES_CSWlibsoup2dev  = /opt/csw/lib/pkgconfig/.*
> -PKGFILES_CSWlibsoup2dev  += /opt/csw/include/.*
> -
> -
> -EXTRA_INC = /opt/csw/X11/include
> -EXTRA_LIB = /opt/csw/X11/lib
> +# EXTRA_INC = /opt/csw/X11/include
> +# EXTRA_LIB = /opt/csw/X11/lib
>  EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
>  STRIP_LIBTOOL = 1
>
>
> This was sent by the SourceForge.net collaborative development platform,
> the world's largest Open Source development site.
>
> _______________________________________________
> devel mailing list
> devel at lists.opencsw.org
> https://lists.opencsw.org/mailman/listinfo/devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.opencsw.org/pipermail/devel/attachments/20120922/7bc20854/attachment.html>