From 1a7426ff6b6cba7db565b897d23b57a7a1177aa9 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 20 Dec 2005 13:19:49 +0000
Subject: add ipkg/conffiles, add Id tag to the Makefile, standardize.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2738 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
package/ipcad/Config.in | 20 ++++----
package/ipcad/Makefile | 69 +++++++++++++++++----------
package/ipcad/ipkg/ipcad.conffiles | 1 +
package/ipcad/ipkg/ipcad.control | 0
package/ipcad/patches/01-honor_cppflags.patch | 11 +++++
5 files changed, 66 insertions(+), 35 deletions(-)
mode change 100755 => 100644 package/ipcad/Config.in
mode change 100755 => 100644 package/ipcad/Makefile
create mode 100644 package/ipcad/ipkg/ipcad.conffiles
mode change 100755 => 100644 package/ipcad/ipkg/ipcad.control
create mode 100644 package/ipcad/patches/01-honor_cppflags.patch
(limited to 'package/ipcad')
diff --git a/package/ipcad/Config.in b/package/ipcad/Config.in
old mode 100755
new mode 100644
index c38731f9c..fa5d0e91f
--- a/package/ipcad/Config.in
+++ b/package/ipcad/Config.in
@@ -1,10 +1,12 @@
config BR2_PACKAGE_IPCAD
- tristate "ipcad............................. listens for traffic on the specified interfaces"
- default m if CONFIG_DEVEL
- select BR2_PACKAGE_LIBPCAP
- help
- This daemon listens for traffic on the specified interfaces.
- It has the built-in RSH and NetFlow engines to allow exporting
- the accounting data the same way as Cisco routers do.
-
- http://lionet.info/ipcad/
+ prompt "ipcad............................. listens for traffic on the specified interfaces"
+ tristate
+ default m if CONFIG_DEVEL
+ select BR2_PACKAGE_LIBPCAP
+ help
+ This daemon listens for traffic on the specified interfaces.
+ It has the built-in RSH and NetFlow engines to allow exporting
+ the accounting data the same way as Cisco routers do.
+
+ http://lionet.info/ipcad/
+
diff --git a/package/ipcad/Makefile b/package/ipcad/Makefile
old mode 100755
new mode 100644
index 749500fa6..870362aee
--- a/package/ipcad/Makefile
+++ b/package/ipcad/Makefile
@@ -1,14 +1,17 @@
+# $Id$
+
include $(TOPDIR)/rules.mk
PKG_NAME:=ipcad
PKG_VERSION:=3.7
PKG_RELEASE:=1
PKG_MD5SUM:=34c542c99593dfe9d5b408deffcfe70e
+
PKG_SOURCE_URL:=@SF/ipcad
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_CAT:=zcat
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
include $(TOPDIR)/package/rules.mk
@@ -17,37 +20,51 @@ $(eval $(call PKG_template,IPCAD,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARC
$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -L$(STAGING_DIR)/usr/lib" \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --mandir=/usr/man \
- --mandir=/usr/man \
- --infodir=/usr/info \
- --program-prefix="" \
- --with-gnu-ld \
- --with-psrc=pcap \
- --with-pcap-include=$(STAGING_DIR)/usr/include \
- --with-pcap-libraries=$(STAGING_DIR)/usr/lib \
+ touch cfglex.c cslex.c; \
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+ ./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) \
+ --enable-shared \
+ --disable-static \
+ --disable-rpath \
+ --with-gnu-ld \
+ --with-psrc=pcap \
+ --with-pcap-include="$(STAGING_DIR)/usr/include" \
+ --with-pcap-libraries="$(STAGING_DIR)/usr/lib" \
);
touch $@
$(PKG_BUILD_DIR)/.built:
- $(MAKE) STAGING_DIR=$(STAGING_DIR) DESTDIR=$(PKG_INSTALL_DIR) -C $(PKG_BUILD_DIR) install
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ DESTDIR=$(PKG_INSTALL_DIR) \
+ all install
touch $@
$(IPKG_IPCAD):
- mkdir -p $(IDIR_IPCAD)
- cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_IPCAD)/
+ install -d -m0755 $(IDIR_IPCAD)/etc
+ cp -fpR $(PKG_INSTALL_DIR)/etc/ipcad.conf $(IDIR_IPCAD)/etc/
+ install -d -m0755 $(IDIR_IPCAD)/usr/bin
+ cp -fpR $(PKG_INSTALL_DIR)/usr/bin/ipcad $(IDIR_IPCAD)/usr/bin/
$(RSTRIP) $(IDIR_IPCAD)
$(IPKG_BUILD) $(IDIR_IPCAD) $(PACKAGE_DIR)
diff --git a/package/ipcad/ipkg/ipcad.conffiles b/package/ipcad/ipkg/ipcad.conffiles
new file mode 100644
index 000000000..f6843d846
--- /dev/null
+++ b/package/ipcad/ipkg/ipcad.conffiles
@@ -0,0 +1 @@
+/etc/ipcad.conf
diff --git a/package/ipcad/ipkg/ipcad.control b/package/ipcad/ipkg/ipcad.control
old mode 100755
new mode 100644
diff --git a/package/ipcad/patches/01-honor_cppflags.patch b/package/ipcad/patches/01-honor_cppflags.patch
new file mode 100644
index 000000000..55f988841
--- /dev/null
+++ b/package/ipcad/patches/01-honor_cppflags.patch
@@ -0,0 +1,11 @@
+diff -ruN ipcad-3.7-old/Makefile.in ipcad-3.7-new/Makefile.in
+--- ipcad-3.7-old/Makefile.in 2005-11-21 05:41:07.000000000 +0100
++++ ipcad-3.7-new/Makefile.in 2005-12-20 10:27:07.000000000 +0100
+@@ -9,6 +9,7 @@
+ LDFLAGS+= @LDFLAGS@
+ LIBS+= @LIBS@
+ CFLAGS+= @CFLAGS@ @DEFS@ -W -Wall
++CPPFLAGS+= @CPPFLAGS@
+ CPPFLAGS+=-DIPCAD_VERSION=\"@IPCAD_VERSION@\"
+ CPPFLAGS+=-DCONFIG_FILE=\"${sysconfdir}/ipcad.conf\"
+ CPPFLAGS+=@DEFS@ -D_REENTRANT -D_THREAD_SAFE
--
cgit v1.2.3