[csw-devel] SF.net SVN: gar:[19290] csw/mgar/pkg/cpan/libapreq2/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Sep 25 18:32:00 CEST 2012
Revision: 19290
http://gar.svn.sourceforge.net/gar/?rev=19290&view=rev
Author: dmichelsen
Date: 2012-09-25 16:32:00 +0000 (Tue, 25 Sep 2012)
Log Message:
-----------
cpan/libapreq2/trunk: Update to 2.13, general rework
Modified Paths:
--------------
csw/mgar/pkg/cpan/libapreq2/trunk/Makefile
csw/mgar/pkg/cpan/libapreq2/trunk/checksums
Modified: csw/mgar/pkg/cpan/libapreq2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/libapreq2/trunk/Makefile 2012-09-25 16:24:42 UTC (rev 19289)
+++ csw/mgar/pkg/cpan/libapreq2/trunk/Makefile 2012-09-25 16:32:00 UTC (rev 19290)
@@ -1,10 +1,10 @@
NAME = libapreq2
-VERSION = 2.12
+VERSION = 2.13
CATEGORIES = cpan
GARTYPE = v2
AUTHOR = JOESUF
-DESCRIPTION = methods for dealing with Apache request data
+DESCRIPTION = Methods for dealing with Apache request data
define BLURB
Apache::Request is a subclass of the Apache class, which adds methods for
parsing GET requests and POST requests where Content-type is one of
@@ -12,48 +12,59 @@
manpage for more details.
endef
-PACKAGES = CSWlibapreq2 CSWlibapreq2-devel CSWap2modapreq2 CSWpmapreq2
-# individual packages below
-CATALOGNAME_CSWlibapreq2 = libapreq2
-SPKG_DESC_CSWlibapreq2 = Apache Request Library
-PKGFILES_CSWlibapreq2 = /opt/csw/apache2/lib/libapreq2.so.*
-RUNTIME_DEP_PKGS_CSWlibapreq2 += CSWiconv
-RUNTIME_DEP_PKGS_CSWlibapreq2 += CSWapache2rt
-RUNTIME_DEP_PKGS_CSWlibapreq2 += CSWbdb47
+LICENSE = LICENSE
-CATALOGNAME_CSWlibapreq2-devel = libapreq2_devel
-SPKG_DESC_CSWlibapreq2-devel = Apache Request Library development support
-PKGFILES_CSWlibapreq2-devel += /opt/csw/apache2/bin/apreq2-config
-PKGFILES_CSWlibapreq2-devel += /opt/csw/apache2/include/apreq2/.*
-PKGFILES_CSWlibapreq2-devel += /opt/csw/apache2/lib/libapreq2.a
-RUNTIME_DEP_PKGS_CSWlibapreq2-devel += CSWlibapreq2
+PACKAGES += CSWlibapreq2-3
+SPKG_DESC_CSWlibapreq2-3 = Apache Request Library
+PKGFILES_CSWlibapreq2-3 += $(call pkgfiles_lib,libapreq2.so.3)
+RUNTIME_DEP_PKGS_CSWlibapreq2-3 += CSWbdb48
+RUNTIME_DEP_PKGS_CSWlibapreq2-3 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWlibapreq2-3 += CSWlibaprutil1-0
+OBSOLETED_BY_CSWlibapreq2-3 += CSWlibapreq2
+PACKAGES += CSWlibapreq2-dev
+SPKG_DESC_CSWlibapreq2-dev = Apache Request Library development support for libapreq2.so.3
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibapreq2-dev += CSWlibapreq2-3
+RUNTIME_DEP_PKGS_CSWlibapreq2-dev += CSWapache2
+OBSOLETED_BY_CSWlibapreq2-dev += CSWlibapreq2-devel
+
+# This is just for the path
+CHECKPKG_OVERRIDES_CSWlibapreq2-dev += file-with-bad-content|/usr/local|root/opt/csw/bin/apreq2-config
+
+PACKAGES += CSWap2modapreq2
CATALOGNAME_CSWap2modapreq2 = ap2_modapreq2
-SPKG_DESC_CSWap2modapreq2 = libapreq2 filter module for Apache 2
-PKGFILES_CSWap2modapreq2 = /opt/csw/apache2/libexec/mod_apreq2.so
-RUNTIME_DEP_PKGS_CSWap2modapreq2 += CSWiconv
-RUNTIME_DEP_PKGS_CSWap2modapreq2 += CSWapache2rt
-RUNTIME_DEP_PKGS_CSWap2modapreq2 += CSWlibapreq2
+# Keep the package name for now until all apache naming has been sanitized
+CHECKPKG_OVERRIDES_CSWap2modapreq2 += catalogname-does-not-match-pkgname|pkgname=CSWap2modapreq2|catalogname=ap2_modapreq2|expected-catalogname=ap2modapreq2
+SPKG_DESC_CSWap2modapreq2 = Apache 2 filter module libapreq2
+PKGFILES_CSWap2modapreq2 += /opt/csw/apache2/libexec/mod_apreq2.so
+RUNTIME_DEP_PKGS_CSWap2modapreq2 += CSWlibapreq2-3
+RUNTIME_DEP_PKGS_CSWap2modapreq2 += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWap2modapreq2 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWap2modapreq2 += CSWapache2
-CATALOGNAME_CSWpmapreq2 = pm_apreq2
-SPKG_DESC_CSWpmapreq2 = libapreq2 Perl language bindings
-PKGFILES_CSWpmapreq2 += /opt/csw/lib/perl/.*
-PKGFILES_CSWpmapreq2 += /opt/csw/share/man/.*
-RUNTIME_DEP_PKGS_CSWpmapreq2 += CSWap2modperl
-RUNTIME_DEP_PKGS_CSWpmapreq2 += CSWpmapachetst
-RUNTIME_DEP_PKGS_CSWpmapreq2 += CSWpmextutxsbld
+PACKAGES += CSWpm-apr-request2
+SPKG_DESC_CSWpm-apr-request2 = libapreq2 Perl language bindings
+PKGFILES_CSWpm-apr-request2 += /opt/csw/lib/perl/.*
+PKGFILES_CSWpm-apr-request2 += /opt/csw/share/man/.*
+RUNTIME_DEP_PKGS_CSWpm-apr-request2 += CSWap2modperl
+# This is part of CSWap2modperl
+# RUNTIME_DEP_PKGS_CSWpm-apr-request2 += CSWpmapachetst
+RUNTIME_DEP_PKGS_CSWpm-apr-request2 += CSWpm-extutils-xsbuilder
+OBSOLETED_BY_CSWpm-apr-request2 += CSWpmapreq2
+CATALOGNAME_CSWpmapreq2 = pm_apreq2_stub
# Ensure args are requestrecs
PATCHFILES += requestrec.diff
-# BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWbdb47-devel
+# BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWbdb48-devel
AP2_ROOT = $(prefix)/apache2
CONFIGURE_ARGS = --enable-perl-glue
CONFIGURE_ARGS += --with-perl=$(bindir)/perl
CONFIGURE_ARGS += --with-apache2-apxs=$(AP2_ROOT)/sbin/apxs
-CONFIGURE_ARGS += --with-apr-config=$(AP2_ROOT)/bin/apr-config
-CONFIGURE_ARGS += --with-apu-config=$(AP2_ROOT)/bin/apu-config
+CONFIGURE_ARGS += --with-apr-config=$(bindir)/apr-1-config
+CONFIGURE_ARGS += --with-apu-config=$(bindir)/apu-1-config
CONFIGURE_ARGS += --with-expat=$(prefix)
CONFIGURE_ARGS += --with-mm-opts="INSTALLDIRS=vendor"
@@ -62,12 +73,12 @@
FIXCONFIG_DIRS += $(DESTDIR)$(prefix)/apache2/lib
STRIP_DIRS += $(DESTDIR)$(prefix)/apache2/libexec
-EXTRA_INC = $(prefix)/bdb47/include
-EXTRA_LIB = $(prefix)/bdb47/lib $(prefix)/apache2/lib
+EXTRA_INC = $(prefix)/bdb48/include
+EXTRA_LIB = $(prefix)/bdb48/lib $(prefix)/apache2/lib
-SKIPTEST = 1
+SKIPTEST ?= 1
# apache2 is not yet libtool free
-STRIP_LIBTOOL = 1
+# STRIP_LIBTOOL = 1
include gar/category.mk
Modified: csw/mgar/pkg/cpan/libapreq2/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/libapreq2/trunk/checksums 2012-09-25 16:24:42 UTC (rev 19289)
+++ csw/mgar/pkg/cpan/libapreq2/trunk/checksums 2012-09-25 16:32:00 UTC (rev 19290)
@@ -1,2 +1 @@
-76e2acde0d82246dea6f2565f3746eec libapreq2-2.12.tar.gz
-500218b67e41bd8ed189b3cb5f031e98 requestrec.diff
+c11fb0861aa84dcc6cd0f0798b045eee libapreq2-2.13.tar.gz
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