[csw-devel] SF.net SVN: gar:[5788] csw/mgar/pkg/sendmail/trunk

[valholla at users.sourceforge.net]

Revision: 5788
          http://gar.svn.sourceforge.net/gar/?rev=5788&view=rev
Author:   valholla
Date:     2009-07-31 19:20:28 +0000 (Fri, 31 Jul 2009)

Log Message:
-----------
working merge

Modified Paths:
--------------
    csw/mgar/pkg/sendmail/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol10
    csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol8
    csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol9

Removed Paths:
-------------
    csw/mgar/pkg/sendmail/trunk/files/i.sol10
    csw/mgar/pkg/sendmail/trunk/files/i.sol8
    csw/mgar/pkg/sendmail/trunk/files/i.sol9

Modified: csw/mgar/pkg/sendmail/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sendmail/trunk/Makefile	2009-07-31 18:44:23 UTC (rev 5787)
+++ csw/mgar/pkg/sendmail/trunk/Makefile	2009-07-31 19:20:28 UTC (rev 5788)
@@ -15,7 +15,6 @@
 DISTFILES  = $(GARNAME).$(GARVERSION).tar.gz
 DISTFILES += README.CSW sendmail.schema
 DISTFILES += Sun-sendmail-deactivate.sh Sun-sendmail-reactivate.sh
-DISTFILES += i.sol8 i.sol9 i.sol10
 DISTFILES += cswsendmail site.config.m4
 DISTFILES += $(foreach FILE,$(shell cd $(FILEDIR) && ls *.CSW),$(FILE))
 
@@ -57,6 +56,7 @@
 BUILD_SCRIPTS     = custom
 TEST_SCRIPTS      = custom
 INSTALL_SCRIPTS   = custom
+EXTRA_MERGE_SCRIPTS = OS
 
 include gar/category.mk
 
@@ -112,15 +112,15 @@
 		done )
 
 	@# rename libraries and binaries os-specific
-	( for file in `ls $(DESTDIR)$(libdir)` ; do  \ 
-	mv $(DESTDIR)$(libdir)/$$file $(DESTDIR)$(libdir)/$(SOLVER).$$file ; \ 
-	done )
-	( for file in `ls $(DESTDIR)$(bindir)` ; do  \ 
-	mv $(DESTDIR)$(bindir)/$$file $(DESTDIR)$(bindir)/$(SOLVER).$$file ; \ 
-	done )
-	( for file in `ls $(DESTDIR)$(sbindir)` ; do  \ 
-	mv $(DESTDIR)$(sbindir)/$$file $(DESTDIR)$(sbindir)/$(SOLVER).$$file ; \ 
-	done )
+	( for file in `ls $(DESTDIR)$(libdir)`; do  \
+		mv $(DESTDIR)$(libdir)/$$file $(DESTDIR)$(libdir)/$(SOLVER).$$file; \
+		done )
+	( for file in `ls $(DESTDIR)$(bindir)`; do  \
+		mv $(DESTDIR)$(bindir)/$$file $(DESTDIR)$(bindir)/$(SOLVER).$$file; \
+		done )
+	( for file in `ls $(DESTDIR)$(sbindir)`; do  \
+		mv $(DESTDIR)$(sbindir)/$$file $(DESTDIR)$(sbindir)/$(SOLVER).$$file;\
+		done )
 
 	@# install manpages
 	( for file in $(MANFILES1) ; do \
@@ -150,3 +150,15 @@
 		$(DESTDIR)/var/opt/csw/spool/clientmqueue/ )
 	@$(MAKECOOKIE)
 
+merge-OS:
+	@# Install the other install trees
+	( for dir in `ls -d $(abspath $(WORKROOTDIR)/install*-$(MODULATION))` ; do \
+		( if [ "x`echo $$dir |sed "s/.*install-\(5.[0-9]*\)-$(MODULATION).*/\1/"`x" != "x$(GAROSREL)x" ]; then \
+			cd $$dir$(bindir) && \
+				/usr/bin/pax -rw -v * $(PKGROOT)$(bindir);\
+			cd $$dir$(sbindir) && \
+				/usr/bin/pax -rw -v * $(PKGROOT)$(sbindir);\
+			cd $$dir$(libdir) && \
+				/usr/bin/pax -rw -v * $(PKGROOT)$(libdir); \
+		fi ) \
+	done )

Copied: csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol10 (from rev 5781, csw/mgar/pkg/sendmail/trunk/files/i.sol10)
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol10	                        (rev 0)
+++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol10	2009-07-31 19:20:28 UTC (rev 5788)
@@ -0,0 +1,23 @@
+# PKGINST parameter provided by installation services
+# Move the Solaris 9 version specific files to the base directory.
+# The files specific to Solaris release are:
+# bin/vacation
+# sbin/editmap
+# sbin/mailstats
+# sbin/makemap
+# sbin/praliases
+# lib/mail.local
+# lib/sendmail
+# lib/smrsh
+#
+echo "Installing class <sol10>."
+while read src dest
+do
+	# Keep pkgadd happy by copying the file as defined
+	/usr/bin/cp $src $dest || exit 2
+	# Copy the version specific file to the original name
+	dest2="`echo $dest | sed 's/sol10.//g'`" || exit 2
+	echo $dest2
+	/usr/bin/cp $src $dest2 || exit 2
+done
+exit 0

Copied: csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol8 (from rev 5781, csw/mgar/pkg/sendmail/trunk/files/i.sol8)
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol8	                        (rev 0)
+++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol8	2009-07-31 19:20:28 UTC (rev 5788)
@@ -0,0 +1,23 @@
+# PKGINST parameter provided by installation services
+# Move the Solaris 9 version specific files to the base directory.
+# The files specific to Solaris release are:
+# bin/vacation
+# sbin/editmap
+# sbin/mailstats
+# sbin/makemap
+# sbin/praliases
+# lib/mail.local
+# lib/sendmail
+# lib/smrsh
+#
+echo "Installing class <sol8>."
+while read src dest
+do
+	# Keep pkgadd happy by copying the file as defined
+	/usr/bin/cp $src $dest || exit 2
+	# Copy the version specific file to the original name
+	dest2="`echo $dest | sed 's/sol8.//g'`" || exit 2
+	echo $dest2
+	/usr/bin/cp $src $dest2 || exit 2
+done
+exit 0

Copied: csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol9 (from rev 5781, csw/mgar/pkg/sendmail/trunk/files/i.sol9)
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol9	                        (rev 0)
+++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol9	2009-07-31 19:20:28 UTC (rev 5788)
@@ -0,0 +1,23 @@
+# PKGINST parameter provided by installation services
+# Move the Solaris 9 version specific files to the base directory.
+# The files specific to Solaris release are:
+# bin/vacation
+# sbin/editmap
+# sbin/mailstats
+# sbin/makemap
+# sbin/praliases
+# lib/mail.local
+# lib/sendmail
+# lib/smrsh
+#
+echo "Installing class <sol9>."
+while read src dest
+do
+	# Keep pkgadd happy by copying the file as defined
+	/usr/bin/cp $src $dest || exit 2
+	# Copy the version specific file to the original name
+	dest2="`echo $dest | sed 's/sol9.//g'`" || exit 2
+	echo $dest2
+	/usr/bin/cp $src $dest2 || exit 2
+done
+exit 0

Deleted: csw/mgar/pkg/sendmail/trunk/files/i.sol10
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/i.sol10	2009-07-31 18:44:23 UTC (rev 5787)
+++ csw/mgar/pkg/sendmail/trunk/files/i.sol10	2009-07-31 19:20:28 UTC (rev 5788)
@@ -1,23 +0,0 @@
-# PKGINST parameter provided by installation services
-# Move the Solaris 9 version specific files to the base directory.
-# The files specific to Solaris release are:
-# bin/vacation
-# sbin/editmap
-# sbin/mailstats
-# sbin/makemap
-# sbin/praliases
-# lib/mail.local
-# lib/sendmail
-# lib/smrsh
-#
-echo "Installing class <sol10>."
-while read src dest
-do
-	# Keep pkgadd happy by copying the file as defined
-	/usr/bin/cp $src $dest || exit 2
-	# Copy the version specific file to the original name
-	dest2="`echo $dest | sed 's/sol10.//g'`" || exit 2
-	echo $dest2
-	/usr/bin/cp $src $dest2 || exit 2
-done
-exit 0

Deleted: csw/mgar/pkg/sendmail/trunk/files/i.sol8
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/i.sol8	2009-07-31 18:44:23 UTC (rev 5787)
+++ csw/mgar/pkg/sendmail/trunk/files/i.sol8	2009-07-31 19:20:28 UTC (rev 5788)
@@ -1,23 +0,0 @@
-# PKGINST parameter provided by installation services
-# Move the Solaris 9 version specific files to the base directory.
-# The files specific to Solaris release are:
-# bin/vacation
-# sbin/editmap
-# sbin/mailstats
-# sbin/makemap
-# sbin/praliases
-# lib/mail.local
-# lib/sendmail
-# lib/smrsh
-#
-echo "Installing class <sol8>."
-while read src dest
-do
-	# Keep pkgadd happy by copying the file as defined
-	/usr/bin/cp $src $dest || exit 2
-	# Copy the version specific file to the original name
-	dest2="`echo $dest | sed 's/sol8.//g'`" || exit 2
-	echo $dest2
-	/usr/bin/cp $src $dest2 || exit 2
-done
-exit 0

Deleted: csw/mgar/pkg/sendmail/trunk/files/i.sol9
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/i.sol9	2009-07-31 18:44:23 UTC (rev 5787)
+++ csw/mgar/pkg/sendmail/trunk/files/i.sol9	2009-07-31 19:20:28 UTC (rev 5788)
@@ -1,23 +0,0 @@
-# PKGINST parameter provided by installation services
-# Move the Solaris 9 version specific files to the base directory.
-# The files specific to Solaris release are:
-# bin/vacation
-# sbin/editmap
-# sbin/mailstats
-# sbin/makemap
-# sbin/praliases
-# lib/mail.local
-# lib/sendmail
-# lib/smrsh
-#
-echo "Installing class <sol9>."
-while read src dest
-do
-	# Keep pkgadd happy by copying the file as defined
-	/usr/bin/cp $src $dest || exit 2
-	# Copy the version specific file to the original name
-	dest2="`echo $dest | sed 's/sol9.//g'`" || exit 2
-	echo $dest2
-	/usr/bin/cp $src $dest2 || exit 2
-done
-exit 0


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