From 98656c6b54cff3a098d89d2b722551def52f6510 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Sun, 6 Apr 2008 18:23:58 +0000
Subject: * Cleaning up package definitions and sources to better harmonize
 with OpenWRT-packages

---
 contrib/package/lua-luci/Makefile | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'contrib/package/lua-luci')

diff --git a/contrib/package/lua-luci/Makefile b/contrib/package/lua-luci/Makefile
index b01d3f820f..956a9f9ea0 100644
--- a/contrib/package/lua-luci/Makefile
+++ b/contrib/package/lua-luci/Makefile
@@ -3,26 +3,21 @@
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
-#
-# $Id: Makefile 10499 2008-02-19 23:40:28Z nico $
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=lua
+PKG_NAME:=lua-luci
 PKG_VERSION:=5.1.3
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.lua.org/ftp/ \
-	http://ftp.gwdg.de/pub/languages/lua/ \
-	http://mirrors.dotsrc.org/lua/ \
-	http://www.tecgraf.puc-rio.br/lua/ftp/
-PKG_MD5SUM:=a70a8dfaa150e047866dc01a46272599
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=https://dev.leipzig.freifunk.net/svn/ff-luci/trunk/contrib/package-source/
+PKG_MD5SUM:=98b12c767a5eed92169b01537e988c7f
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-X_HOST_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-luci
+X_HOST_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -125,16 +120,22 @@ endef
 define Package/liblua-luci/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua.so.* $(1)/usr/lib/
+	echo "Replaces: liblua" >> $(1)/CONTROL/control
+	echo "Conflicts: liblua" >> $(1)/CONTROL/control
 endef
 
 define Package/lua-luci/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lua $(1)/usr/bin/
+	echo "Replaces: lua" >> $(1)/CONTROL/control
+	echo "Conflicts: lua" >> $(1)/CONTROL/control
 endef
 
 define Package/luac-luci/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/luac $(1)/usr/bin/
+	echo "Replaces: luac" >> $(1)/CONTROL/control
+	echo "Conflicts: luac" >> $(1)/CONTROL/control
 endef
 
 define Package/lua-luci-examples/install
-- 
cgit v1.2.3