[csw-devel] SF.net SVN: gar:[16917] csw/mgar/pkg/389-admin/trunk

[cgrzemba at users.sourceforge.net]

Revision: 16917
          http://gar.svn.sourceforge.net/gar/?rev=16917&view=rev
Author:   cgrzemba
Date:     2012-01-26 15:34:11 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
389-admin/trunk: fix scrimmage with openldap header files

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile
    csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove

Added Paths:
-----------
    csw/mgar/pkg/389-admin/trunk/files/0004-change-include-preferences-in-Makefile.am.patch

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-26 15:34:11 UTC (rev 16917)
@@ -28,6 +28,7 @@
 PATCHFILES += 0001-change-includedir-preference-in-Makefile.am.patch
 PATCHFILES += 0002-add-i386-platform-to-configure.ac.patch
 PATCHFILES += 0003-correct-initscript-and-http.conf.in.patch
+PATCHFILES += 0004-change-include-preferences-in-Makefile.am.patch
 
 PACKAGES += CSWlibds-admin-serv0
 CATALOGNAME_CSWlibds-admin-serv0 = libds_admin_serv0
@@ -86,21 +87,19 @@
 EXTRA_LINKER_FLAGS = -xnorunpath -norunpath -liconv
 
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS_OPT += --with-ldapsdk-inc=/opt/csw/include/dirsrv 
-CONFIGURE_ARGS_OPT += --with-ldapsdk-lib=/opt/csw/lib
-CONFIGURE_ARGS_OPT += --with-icu-inc=/opt/csw/include 
-CONFIGURE_ARGS_OPT += --with-icu-lib=/opt/csw/lib
-CONFIGURE_ARGS_OPT += --with-icu-bin=/opt/csw/bin 
-CONFIGURE_ARGS_OPT += --with-sasl-inc=/opt/csw/include/sasl 
-CONFIGURE_ARGS_OPT += --with-sasl-lib=/opt/csw/lib
-CONFIGURE_ARGS_OPT += --with-nss-lib=/opt/csw/lib
-CONFIGURE_ARGS_OPT += --with-nss-inc=/opt/csw/include/nss 
-CONFIGURE_ARGS_OPT += --with-apxs=/opt/csw/apache2/sbin/apxs
-CONFIGURE_ARGS_OPT += --with-httpd=/opt/csw/apache2/sbin/httpd
-CONFIGURE_ARGS_OPT += --with-modnss-lib=/opt/csw/apache2/libexec
-CONFIGURE_ARGS_OPT += --with-modnss-bin=/opt/csw/apache2/sbin
-CONFIGURE_ARGS_OPT += --disable-threading
-CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
+CONFIGURE_ARGS += --with-ldapsdk-inc=/opt/csw/include/dirsrv 
+CONFIGURE_ARGS += --with-ldapsdk-lib=/opt/csw/lib
+CONFIGURE_ARGS += --with-icu-inc=/opt/csw/include 
+CONFIGURE_ARGS += --with-icu-lib=/opt/csw/lib
+CONFIGURE_ARGS += --with-icu-bin=/opt/csw/bin 
+CONFIGURE_ARGS += --with-sasl-inc=/opt/csw/include/sasl 
+CONFIGURE_ARGS += --with-sasl-lib=/opt/csw/lib
+CONFIGURE_ARGS += --with-nss-lib=/opt/csw/lib
+CONFIGURE_ARGS += --with-nss-inc=/opt/csw/include/nss 
+CONFIGURE_ARGS += --with-apxs=/opt/csw/apache2/sbin/apxs
+CONFIGURE_ARGS += --with-httpd=/opt/csw/apache2/sbin/httpd
+CONFIGURE_ARGS += --with-modnss-lib=/opt/csw/apache2/libexec
+CONFIGURE_ARGS += --with-modnss-bin=/opt/csw/apache2/sbin
 
 include gar/category.mk
 

Added: csw/mgar/pkg/389-admin/trunk/files/0004-change-include-preferences-in-Makefile.am.patch
===================================================================
--- csw/mgar/pkg/389-admin/trunk/files/0004-change-include-preferences-in-Makefile.am.patch	                        (rev 0)
+++ csw/mgar/pkg/389-admin/trunk/files/0004-change-include-preferences-in-Makefile.am.patch	2012-01-26 15:34:11 UTC (rev 16917)
@@ -0,0 +1,25 @@
+From 75a3e53349b14539b1d3325af7df7e35b4d5e6d5 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Thu, 26 Jan 2012 16:12:09 +0100
+Subject: [PATCH] change include preferences in Makefile.am
+
+---
+ Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 25ae853..51327db 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -371,7 +371,7 @@ ds_snmpctrl_LINK = $(MYLINK)
+ 
+ ############## mod_admserv ################
+ mod_admserv_la_SOURCES = mod_admserv/mod_admserv.c
+-mod_admserv_la_CPPFLAGS = -I at apache_inc@ @apr_inc@ $(AM_CPPFLAGS) @extra_cppflags@
++mod_admserv_la_CPPFLAGS = -I at apache_inc@ $(AM_CPPFLAGS) @apr_inc@ @extra_cppflags@
+ mod_admserv_la_LDFLAGS = -module -avoid-version
+ mod_admserv_la_LIBADD = $(DEFAULT_LIBS)
+ mod_admserv_la_LINK = $(MYLINK) $(mod_admserv_la_LDFLAGS)
+-- 
+1.7.8.3
+

Modified: csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove
===================================================================
--- csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove	2012-01-26 13:25:13 UTC (rev 16916)
+++ csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove	2012-01-26 15:34:11 UTC (rev 16917)
@@ -1,4 +1,4 @@
-( cd /etc/opt/csw/dirsrv/adm-serv
+( cd /etc/opt/csw/dirsrv/admin-serv
   cp -p console.conf console.conf.configured
   cp -p httpd.conf httpd.conf.configured
   cp -p admserv.conf admserv.conf.configured

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.