diff options
| -rw-r--r-- | package/haserl/Makefile | 15 | ||||
| -rw-r--r-- | package/haserl/haserl-0.7.3-3.diff | 133 | ||||
| -rw-r--r-- | package/haserl/ipkg/haserl/CONTROL/control | 8 | ||||
| -rw-r--r-- | package/haserl/ipkg/rules | 117 | ||||
| -rw-r--r-- | package/haserl/ipkg/version | 1 | 
5 files changed, 133 insertions, 141 deletions
| diff --git a/package/haserl/Makefile b/package/haserl/Makefile index 6846e7ac1..b4be1720e 100644 --- a/package/haserl/Makefile +++ b/package/haserl/Makefile @@ -3,9 +3,9 @@  include $(TOPDIR)/rules.mk  PKG_NAME := haserl -PKG_VERSION := 0.7.3 -PKG_RELEASE := 3 -PKG_MD5SUM := a45d9c5b07e053ad105124e1fc12d9c4 +PKG_VERSION := 0.8.0 +PKG_RELEASE := 1 +PKG_MD5SUM := bd9195d086566f56634c0bcbbbcbebea  PKG_SOURCE_SITE := @SF/haserl  PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -22,15 +22,14 @@ $(DL_DIR)/$(PKG_SOURCE_FILE):  $(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE)  	mkdir -p $(TOOL_BUILD_DIR)  	$(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - -	$(PATCH) $(PKG_BUILD_DIR) . $(PKG_NAME)-\*.diff +#	$(PATCH) $(PKG_BUILD_DIR) ./patches +	cp -fpR ./ipkg $(PKG_BUILD_DIR)/  	chmod a+x $(PKG_BUILD_DIR)/ipkg/rules  $(PKG_IPK): $(PKG_BUILD_DIR)/ipkg/rules  	cd $(PKG_BUILD_DIR); \ -	ipkg/rules \ -	  TOPDIR="$(TOPDIR)" \ -	  IPKG_RULES_INC="$(TOPDIR)/rules.mk" \ -	 package +	TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \ +	./ipkg/rules package  $(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK)  	$(IPKG) install $(PKG_IPK) diff --git a/package/haserl/haserl-0.7.3-3.diff b/package/haserl/haserl-0.7.3-3.diff deleted file mode 100644 index b56d3c332..000000000 --- a/package/haserl/haserl-0.7.3-3.diff +++ /dev/null @@ -1,133 +0,0 @@ -diff -ruN haserl-0.7.3-orig/ipkg/haserl/CONTROL/control haserl-0.7.3-3/ipkg/haserl/CONTROL/control ---- haserl-0.7.3-orig/ipkg/haserl/CONTROL/control	1970-01-01 01:00:00.000000000 +0100 -+++ haserl-0.7.3-3/ipkg/haserl/CONTROL/control	2005-03-06 18:13:02.000000000 +0100 -@@ -0,0 +1,8 @@ -+Package: haserl -+Priority: optional -+Section: net -+Version: [TBDL] -+Architecture: [TBDL] -+Maintainer: Nico <nthill@free.fr> -+Source: http://nthill.free.fr/openwrt/sources/haserl/ -+Description: a CGI wrapper to embed shell scripts in HTML documents -diff -ruN haserl-0.7.3-orig/ipkg/rules haserl-0.7.3-3/ipkg/rules ---- haserl-0.7.3-orig/ipkg/rules	1970-01-01 01:00:00.000000000 +0100 -+++ haserl-0.7.3-3/ipkg/rules	2005-03-08 04:10:19.000000000 +0100 -@@ -0,0 +1,112 @@ -+#!/usr/bin/make -f -+ -+ifneq ($(strip ${IPKG_RULES_INC}),) -+ include $(IPKG_RULES_INC) -+endif -+ -+## -+ -+PKG_VERSION := $(shell cat ./ipkg/version) -+CURRENT_DIR := $(shell pwd) -+INSTALL_DIR = $(CURRENT_DIR)/ipkg-install -+ -+I_HASERL := ipkg/haserl -+ -+BUILD_DEPS := \ -+ -+CONFIGURE_OPTS = \ -+	--enable-variable-prefix="" \ -+ -+## -+ -+all: package -+ -+ -+.stamp-configured: $(BUILD_DEPS) -+ -+	rm -rf config.cache -+	$(TARGET_CONFIGURE_OPTS) \ -+	CFLAGS="$(TARGET_CFLAGS) -DMAX_UPLOAD_KB=8192" \ -+	ac_cv_func_malloc_0_nonnull=yes \ -+	./configure \ -+	  --target=$(GNU_TARGET_NAME) \ -+	  --host=$(GNU_TARGET_NAME) \ -+	  --build=$(GNU_HOST_NAME) \ -+	  --prefix=/usr \ -+	  --exec-prefix=/usr \ -+	  --bindir=/usr/bin \ -+	  --datadir=/usr/share \ -+	  --includedir=/usr/include \ -+	  --infodir=/usr/share/info \ -+	  --libdir=/usr/lib \ -+	  --libexecdir=/usr/lib \ -+	  --localstatedir=/var \ -+	  --mandir=/usr/share/man \ -+	  --sbindir=/usr/sbin \ -+	  --sysconfdir=/etc \ -+	  $(DISABLE_NLS) \ -+	  $(CONFIGURE_OPTS) \ -+ -+	touch .stamp-configured -+ -+ -+.stamp-built: .stamp-configured -+ -+	$(MAKE) \ -+	  $(TARGET_CONFIGURE_OPTS) \ -+ -+	touch .stamp-built -+ -+ -+$(INSTALL_DIR)/usr/bin/haserl: .stamp-built -+ -+	mkdir -p $(INSTALL_DIR) -+ -+	$(MAKE) \ -+	  DESTDIR="$(INSTALL_DIR)" \ -+	 install -+	 -+ -+configure: .stamp-configured -+ -+ -+build: .stamp-built -+ -+ -+install: $(INSTALL_DIR)/usr/bin/haserl -+ -+ -+package: $(INSTALL_DIR)/usr/bin/haserl -+ -+	mkdir -p $(I_HASERL)/usr/bin -+	cp -af $(INSTALL_DIR)/usr/bin/haserl $(I_HASERL)/usr/bin/ -+	$(STRIP) $(I_HASERL)/usr/bin/* -+ -+	chmod 0755 ipkg/*/CONTROL/ -+	chmod 0644 ipkg/*/CONTROL/control -+ -+	perl -pi -e "s/^Arch.*:.*/Architecture: $(ARCH)/g" ipkg/*/CONTROL/control -+ifneq ($(strip $(PKG_VERSION)),) -+	perl -pi -e "s/^Vers.*:.*/Version: $(PKG_VERSION)/g" ipkg/*/CONTROL/control -+endif -+ -+	$(IPKG_BUILD) $(I_HASERL) $(IPKG_TARGET_DIR) -+ -+ -+clean: -+ -+	-$(MAKE) clean -+	rm -rf .stamp-* -+	rm -rf $(INSTALL_DIR)/usr/bin/haserl -+	rm -rf $(INSTALL_DIR)/usr/share/haserl -+	rm -rf $(INSTALL_DIR)/usr/share/man/man*/haserl* -+	rm -rf $(I_HASERL)/usr -+ -+ -+control: -+ -+	@cat $(I_HASERL)/CONTROL/control -+	@echo -+	 -+ -+.PHONY: configure build install package clean control -diff -ruN haserl-0.7.3-orig/ipkg/version haserl-0.7.3-3/ipkg/version ---- haserl-0.7.3-orig/ipkg/version	1970-01-01 01:00:00.000000000 +0100 -+++ haserl-0.7.3-3/ipkg/version	2005-03-06 18:12:42.000000000 +0100 -@@ -0,0 +1 @@ -+0.7.3-3 diff --git a/package/haserl/ipkg/haserl/CONTROL/control b/package/haserl/ipkg/haserl/CONTROL/control new file mode 100644 index 000000000..1ab2bdad5 --- /dev/null +++ b/package/haserl/ipkg/haserl/CONTROL/control @@ -0,0 +1,8 @@ +Package: haserl +Priority: optional +Section: web +Version: [TBDL] +Architecture: [TBDL] +Maintainer: Nico <nthill@free.fr> +Source: http://nthill.free.fr/openwrt/sources/haserl/ +Description: a CGI wrapper to embed shell scripts in HTML documents diff --git a/package/haserl/ipkg/rules b/package/haserl/ipkg/rules new file mode 100644 index 000000000..fd1659551 --- /dev/null +++ b/package/haserl/ipkg/rules @@ -0,0 +1,117 @@ +#!/usr/bin/make -f + +ifneq ($(strip ${IPKG_RULES_INC}),) + include $(IPKG_RULES_INC) +endif + +## + +PKG_VERSION := $(shell cat ./ipkg/version) +CURRENT_DIR := $(shell pwd) +INSTALL_DIR ?= $(CURRENT_DIR)/ipkg-install + +unexport INSTALL_DIR + +I_HASERL := ipkg/haserl + +BUILD_DEPS := \ + +CONFIGURE_OPTS = \ +	--enable-variable-prefix="" \ + +## + +all: package + + +.stamp-configured: $(BUILD_DEPS) + +	rm -rf config.cache +	$(TARGET_CONFIGURE_OPTS) \ +	CFLAGS="$(TARGET_CFLAGS) -DMAX_UPLOAD_KB=8192" \ +	./configure \ +	  --target=$(GNU_TARGET_NAME) \ +	  --host=$(GNU_TARGET_NAME) \ +	  --build=$(GNU_HOST_NAME) \ +	  --program-prefix="" \ +	  --program-suffix="" \ +	  --prefix=/usr \ +	  --exec-prefix=/usr \ +	  --bindir=/usr/bin \ +	  --datadir=/usr/share \ +	  --includedir=/usr/include \ +	  --infodir=/usr/share/info \ +	  --libdir=/usr/lib \ +	  --libexecdir=/usr/lib \ +	  --localstatedir=/var \ +	  --mandir=/usr/share/man \ +	  --sbindir=/usr/sbin \ +	  --sysconfdir=/etc \ +	  $(DISABLE_LARGEFILE) \ +	  $(DISABLE_NLS) \ +	  $(CONFIGURE_OPTS) \ + +	touch .stamp-configured + + +.stamp-built: .stamp-configured + +	$(MAKE) \ +	  $(TARGET_CONFIGURE_OPTS) \ + +	touch .stamp-built + + +$(INSTALL_DIR)/usr/bin/haserl: .stamp-built + +	mkdir -p $(INSTALL_DIR) + +	$(MAKE) \ +	  DESTDIR="$(INSTALL_DIR)" \ +	 install +	 + +configure: .stamp-configured + + +build: .stamp-built + + +install: $(INSTALL_DIR)/usr/bin/haserl + + +package: $(INSTALL_DIR)/usr/bin/haserl + +	mkdir -p $(I_HASERL)/usr/bin +	cp -af $(INSTALL_DIR)/usr/bin/haserl $(I_HASERL)/usr/bin/ +	$(STRIP) $(I_HASERL)/usr/bin/* + +	chmod 0755 ipkg/*/CONTROL/ +	chmod 0644 ipkg/*/CONTROL/control + +	perl -pi -e "s/^Arch.*:.*/Architecture: $(ARCH)/g" ipkg/*/CONTROL/control +ifneq ($(strip $(PKG_VERSION)),) +	perl -pi -e "s/^Vers.*:.*/Version: $(PKG_VERSION)/g" ipkg/*/CONTROL/control +endif + +	$(IPKG_BUILD) $(I_HASERL) $(IPKG_TARGET_DIR) + + +clean: + +	-$(MAKE) \ +	  DESTDIR="$(INSTALL_DIR)" \ +	 uninstall clean + +	rm -rf \ +	  .stamp-* \ +	  $(I_HASERL)/usr + + +control: + +	@cat $(I_HASERL)/CONTROL/control +	@echo +	 + +.PHONY: configure build install package clean control diff --git a/package/haserl/ipkg/version b/package/haserl/ipkg/version new file mode 100644 index 000000000..8e9761808 --- /dev/null +++ b/package/haserl/ipkg/version @@ -0,0 +1 @@ +0.8.0-1 | 
