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

[lblume at users.sourceforge.net]

Revision: 20973
          http://gar.svn.sourceforge.net/gar/?rev=20973&view=rev
Author:   lblume
Date:     2013-05-03 21:43:23 +0000 (Fri, 03 May 2013)
Log Message:
-----------
pidginotr/trunk: Bump to version 4.0.0, remove patch for testing

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

Modified: csw/mgar/pkg/pidginotr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pidginotr/trunk/Makefile	2013-05-03 21:26:58 UTC (rev 20972)
+++ csw/mgar/pkg/pidginotr/trunk/Makefile	2013-05-03 21:43:23 UTC (rev 20973)
@@ -1,5 +1,5 @@
-NAME = pidgin-otr
-VERSION = 3.2.0
+NAME    = pidgin-otr
+VERSION = 4.0.0
 GARTYPE = v2
 
 DESCRIPTION = Off-The-Record Messaging plugin for pidgin
@@ -9,22 +9,30 @@
 
 MASTER_SITES = http://www.cypherpunks.ca/otr/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
-DISTFILES += $(call admfiles,CSWpidginotr,)
-PATCHFILES = otr_priority.patch
+#PATCHFILES = otr_priority.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
 
+# For msgfmt, msgmerge, xgettext and gettext to be used from GNU
+CONFIGURE_ENV_PATH = $(prefix)/gnu:$(PATH)
+
 # pidgin-otr requires gnu gettex but doesn't do a good job of locating it
-INTLTOOL_XGETTEXT = /opt/csw/bin/gxgettext
-XGETTEXT = $(INTLTOOL_XGETTEXT)
-INTLTOOL_MSGFMT = /opt/csw/bin/gmsgfmt
-MSGFMT = $(INTLTOOL_MSGFMT)
-INTLTOOL_MSGMERGE = /opt/csw/bin/gmsgmerge
-EXTRA_CONFIGURE_EXPORTS = INTLTOOL_XGETTEXT XGETTEXT INTLTOOL_MSGFMT MSGFMT INTLTOOL_MSGMERGE
+#INTLTOOL_XGETTEXT = /opt/csw/bin/gxgettext
+#XGETTEXT = $(INTLTOOL_XGETTEXT)
+#INTLTOOL_MSGFMT = /opt/csw/bin/gmsgfmt
+#MSGFMT = $(INTLTOOL_MSGFMT)
+#INTLTOOL_MSGMERGE = /opt/csw/bin/gmsgmerge
+#EXTRA_CONFIGURE_EXPORTS = INTLTOOL_XGETTEXT XGETTEXT INTLTOOL_MSGFMT MSGFMT INTLTOOL_MSGMERGE
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-RUNTIME_DEP_PKGS_CSWpidginotr = CSWgcrypt CSWgpgerr CSWpidgin CSWotr
+RUNTIME_DEP_PKGS_CSWpidginotr = CSWlibotr5
+RUNTIME_DEP_PKGS_CSWpidginotr = CSWpidgin
 
+BUILD_DEP_PKGS += CSWotr-dev
+BUILD_DEP_PKGS += CSWlibgcrypt-dev
+BUILD_DEP_PKGS += CSWlibgpg-error-dev
+
+
 include gar/category.mk

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