Revision: 25775
http://sourceforge.net/p/gar/code/25775
Author: dmichelsen
Date: 2016-06-15 15:38:47 +0000 (Wed, 15 Jun 2016)
Log Message:
-----------
subversion/trunk: Cleanup commented out stuff
Modified Paths:
--------------
csw/mgar/pkg/subversion/trunk/Makefile
Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile 2016-06-15 15:09:49 UTC (rev
25774)
+++ csw/mgar/pkg/subversion/trunk/Makefile 2016-06-15 15:38:47 UTC (rev
25775)
@@ -64,7 +64,6 @@
RUNTIME_DEP_PKGS_CSWsubversion += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWsubversion += CSWlibaprutil1-0
RUNTIME_DEP_PKGS_CSWsubversion += CSWlibserf1-1
-#RUNTIME_DEP_PKGS_CSWsubversion += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWsubversion += CSWlibgnome-keyring0
RUNTIME_DEP_PKGS_CSWsubversion-5.9 += CSWglib2
RUNTIME_DEP_PKGS_CSWsubversion-5.10 += CSWlibglib2-0-0
@@ -85,15 +84,10 @@
PKGFILES_CSWap2-subversion +=
$(docdir)/$(CATALOGNAME_CSWap2-subversion)/changelog.CSW
RUNTIME_DEP_PKGS_CSWap2-subversion = CSWsubversion
RUNTIME_DEP_PKGS_CSWap2-subversion += CSWapache2
-#RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibexpat1
RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibaprutil1-0
RUNTIME_DEP_PKGS_CSWap2-subversion-5.10-sparc += CSWlibmagic1
-#RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibsqlite3-0
-#RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibz1
RUNTIME_DEP_PKGS_CSWap2-subversion-5.10-sparc += CSWlibintl8
-#RUNTIME_DEP_PKGS_CSWap2-subversion += CSWbdb48
-#RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWap2-subversion +=
$(RUNTIME_DEP_PKGS_CSWap2-subversion-$(GAROSREL)-$(GARCH))
OBSOLETED_BY_CSWap2-subversion += CSWap2svn
@@ -108,23 +102,10 @@
RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibintl8
RUNTIME_DEP_PKGS_CSWjavasvn += CSWsubversion
RUNTIME_DEP_PKGS_CSWjavasvn-sparc += CSWlibmagic1
-#RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibiconv2
-#RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibz1
-#RUNTIME_DEP_PKGS_CSWjavasvn += CSWbdb48
-#RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsasl2-2
-#RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibexpat1
-#RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsqlite3-0
-#RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibaprutil1-0
-#RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibserf1-1
RUNTIME_DEP_PKGS_CSWjavasvn += $(RUNTIME_DEP_PKGS_CSWjavasvn-$(GARCH))
# This would go away when -norunpath would make it to the linker, but at this
point this is difficult.
# Override for now as it is not harmful.
-#CHECKPKG_OVERRIDES_CSWjavasvn +=
bad-rpath-entry|/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
-#CHECKPKG_OVERRIDES_CSWjavasvn +=
bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
-#CHECKPKG_OVERRIDES_CSWjavasvn +=
bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
-#CHECKPKG_OVERRIDES_CSWjavasvn +=
bad-rpath-entry|/opt/SUNWspro/lib/sparc|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
-#CHECKPKG_OVERRIDES_CSWjavasvn +=
bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
CHECKPKG_OVERRIDES_CSWjavasvn +=
bad-rpath-entry|/opt/solarisstudio12.3/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
CHECKPKG_OVERRIDES_CSWjavasvn +=
bad-rpath-entry|/opt/solarisstudio12.3/lib/sparc|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
@@ -141,11 +122,7 @@
RUNTIME_DEP_PKGS_CSWpm-subversion += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWpm-subversion-5.10-sparc += CSWlibmagic1
RUNTIME_DEP_PKGS_CSWpm-subversion-5.10-sparc += CSWlibiconv2
-#RUNTIME_DEP_PKGS_CSWpm-subversion += CSWlibexpat1
-#RUNTIME_DEP_PKGS_CSWpm-subversion += CSWlibz1
RUNTIME_DEP_PKGS_CSWpm-subversion-5.10-sparc += CSWlibintl8
-#RUNTIME_DEP_PKGS_CSWpm-subversion += CSWlibaprutil1-0
-#RUNTIME_DEP_PKGS_CSWpm-subversion += CSWlibsqlite3-0
RUNTIME_DEP_PKGS_CSWpm-subversion +=
$(RUNTIME_DEP_PKGS_CSWpm-subversion-$(GAROSREL)-$(GARCH))
OBSOLETED_BY_CSWpm-subversion += CSWpmsvn
@@ -164,14 +141,6 @@
RUNTIME_DEP_PKGS_CSWrb-subversion +=
$(RUNTIME_DEP_PKGS_CSWrb-subversion-$(GAROSREL))
RUNTIME_DEP_PKGS_CSWrb-subversion-5.10-sparc += CSWlibmagic1
RUNTIME_DEP_PKGS_CSWrb-subversion +=
$(RUNTIME_DEP_PKGS_CSWrb-subversion-$(GAROSREL)-$(GARCH))
-#RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibiconv2
-#RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibexpat1
-#RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibz1
-#RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibsasl2-2
-#RUNTIME_DEP_PKGS_CSWrb-subversion += CSWbdb48
-#RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibsqlite3-0
-#RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibaprutil1-0
-#RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibserf1-1
OBSOLETED_BY_CSWrb-subversion += CSWrbsvn
@@ -187,15 +156,7 @@
RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWpy-subversion += CSWsubversion
RUNTIME_DEP_PKGS_CSWpy-subversion-5.10-sparc += CSWlibmagic1
-#RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibsqlite3-0
-#RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibexpat1
-#RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibz1
RUNTIME_DEP_PKGS_CSWpy-subversion-5.10-sparc += CSWlibintl8
-#RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibiconv2
-#RUNTIME_DEP_PKGS_CSWpy-subversion += CSWbdb48
-#RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibsasl2-2
-#RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibaprutil1-0
-#RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibserf1-1
RUNTIME_DEP_PKGS_CSWpy-subversion += CSWpython
RUNTIME_DEP_PKGS_CSWpy-subversion +=
$(RUNTIME_DEP_PKGS_CSWpy-subversion-$(GAROSREL)-$(GARCH))
CHECKPKG_OVERRIDES_CSWpy-subversion += surplus-dependency|CSWpython
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
