Revision: 19728
http://gar.svn.sourceforge.net/gar/?rev=19728&view=rev
Author: bdwalton
Date: 2012-11-23 23:14:28 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
apache2/trunk: tweak some dependencies that have changes as a result of direct
binding
Modified Paths:
--------------
csw/mgar/pkg/apache2/trunk/Makefile
Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile 2012-11-22 23:08:26 UTC (rev 19727)
+++ csw/mgar/pkg/apache2/trunk/Makefile 2012-11-23 23:14:28 UTC (rev 19728)
@@ -87,12 +87,11 @@
SPKG_DESC_CSWapache2rt = A stub for the old apache2rt package.
SPKG_DESC_CSWapache2c = A stub for the old apache2c package.
-RUNTIME_DEP_PKGS_CSWapache2 += CSWlibiconv2 CSWosslutils
+RUNTIME_DEP_PKGS_CSWapache2 += CSWosslutils
RUNTIME_DEP_PKGS_CSWapache2 += CSWliblber2-4-2 CSWlibldap2-4-2
# the loadable ldap module dynamically opens files in this apr sub-package
RUNTIME_DEP_PKGS_CSWapache2 += CSWlibaprutil1-ldap
RUNTIME_DEP_PKGS_CSWapache2 += CSWlibssl1-0-0 CSWlibz1
-RUNTIME_DEP_PKGS_CSWapache2 += CSWbdb48 CSWlibexpat1
RUNTIME_DEP_PKGS_CSWapache2 += CSWlibaprutil1-0 CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWapache2 += CSWapache2c CSWperl CSWapache2-utils
# Note: This is required because apxs uses ap{r,u}-1-config
@@ -103,9 +102,6 @@
RUNTIME_DEP_PKGS_CSWapache2-dev = CSWapache2
RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibaprutil1-0
RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibapr1-0
-RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWapache2-utils += CSWbdb48
RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibssl1-0-0
RUNTIME_DEP_PKGS_CSWapache2-utils += CSWperl
RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2
@@ -113,7 +109,7 @@
RUNTIME_DEP_PKGS_CSWap2worker = CSWapache2 CSWap2prefork
RUNTIME_DEP_PKGS_CSWap2worker += CSWlibapr1-0 CSWlibaprutil1-0
RUNTIME_DEP_PKGS_CSWap2worker += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWap2worker += CSWbdb48 CSWlibiconv2 CSWapache2c
+RUNTIME_DEP_PKGS_CSWap2worker += CSWapache2c
RUNTIME_DEP_PKGS_CSWapache2rt = CSWapache2
CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWosslutils
@@ -139,9 +135,6 @@
CHECKPKG_OVERRIDES_CSWap2worker +=
catalogname-does-not-match-pkgname|pkgname=CSWap2worker|catalogname=ap2_worker|expected-catalogname=ap2worker
CHECKPKG_OVERRIDES_CSWap2prefork +=
catalogname-does-not-match-pkgname|pkgname=CSWap2prefork|catalogname=ap2_prefork|expected-catalogname=ap2prefork
-# We need this to get bdb48/lib into the runpath
-EXTRA_LIB = $(prefix)/bdb48/lib
-
# The SMF support: you don't need to specify cswinitsmf any more. You need to
# make sure the the /etc/opt/csw/init.d/cswapache file gets installed during
# the post-install stage, and add "INITSMF = /etc/opt/csw/init.d/cswapache" to
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
