diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/wifidog | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/wifidog')
| -rw-r--r-- | package/wifidog/Makefile | 16 | ||||
| -rw-r--r-- | package/wifidog/files/wifidog.conffiles (renamed from package/wifidog/ipkg/wifidog.conffiles) | 0 | ||||
| -rw-r--r-- | package/wifidog/files/wifidog.init | 4 | ||||
| -rw-r--r-- | package/wifidog/files/wifidog.postinst (renamed from package/wifidog/ipkg/wifidog.postinst) | 0 | ||||
| -rw-r--r-- | package/wifidog/ipkg/wifidog.control | 8 |
5 files changed, 10 insertions, 18 deletions
diff --git a/package/wifidog/Makefile b/package/wifidog/Makefile index 591f71403..e12bf91e5 100644 --- a/package/wifidog/Makefile +++ b/package/wifidog/Makefile @@ -9,26 +9,24 @@ PKG_NAME:= wifidog PKG_VERSION:= 1.1.5 PKG_RELEASE:= 1 PKG_MD5SUM:= abe5f7123179a0f08c493ce59fb3cb31 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/} +PKG_DESCR:= a complete and embeddable captive portal +PKG_SECTION:= net +PKG_DEPENDS:= iptables +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,WIFIDOG,wifidog,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,WIFIDOG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu -CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_memcmp_working=yes \ +CONFIGURE_ENV+= ac_cv_func_memcmp_working=yes \ ac_cv_func_setvbuf_reversed=no BUILD_STYLE+= auto INSTALL_STYLE:= auto post-install: - ${INSTALL_DIR} ${IDIR_WIFIDOG}/etc/init.d/ - ${INSTALL_BIN} ./files/${PKG_NAME}.init \ - ${IDIR_WIFIDOG}/etc/init.d/wifidog + ${INSTALL_DIR} ${IDIR_WIFIDOG}/usr/{bin,lib} ${IDIR_WIFIDOG}/etc ${INSTALL_DATA} ./files/wifidog.conf ${IDIR_WIFIDOG}/etc/ - ${INSTALL_DIR} ${IDIR_WIFIDOG}/usr/bin - ${INSTALL_DIR} ${IDIR_WIFIDOG}/usr/lib ${INSTALL_BIN} ${WRKBUILD}/scripts/init.d/wifidog ${IDIR_WIFIDOG}/usr/bin/wifidog-init ${INSTALL_BIN} ${WRKINST}/usr/bin/wifidog \ ${WRKINST}/usr/bin/wdctl ${IDIR_WIFIDOG}/usr/bin/ diff --git a/package/wifidog/ipkg/wifidog.conffiles b/package/wifidog/files/wifidog.conffiles index aaa3dd140..aaa3dd140 100644 --- a/package/wifidog/ipkg/wifidog.conffiles +++ b/package/wifidog/files/wifidog.conffiles diff --git a/package/wifidog/files/wifidog.init b/package/wifidog/files/wifidog.init index 4a23a8e34..f3ee5752c 100644 --- a/package/wifidog/files/wifidog.init +++ b/package/wifidog/files/wifidog.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 65 +#PKG wifidog +#INIT 65 + . /etc/rc.conf case $1 in diff --git a/package/wifidog/ipkg/wifidog.postinst b/package/wifidog/files/wifidog.postinst index e778a2300..e778a2300 100644 --- a/package/wifidog/ipkg/wifidog.postinst +++ b/package/wifidog/files/wifidog.postinst diff --git a/package/wifidog/ipkg/wifidog.control b/package/wifidog/ipkg/wifidog.control deleted file mode 100644 index 18d498552..000000000 --- a/package/wifidog/ipkg/wifidog.control +++ /dev/null @@ -1,8 +0,0 @@ -Package: wifidog -Priority: optional -Section: net -Depends: iptables, iptables-extra, kmod-iptables-extra -Description: WiFiDog is a complete and embeddable captive portal - solution for wireless community groups or individuals who - wish to open a free Hotspot while still preventing abuse - of their Internet connection. |