X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/c0746ef547e266edaf5a8fbed5b6e69f82dedabe..cade7d9b1450b874cb558e65797eb07cab799a4f:/openwrt/package/ser/Makefile?ds=sidebyside

diff --git a/openwrt/package/ser/Makefile b/openwrt/package/ser/Makefile
index 59f0d9c1f..603d4bcee 100644
--- a/openwrt/package/ser/Makefile
+++ b/openwrt/package/ser/Makefile
@@ -3,63 +3,44 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ser
-PKG_VERSION:=0.9.0
+PKG_VERSION:=0.8.14
 PKG_RELEASE:=1
-PKG_MD5SUM:=ae1f9b237f0006785ff22eafa1470ac4
+PKG_MD5SUM:=3e2e12c8dfbd7dad9199304093de0838
 
 PKG_SOURCE_URL:=ftp://ftp.berlios.de/pub/ser/$(PKG_VERSION)/src
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_src.tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_CAT:=zcat
-PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
 
-SER_MODULES := sl tm rr maxfwd usrloc registrar dbtext textops
+include $(TOPDIR)/package/rules.mk
 
-SER_MODULE_FILES := $(foreach module,$(SER_MODULES),modules/$(module)/$(module).so)
-SER_MODULES := $(patsubst %,modules/%,$(SER_MODULES))
+$(eval $(call PKG_template,SER,ser,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(DL_DIR)/$(PKG_SOURCE):
-	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+SER_MODULES := sl tm rr maxfwd usrloc registrar dbtext textops nathelper
 
-$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE)
-	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	$(PATCH) $(PKG_BUILD_DIR) ./patches
-	touch $(PKG_BUILD_DIR)/.patched
+SER_MODULE_FILES := $(foreach module,$(SER_MODULES),modules/$(module)/$(module).so)
+SER_MODULES := $(patsubst %,modules/%,$(SER_MODULES))
 
-$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.patched
+$(PKG_BUILD_DIR)/.built:
 	$(MAKE) -C $(PKG_BUILD_DIR) \
+		extra_defs="-DUSE_PTHREAD_MUTEX "  \
 		CC="$(TARGET_CC)" \
 		ARCH="$(ARCH)" \
-		COPTS="$(TARGET_CFLAGS)" \
-		modules="$(SER_MODULES)" \
+		CFLAGS="$(TARGET_CFLAGS)" \
 		modules all
-
-$(PKG_IPK): $(PKG_BUILD_DIR)/$(PKG_NAME)
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-	mkdir -p $(PKG_IPK_DIR)/usr/sbin
-	cp -a $(PKG_BUILD_DIR)/$(PKG_NAME) $(PKG_IPK_DIR)/usr/sbin/
-	-$(STRIP) $(PKG_IPK_DIR)/usr/sbin/*
-	cp -a $(PKG_BUILD_DIR)/scripts/sc $(PKG_IPK_DIR)/usr/sbin/serctl
-	mkdir -p $(PKG_IPK_DIR)/usr/lib/ser/modules
+	touch $@
+
+$(IPKG_SER):
+	mkdir -p $(IDIR_SER)/usr/sbin
+	cp -a $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_SER)/usr/sbin/
+	-$(STRIP) $(IDIR_SER)/usr/sbin/*
+	cp -a $(PKG_BUILD_DIR)/scripts/sc $(IDIR_SER)/usr/sbin/serctl
+	mkdir -p $(IDIR_SER)/usr/lib/ser/modules
 	(cd $(PKG_BUILD_DIR);\
-		cp -a $(SER_MODULE_FILES) $(PKG_IPK_DIR)/usr/lib/ser/modules/; \
+		cp -a $(SER_MODULE_FILES) $(IDIR_SER)/usr/lib/ser/modules/; \
 	)
-	$(STRIP) $(PKG_IPK_DIR)/usr/lib/ser/modules/*
-	mkdir -p $(PKG_IPK_DIR)/etc/ser
-	cp -a $(PKG_BUILD_DIR)/etc/ser.cfg $(PKG_IPK_DIR)/etc/ser/
-	mkdir -p $(PACKAGE_DIR)
-	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK)
-	$(IPKG) install $(PKG_IPK)
-
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(PKG_IPK)
-install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
-
+	$(STRIP) $(IDIR_SER)/usr/lib/ser/modules/*
+	mkdir -p $(IDIR_SER)/etc/ser
+	cp -a $(PKG_BUILD_DIR)/etc/ser.cfg $(IDIR_SER)/etc/ser/
+	$(IPKG_BUILD) $(IDIR_SER) $(PACKAGE_DIR)
 
-clean:
-	rm -rf $(PKG_BUILD_DIR)
-	rm -f $(PKG_IPK)