X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/78c205401ed5d3a55f0b5a92c098af8bf7145540..b8d5619ca8ac95b4a0365a7adcce4b0d9c7305ce:/package/comgt/Makefile?ds=sidebyside

diff --git a/package/comgt/Makefile b/package/comgt/Makefile
index 82a2e2fe3..f2a6966e9 100644
--- a/package/comgt/Makefile
+++ b/package/comgt/Makefile
@@ -1,65 +1,84 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=comgt
-PKG_VERSION:=0.3
-PKG_RELEASE:=1
+PKG_VERSION:=0.32
+PKG_RELEASE:=9
 
-PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://www.pharscape.org/3G/comgt
-PKG_MD5SUM:=cd32663025ed94a0ee623a689989f3c3
+PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=@SF/comgt
+PKG_MD5SUM:=db2452680c3d953631299e331daf49ef
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_UNPACK:=mkdir -p $(PKG_BUILD_DIR); zcat $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION)
 
-include $(INCLUDE_DIR)/package.mk
+PKG_CONFIG_DEPENDS:=CONFIG_USE_NETIFD
+COMGT_VARIANT:=$(if $(CONFIG_USE_NETIFD),netifd,old)
+FILES_DIR:=./files-$(COMGT_VARIANT)
 
+include $(INCLUDE_DIR)/package.mk
 
 define Package/comgt
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Option/Vodafone 3G/GPRS control tool
   DEPENDS:=+chat
-  DESCRIPTION:=\
-	comgt is a scripting language interpreter useful for establishing communications \\\
-	on serial lines and through PCMCIA modems as well as GPRS and 3G datacards.
-  URL:= http://www.pharscape.org/content/view/46/70/
+  URL:=http://www.pharscape.org/comgt.html
 endef
 
+define Package/comgt/description
+ comgt is a scripting language interpreter useful for establishing 
+ communications on serial lines and through PCMCIA modems as well as GPRS 
+ and 3G datacards.
+endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
-		gcom
+		LDFLAGS="" \
+		comgt
+endef
+
+define Package/comgt/install/netifd
+	$(INSTALL_DIR) $(1)/lib/netifd/proto
+	$(INSTALL_BIN) $(FILES_DIR)/3g.sh $(1)/lib/netifd/proto/3g.sh
 endef
-	
+
+define Package/comgt/install/old
+	$(INSTALL_DIR) $(1)/etc/ppp
+	$(INSTALL_BIN) $(FILES_DIR)/3g.connect $(1)/etc/ppp/3g.connect
+	$(INSTALL_DIR) $(1)/lib/network
+	$(INSTALL_BIN) $(FILES_DIR)/3g.sh $(1)/lib/network/3g.sh
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/button
+	$(INSTALL_DATA) $(FILES_DIR)/3g.button $(1)/etc/hotplug.d/button/05-3g
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+	$(INSTALL_DATA) $(FILES_DIR)/3g.iface $(1)/etc/hotplug.d/iface/05-3g
+endef
+
 define Package/comgt/install
-	install -d -m0755 $(1)/usr/bin
-	install -m0755 $(PKG_BUILD_DIR)/gcom $(1)/usr/bin/
-	install -d -m0755 $(1)/etc/ppp
-	install -m0755 ./files/3g.connect $(1)/etc/ppp/3g.connect
-	install -d -m0755 $(1)/etc/chatscripts
-	install -m0644 ./files/3g.chat $(1)/etc/chatscripts/3g.chat
-	install -d -m0755 $(1)/lib/network
-	install -m0644 ./files/3g.sh $(1)/lib/network/3g.sh
-	install -d -m0755 $(1)/etc/hotplug.d/button
-	install -m0644 ./files/3g.button $(1)/etc/hotplug.d/button/05-3g
-	install -d -m0755 $(1)/etc/hotplug.d/iface
-	install -m0644 ./files/3g.iface $(1)/etc/hotplug.d/iface/05-3g
-	install -d -m0755 $(1)/etc/gcom
-	install -m0644 ./files/setpin.gcom $(1)/etc/gcom/setpin.gcom
-	install -m0644 ./files/setmode.gcom $(1)/etc/gcom/setmode.gcom
-	install -m0644 ./files/getcardinfo.gcom $(1)/etc/gcom/getcardinfo.gcom
-	install -m0644 ./files/getstrength.gcom $(1)/etc/gcom/getstrength.gcom
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/comgt $(1)/usr/bin/
+	ln -s comgt $(1)/usr/bin/gcom
+	$(INSTALL_DIR) $(1)/etc/chatscripts
+	$(INSTALL_DATA) ./files/3g.chat $(1)/etc/chatscripts/3g.chat
+	$(INSTALL_DATA) ./files/evdo.chat $(1)/etc/chatscripts/evdo.chat
+	$(INSTALL_DIR) $(1)/etc/gcom
+	$(INSTALL_DATA) ./files/setpin.gcom $(1)/etc/gcom/setpin.gcom
+	$(INSTALL_DATA) ./files/setmode.gcom $(1)/etc/gcom/setmode.gcom
+	$(INSTALL_DATA) ./files/getcardinfo.gcom $(1)/etc/gcom/getcardinfo.gcom
+	$(INSTALL_DATA) ./files/getstrength.gcom $(1)/etc/gcom/getstrength.gcom
+	$(INSTALL_DATA) ./files/getcarrier.gcom $(1)/etc/gcom/getcarrier.gcom
+	$(INSTALL_DATA) ./files/getcnum.gcom $(1)/etc/gcom/getcnum.gcom
+	$(INSTALL_DATA) ./files/getimsi.gcom $(1)/etc/gcom/getimsi.gcom
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/tty
+	$(INSTALL_DATA) $(FILES_DIR)/3g.usb $(1)/etc/hotplug.d/tty/30-3g
+	$(Package/comgt/install/$(COMGT_VARIANT))
 endef
 
 $(eval $(call BuildPackage,comgt))
-