[csw-devel] SF.net SVN: gar:[20989] csw/mgar/pkg/otr/trunk/Makefile

[lblume at users.sourceforge.net]

Revision: 20989
          http://gar.svn.sourceforge.net/gar/?rev=20989&view=rev
Author:   lblume
Date:     2013-05-04 20:03:02 +0000 (Sat, 04 May 2013)
Log Message:
-----------
otr/trunk: Fix dependencies

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

Modified: csw/mgar/pkg/otr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/otr/trunk/Makefile	2013-05-04 14:47:27 UTC (rev 20988)
+++ csw/mgar/pkg/otr/trunk/Makefile	2013-05-04 20:03:02 UTC (rev 20989)
@@ -8,7 +8,7 @@
 endef
 
 MASTER_SITES = http://www.cypherpunks.ca/otr/
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
+DISTFILES = $(DISTNAME).tar.gz
 
 PACKAGES += CSWlibotr5
 CATALOGNAME_CSWlibotr5 = libotr5
@@ -34,19 +34,25 @@
 BUILD64_LIBS_ONLY = 1
 
 RUNTIME_DEP_PKGS_CSWlibotr5 += CSWlibgcrypt11
-RUNTIME_DEP_PKGS_CSWlibotr5 += CSWlibgpg-error0
-RUNTIME_DEP_PKGS_CSWlibotr5 += CSWlibotr2
 
-CHECKPKG_OVERRIDES_CSWlibotr5 += surplus-dependency|CSWlibotr2
-
 RUNTIME_DEP_PKGS_CSWotr-dev += CSWlibotr5
 
+RUNTIME_DEP_PKGS_CSWotr += CSWlibotr2
 RUNTIME_DEP_PKGS_CSWotr += CSWlibotr5
+RUNTIME_DEP_PKGS_CSWotr += CSWlibgcrypt11
 
+# On sparc, the dependencies end up different
+ifeq ($(shell uname -p), sparc)
+  RUNTIME_DEP_PKGS_CSWlibotr5 += CSWlibgpg-error0
+  RUNTIME_DEP_PKGS_CSWotr += CSWlibgpg-error0
+endif
+
+CHECKPKG_OVERRIDES_CSWotr += surplus-dependency|CSWlibotr2
+
 BUILD_DEP_PKGS += CSWlibgcrypt-dev
 BUILD_DEP_PKGS += CSWlibgpg-error-dev
 
 # Remove after pushing to catalog
-CHECKPKG_OVERRIDES_CSWlibotr5 += dependency-on-nonexistent-package|CSWlibotr2
+CHECKPKG_OVERRIDES_CSWotr += dependency-on-nonexistent-package|CSWlibotr2
 
 include gar/category.mk

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