[csw-devel] SF.net SVN: gar:[19120] csw/mgar/pkg/apg/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Aug 30 15:45:59 CEST 2012


Revision: 19120
          http://gar.svn.sourceforge.net/gar/?rev=19120&view=rev
Author:   dmichelsen
Date:     2012-08-30 13:45:59 +0000 (Thu, 30 Aug 2012)
Log Message:
-----------
apg/trunk: Final fixes

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

Added Paths:
-----------
    csw/mgar/pkg/apg/trunk/files/0002-Do-not-change-owner-and-group.patch

Modified: csw/mgar/pkg/apg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apg/trunk/Makefile	2012-08-30 13:25:23 UTC (rev 19119)
+++ csw/mgar/pkg/apg/trunk/Makefile	2012-08-30 13:45:59 UTC (rev 19120)
@@ -11,14 +11,27 @@
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
 PATCHFILES += 0001-Fix-Makefile-for-Solaris-use.patch
+PATCHFILES += 0002-Do-not-change-owner-and-group.patch
 
+# This is the path to apg
+REINPLACE_USRLOCAL += doc/man/apg.1
+
 # There is no configure
 CONFIGURE_SCRIPTS =
 
+# We want to build both standalone and client/server
+BUILD_ARGS = all
+
 # There is no testsuite
 TEST_SCRIPTS =
 
 INSTALL_OVERRIDE_VARS += INSTALL_PREFIX
 INSTALL_OVERRIDE_VAR_INSTALL_PREFIX = $(DESTDIR)$(prefix)
 
+INSTALL_OVERRIDE_VARS += APG_MAN_DIR
+INSTALL_OVERRIDE_VAR_APG_MAN_DIR = /share/man/man1
+
+INSTALL_OVERRIDE_VARS += APGD_MAN_DIR
+INSTALL_OVERRIDE_VAR_APGD_MAN_DIR = /share/man/man8
+
 include gar/category.mk

Added: csw/mgar/pkg/apg/trunk/files/0002-Do-not-change-owner-and-group.patch
===================================================================
--- csw/mgar/pkg/apg/trunk/files/0002-Do-not-change-owner-and-group.patch	                        (rev 0)
+++ csw/mgar/pkg/apg/trunk/files/0002-Do-not-change-owner-and-group.patch	2012-08-30 13:45:59 UTC (rev 19120)
@@ -0,0 +1,31 @@
+From d4337e85b9fdeeff342f86b9d214ed78fb36709e Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 30 Aug 2012 15:28:19 +0200
+Subject: [PATCH] Do not change owner and group
+
+---
+ install-sh |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/install-sh b/install-sh
+index e9de238..cec1fa1 100755
+--- a/install-sh
++++ b/install-sh
+@@ -69,12 +69,12 @@ while [ x"$1" != x ]; do
+ 	    shift
+ 	    continue;;
+ 
+-	-o) chowncmd="$chownprog $2"
++	-o) chowncmd=""
+ 	    shift
+ 	    shift
+ 	    continue;;
+ 
+-	-g) chgrpcmd="$chgrpprog $2"
++	-g) chgrpcmd=""
+ 	    shift
+ 	    shift
+ 	    continue;;
+-- 
+1.7.10.3
+

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