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

[cgrzemba at users.sourceforge.net]

Revision: 25396
          http://sourceforge.net/p/gar/code/25396
Author:   cgrzemba
Date:     2015-11-20 10:39:05 +0000 (Fri, 20 Nov 2015)
Log Message:
-----------
- use more PRESERVECONF instead of postinstall
- remove special linking for SPARC

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile
    csw/mgar/pkg/389-admin/trunk/files/0002-add-i386-platform-to-configure.ac.patch

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2015-11-20 09:10:43 UTC (rev 25395)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2015-11-20 10:39:05 UTC (rev 25396)
@@ -15,7 +15,7 @@
 MASTER_SITES = https://git.fedorahosted.org/cgit/389/admin.git/snapshot/
 DISTNAME  = admin-$(NAME)-$(VERSION)
 DISTFILES  = $(DISTNAME).tar.gz
-DISTFILES += CSW389-admin.preremove
+# DISTFILES += CSW389-admin.preremove
 
 BUILD64_ONLY = 1
 PACKAGING_PLATFORMS += solaris10-sparc
@@ -38,6 +38,8 @@
 PRESERVECONF += $(sysconfdir)/dirsrv/admin/console.conf
 PRESERVECONF += $(sysconfdir)/dirsrv/admin/local.conf
 PRESERVECONF += $(sysconfdir)/dirsrv/admin/adm.conf
+PRESERVECONF += $(sysconfdir)/dirsrv/admin/admserv.conf
+PRESERVECONF += $(sysconfdir)/dirsrv/admin/nss.conf
 
 BUILD_DEP_PKGS += CSWnspr-dev
 BUILD_DEP_PKGS += CSWlibnss-dev

Modified: csw/mgar/pkg/389-admin/trunk/files/0002-add-i386-platform-to-configure.ac.patch
===================================================================
--- csw/mgar/pkg/389-admin/trunk/files/0002-add-i386-platform-to-configure.ac.patch	2015-11-20 09:10:43 UTC (rev 25395)
+++ csw/mgar/pkg/389-admin/trunk/files/0002-add-i386-platform-to-configure.ac.patch	2015-11-20 10:39:05 UTC (rev 25396)
@@ -8,10 +8,10 @@
  1 files changed, 1 insertions(+), 4 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 1a438e3..d9850f2 100644
+index e16b7d8..3edfb56 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -192,13 +192,12 @@ case $host in
+@@ -192,16 +192,14 @@ case $host in
      # HPUX doesn't use /etc for this
      initdir=/init.d
  	;;
@@ -25,10 +25,19 @@
 -    AC_DEFINE([CPU_sparc], [], [cpu type sparc])
      AC_DEFINE([OS_solaris], [1], [OS SOLARIS])
      AC_DEFINE([sunos5], [1], [SunOS5])
-     AC_DEFINE([OSVERSION], [509], [OS version])
-@@ -215,8 +214,6 @@ dnl Cstd and Crun are required to link any C++ related code (ICU)
+-    AC_DEFINE([OSVERSION], [509], [OS version])
+     AC_DEFINE([_REENTRANT], [1], [_REENTRANT])
+ dnl socket nsl and dl are required to link several programs
+     LIBSOCKET=-lsocket
+@@ -209,14 +207,9 @@ dnl socket nsl and dl are required to link several programs
+     LIBNSL=-lnsl
+     AC_SUBST([LIBNSL], [$LIBNSL])
+ dnl Cstd and Crun are required to link any C++ related code (ICU)
+-    LIBCSTD=-lCstd
+     AC_SUBST([LIBCSTD], [$LIBCSTD])
+-    LIBCRUN=-lCrun
      AC_SUBST([LIBCRUN], [$LIBCRUN])
-     CXXLINK_REQUIRED=1
+-    CXXLINK_REQUIRED=1
      platform="solaris"
 -    # assume 64 bit
 -    perlexec='/usr/lib/sparcv9/dirsec/perl5x/bin/perl'

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