[csw-devel] SF.net SVN: gar:[18060] csw/mgar/pkg/mbrowse

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Mon May 21 10:56:44 CEST 2012


Revision: 18060
          http://gar.svn.sourceforge.net/gar/?rev=18060&view=rev
Author:   dmichelsen
Date:     2012-05-21 08:56:44 +0000 (Mon, 21 May 2012)
Log Message:
-----------
mbrowse: Convert build recipe to GAR

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

Added Paths:
-----------
    csw/mgar/pkg/mbrowse/Makefile
    csw/mgar/pkg/mbrowse/branches/
    csw/mgar/pkg/mbrowse/tags/
    csw/mgar/pkg/mbrowse/tags/legacy/
    csw/mgar/pkg/mbrowse/trunk/
    csw/mgar/pkg/mbrowse/trunk/files/0001-Forward-port-patch-from-Phil.patch

Removed Paths:
-------------
    csw/mgar/pkg/mbrowse/trunk/

Copied: csw/mgar/pkg/mbrowse/Makefile (from rev 17611, csw/mgar/pkg/template/Makefile)
===================================================================
--- csw/mgar/pkg/mbrowse/Makefile	                        (rev 0)
+++ csw/mgar/pkg/mbrowse/Makefile	2012-05-21 08:56:44 UTC (rev 18060)
@@ -0,0 +1,15 @@
+# vim: ft=make ts=4 sw=4 noet
+
+default:
+	@echo "You are in the pkg/ directory."
+
+%:
+	$(MAKE) -C trunk $* 
+
+paranoid-%:
+	$(MAKE) -C trunk $* || exit 2 
+
+export BUILDLOG ?= $(shell pwd)/buildlog.txt
+
+report-%:
+	$(MAKE) -C trunk $* || echo "	*** make $* in $$i failed ***" >> $(BUILDLOG) 


Property changes on: csw/mgar/pkg/mbrowse/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Modified: csw/mgar/pkg/mbrowse/trunk/Makefile
===================================================================
--- csw/mgar/pkg/template/trunk/Makefile	2012-04-04 21:59:21 UTC (rev 17611)
+++ csw/mgar/pkg/mbrowse/trunk/Makefile	2012-05-21 08:56:44 UTC (rev 18060)
@@ -1,188 +1,32 @@
-# Copyright 2009 OpenCSW
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-## This file contains comments to guide you through various GAR settings.
-## Please remove unnecessary comments before committing your code to the code
-## repository. The comments to remove are marked with double hashes.
-## If you want to remove them all in-place, use:
-## gsed -i -e '/^##/d' Makefile
-##
-## For more information about GAR variables, please see:
-## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference
-##
-NAME = mypkg
-VERSION = 1.0
-##
-## The category that your software fits in. This is not a descriptive field, but
-## influences the build process. Depending on the CATEGORIES setting, different
-## Makefiles are included from gar/categories/ in your trunk directory, which
-## adjust the build settings for the respective category.
-##
-## Possible settings are:
-## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server,
-## utils, x11, xfce, xorg, xtra
-CATEGORIES = lib
+NAME = mbrowse
+VERSION = 0.4.3
+CATEGORIES = utils
 GARTYPE = v2
-##
-## A one-line description of the package, which will appear in the pkginfo.
-DESCRIPTION = <please fill in>
-##
-## A longer description of the package. This is only for descriptive purposes
-## inside the Makefile and is not used elsewhere.
-define BLURB
-  <please fill in>
-endef
-##
-## Upstream URL that should show up in the VENDOR field as well as on
-## http://opencsw.org/packages/<packagename>.
-SPKG_SOURCEURL =
-##
-## Whitespace-separated list of URLs to download the source package from.
-## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR),
-## $(PYPI_MIRROR)
-MASTER_SITES =
-##
-## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the
-## Sourceforge project name differs from $(NAME). Specifies the Sourceforge
-## project name of the software you wish to download.
-## SF_PROJ =
-##
-## A list of space separated patch filenames from files/ that are to be applied
-## to the extracted software before the ./configure stage.
-## PATCHFILES =
-##
-## Whitespace-separated list of files which comprise this build. mGAR will look
-## for the files in the $(FILEDIR) (trunk/files) directory and on the
-## $(MASTER_SITES).
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
-##
-## We define upstream file regex so we can be notifed of new upstream software
-## release
-## UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-##
-## Catalog name is the name to be used with pkg{-get,util} -i <pkgname>.
-## It is different from the system package name, which by convention is CSWpkgname.
-## CATALOGNAME =
-##
-## Set to 1 to mark the package as architecture-independent.
-## ARCHALL = 0
-##
-## A list of files / patterns that should be excluded from the package. Amends
-## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which
-## contains things like libtool .la files and files with a leading ~.
-## EXTRA_MERGE_EXCLUDE_FILES =
-##
-## A list of space separated package names that should be marked as
-## incompatible with the current package. This will go into the depend file.
-## When a user has one of the incompatible packages installed and installs
-## your package, he will be prompted that the incompatible package must be
-## removed. He will however not be prevented to install your package without
-## removing the conflicting package first.
-## INCOMPATIBLE_PKGS =
-##
-##  The name of the license file that should be included in your package. Defaults
-##  to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRight for details
-##  on including and displaying licenses.
-## LICENSE =
-##
-## A list of space separated package names that should be produced from your
-## Makefile. This is used when a software has different components that can be
-## packaged and used individually (think runtime libraries, client tools, server
-## files, development headers). You don't need to set this when you just want to
-## produce one package.
-##
-## When you set this variable to include more than one package, you also need to
-## set PKGFILES_CSWpkgname for each package (except for the first one in your
-## $(PACKAGES) list) to define which files go into each package. The first
-## package from $(PACKAGES) one will hold all files that are not matched by
-## PKGFILES_ for other packages.
-## PACKAGES =
-##
-## If specified, GAR feeds the almost-final package prototype file to
-## $(PROTOTYPE_FILTER) and reads the final package prototype file from it.
-## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used
-## to prepare the prototype file for use with cswclassutils (see
-## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils,
-## you will rarely have to use this. A still valid use case would be to change
-## the file permissions of a file to be set-UID.
-## See http://wiki.opencsw.org/cswclassutils-package for common usage information
-## PROTOTYPE_FILTER =
-##
-## cswclassutils settings
-##
-## A list of action classes. Possible values are:
-## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf
-##	cswinetd cswetcservices
-## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils,
-## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS.
-## SPKG_CLASSES = none
-## Simplified settings for classes:
-## PRESERVECONF =
-## SAMPLECONF =
-## INITSMF =
-## USERGROUP =
-## ETCSERVICES = <file containing an entry for /etc/services>
-## INETDCONF = <file containing an inetd.conf formatted entry>
-## A list of runtime package dependencies in the form of CSWfoo.
-## RUNTIME_DEP_PKGS =
-##
-## A list of packages necessary to build this package
-## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
-##
-## When using non-empty $(PACKAGES):
-## RUNTIME_DEP_PKGS_CSWpkgname =
-## SPKG_DESC_CSWpkgname =
-## PKGFILES_CSWpkgname =
-## CATALOGNAME_CSWpkgname =
-##
-## A list of space separated directories where objects should be stripped in
-## addition to the bin/ and sbin/ directories.
-## STRIP_DIRS =
-##
-## Define a custom target for the configure phase. When you set this, the target
-## that will be used instead of configure: target, is named
-## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile
-## after including gar/gar.include.mk. If you want to skip the configure phase
-## completely (for example when your software doesn't need to be compiled) assign
-## this variable an empty value. The procedure works for configure, build,
-## install and test steps.
-## CONFIGURE_SCRIPTS =
-## BUILD_SCRIPTS =
-## INSTALL_SCRIPTS =
-## TEST_SCRIPTS =
-##
-## Compilation settings
-##
-## The build directory.
-## WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION)
-##
-## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this
-## for example, if you need to override Makefile variables.
-## BUILD_ARGS =
-##
-## Arguments passed to the ./configure script.
-CONFIGURE_ARGS = $(DIRPATHS)
-##
-## BUILD64 =
-## CONFIGURE_ENV =
-## EXTRA_CFLAGS =
-## EXTRA_LDFLAGS =
-## EXTRA_INC =
-## EXTRA_LIB =
-## GARFLAVOR =
-## INSTALL_ARGS =
-## OPT_FLAGS_SOS = -xO3
-## OPT_FLAGS_GCC = -O2 -pipe
-##
-## The compiler to use. This can be also: SOS11, GCC3, GCC4.
-## Specifying GNU will default to GCC4, specifying SUN will default to SOS12
-## GARCOMPILER = SOS12
-##
-# Remove the following rules and uncomment the
-# include before building.
-all: .DEFAULT
-.DEFAULT:
-	@true
 
-#include gar/category.mk
+DESCRIPTION = SNMP MIB browser
+
+MASTER_SITES = $(SF_MIRROR)
+DISTFILES += $(DISTNAME).tar.gz
+
+PATCHFILES += 0001-Forward-port-patch-from-Phil.patch
+
+VENDOR_URL = http://sourceforge.net/projects/mbrowse/
+
+PACKAGES += CSWmbrowse
+SPKG_DESC_CSWmbrowse = SNMP MIB browser
+RUNTIME_DEP_PKGS_CSWmbrowse += CSWlibnetsnmp25
+RUNTIME_DEP_PKGS_CSWmbrowse += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWmbrowse += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWmbrowse += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWmbrowse += CSWgtk2
+RUNTIME_DEP_PKGS_CSWmbrowse += CSWlibatk1-0-0
+RUNTIME_DEP_PKGS_CSWmbrowse += CSWpango
+RUNTIME_DEP_PKGS_CSWmbrowse += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWmbrowse += CSWglib2
+
+
+CONFIGURE_ARGS += $(DIRPATHS)
+CONFGIURE_ARGS += --with-snmp-type=net
+CONFIGURE_ARGS += --with-snmp-prefix=$(prefix)
+
+include gar/category.mk

Modified: csw/mgar/pkg/mbrowse/trunk/checksums
===================================================================
--- csw/mgar/pkg/template/trunk/checksums	2012-04-04 21:59:21 UTC (rev 17611)
+++ csw/mgar/pkg/mbrowse/trunk/checksums	2012-05-21 08:56:44 UTC (rev 18060)
@@ -0,0 +1 @@
+9857a88d2e6246384587350a647e605d  mbrowse-0.4.3.tar.gz

Added: csw/mgar/pkg/mbrowse/trunk/files/0001-Forward-port-patch-from-Phil.patch
===================================================================
--- csw/mgar/pkg/mbrowse/trunk/files/0001-Forward-port-patch-from-Phil.patch	                        (rev 0)
+++ csw/mgar/pkg/mbrowse/trunk/files/0001-Forward-port-patch-from-Phil.patch	2012-05-21 08:56:44 UTC (rev 18060)
@@ -0,0 +1,57 @@
+From f2d3d52965b584c5067f51e54c1cda6464bae45d Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <da\xC2m at opencsw.org>
+Date: Mon, 21 May 2012 10:26:24 +0200
+Subject: [PATCH] Forward-port patch from Phil
+
+---
+ src/configuration.c |   27 +++++++++++++++------------
+ 1 file changed, 15 insertions(+), 12 deletions(-)
+
+diff --git a/src/configuration.c b/src/configuration.c
+index ec6ec68..4d087b9 100644
+--- a/src/configuration.c
++++ b/src/configuration.c
+@@ -67,6 +67,9 @@ static config_t config;
+ #define STRING 	0
+ #define INTEGER	1
+ 
++#ifdef __SUNPRO_CCXX
++#define integer uint32_t
++#endif
+ config_opt_t config_opts[] = {
+   { "oid",          STRING, {""},       &config.oid },
+   { "readcomm",     STRING, {"public"}, &config.readcomm },
+@@ -74,18 +77,18 @@ config_opt_t config_opts[] = {
+   { "host",         STRING, {""},       &config.host },
+   { "inst",         STRING, {""},       &config.inst },
+   { "value",        STRING, {""},       &config.value },
+-  { "save_sess",    INTEGER,{integer:TRUE},&config.save_sess },
+-  { "snmp_ver",     INTEGER,{integer:SNMP_VERSION_1},&config.snmp_ver },
+-  { "snmp_timeout", INTEGER,{integer:2},&config.snmp_timeout },
+-  { "snmp_reties",  INTEGER,{integer:1},&config.snmp_retries },
+-  { "snmp_port",    INTEGER,{integer:161},&config.snmp_port },
+-  { "tree_line",    INTEGER,{integer:1},&config.tree_line },
+-  { "out_wrap_mode",INTEGER,{integer:GTK_WRAP_NONE},&config.out_wrap_mode },
+-  { "save_window_size", INTEGER, {integer:1}, &config.save_window_size },
+-  { "window_width", INTEGER, {integer:-1}, &config.window_width },
+-  { "window_height", INTEGER, {integer:-1}, &config.window_height },
+-  { "window_maximized", INTEGER, {integer:0}, &config.window_maximized },
+-  { NULL,           INTEGER, {integer:0},NULL },
++  { "save_sess",    INTEGER,TRUE,&config.save_sess },
++  { "snmp_ver",     INTEGER,{ SNMP_VERSION_1},&config.snmp_ver },
++  { "snmp_timeout", INTEGER,{ 2},&config.snmp_timeout },
++  { "snmp_reties",  INTEGER,{ 1},&config.snmp_retries },
++  { "snmp_port",    INTEGER,{ 161},&config.snmp_port },
++  { "tree_line",    INTEGER,{ 1},&config.tree_line },
++  { "out_wrap_mode",INTEGER,{ GTK_WRAP_NONE},&config.out_wrap_mode },
++  { "save_window_size", INTEGER, { 1}, &config.save_window_size },
++  { "window_width", INTEGER, { -1}, &config.window_width },
++  { "window_height", INTEGER, { -1}, &config.window_height },
++  { "window_maximized", INTEGER, { 0}, &config.window_maximized },
++  { NULL,           INTEGER, { 0},NULL },
+ };
+ 
+ config_t *get_config() {
+-- 
+1.7.10
+

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