fix typo in Openswan control file, closes #465

[openwrt.git] / openwrt / package / dsniff / Makefile

diff --git a/openwrt/package/dsniff/Makefile b/openwrt/package/dsniff/Makefile
index 2f95d6a..bad1222 100644 (file)
--- a/openwrt/package/dsniff/Makefile
+++ b/openwrt/package/dsniff/Makefile
@@ -3,22 +3,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dsniff
-PKG_VERSION:=2.3
-PKG_RELEASE:=1
-PKG_MD5SUM:=183e336a45e38013f3af840bddec44b4
+PKG_VERSION:=2.4b1
+PKG_RELEASE:=2
+PKG_MD5SUM:=2f761fa3475682a7512b0b43568ee7d6
 
-PKG_SOURCE_URL:=http://www.monkey.org/~dugsong/dsniff/
+PKG_SOURCE_URL:=http://www.monkey.org/~dugsong/dsniff/beta
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-2.4
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,DSNIFF,dsniff,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
@@ -32,7 +32,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                  --program-suffix="" \
                  --prefix=/usr \
                  --exec-prefix=/usr \
-                 --bindir=/usr/sbin \
+                 --bindir=/usr/bin \
                  --datadir=/usr/share \
                  --includedir=/usr/include \
                  --infodir=/usr/share/info \
@@ -43,6 +43,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                  --sbindir=/usr/sbin \
                  --sysconfdir=/etc \
                  --without-db \
+                 --without-x \
                  --with-gdbm="$(STAGING_DIR)/usr" \
                  --with-libnids="$(STAGING_DIR)/usr" \
                  --with-libpcap="$(STAGING_DIR)/usr" \
@@ -65,7 +66,11 @@ $(PKG_BUILD_DIR)/.built:
 $(IPKG_DSNIFF):
        install -d -m0755 $(IDIR_DSNIFF)/usr/lib
        install -d -m0755 $(IDIR_DSNIFF)/usr/sbin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_DSNIFF)/usr/sbin
-       cp -fpR  $(PKG_INSTALL_DIR)/usr/lib/* $(IDIR_DSNIFF)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_DSNIFF)/usr/sbin
+       $(CP)  $(PKG_INSTALL_DIR)/usr/lib/* $(IDIR_DSNIFF)/usr/lib
        $(RSTRIP) $(IDIR_DSNIFF)
        $(IPKG_BUILD) $(IDIR_DSNIFF) $(PACKAGE_DIR)
+
+mostlyclean:
+       make -C $(PKG_BUILD_DIR) clean
+       rm $(PKG_BUILD_DIR)/.built