remove intrusive STAGING_DIR references in the patches, cleanup

git-svn-id: svn://svn.openwrt.org/openwrt/packages@5341 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/ulogd/Makefile b/net/ulogd/Makefile
index 27f942c..196ef02 100644 (file)
--- a/net/ulogd/Makefile
+++ b/net/ulogd/Makefile
@@ -11,26 +11,29 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=ulogd
 PKG_VERSION:=1.24
 PKG_RELEASE:=1
-PKG_MD5SUM:=05b4ed2926b9a22aaeaf642917bbf8ff
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/ulogd/ \
        ftp://ftp.be.netfilter.org/pub/netfilter/ulogd/ \
        ftp://ftp.de.netfilter.org/pub/netfilter/ulogd/ \
        ftp://ftp.no.netfilter.org/pub/netfilter/ulogd/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_MD5SUM:=05b4ed2926b9a22aaeaf642917bbf8ff
 PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-define Package/ulogd
+define Package/ulogd/Default
   SECTION:=net
   CATEGORY:=Network
+  URL:=http://gnumonks.org/projects/ulogd
+endef
+
+define Package/ulogd
+  $(call Package/ulogd/Default)
   DEPENDS:=+iptables
-  MENU:=1
   TITLE:=Netfilter userspace logging daemon
-  DESCRIPTION:=The netfilter userspace logging daemon\\\
-  URL:=http://gnumonks.org/projects/ulogd
+  MENU:=1
 endef
 
 define Package/ulogd/conffiles
@@ -39,85 +42,84 @@ define Package/ulogd/conffiles
 endef
 
 define Package/ulogd-mod-mysql
-  SECTION:=net
-  CATEGORY:=Network
+  $(call Package/ulogd/Default)
   DEPENDS:=ulogd +libmysqlclient
-  TITLE:=Output plugin for logging into a MySQL database
+  TITLE:=Output plugin for logging to a MySQL database
 endef
 
 define Package/ulogd-mod-pcap
-  SECTION:=net
-  CATEGORY:=Network
+  $(call Package/ulogd/Default)
   DEPENDS:=ulogd +libpcap
-  TITLE:=Output plugin for logging into pcap format
+  TITLE:=Output plugin for logging in pcap format
 endef
 
 define Package/ulogd-mod-pgsql
-  SECTION:=net
-  CATEGORY:=Network
+  $(call Package/ulogd/Default)
   DEPENDS:=ulogd +libpq
-  TITLE:=Output plugin for logging into a PostgreSQL database
+  TITLE:=Output plugin for logging to a PostgreSQL database
 endef
 
 define Package/ulogd-mod-sqlite
-  SECTION:=net
-  CATEGORY:=Network
+  $(call Package/ulogd/Default)
   DEPENDS:=ulogd +libsqlite3
-  TITLE:=Output plugin for logging into an SQLite database
+  TITLE:=Output plugin for logging to an SQLite database
 endef
 
 define Package/ulogd-mod-extra
-  SECTION:=net
-  CATEGORY:=Network
+  $(call Package/ulogd/Default)
   DEPENDS:=ulogd
-  TITLE:=All other plugins
+  TITLE:=Extra plugins
+  DESCRIPTION:=\
+       This package contains the LOCAL, LOGEMU, OPRINT, PWSNIFF and SYSLOG plugins.
 endef
 
 include $(INCLUDE_DIR)/package.mk
 
 ifneq ($(Package/ulogd-mod-mysql),)
-ULOGD_MYSQL_OPTION:=--with-mysql=$(STAGING_DIR)/usr
+  ULOGD_MYSQL_OPTION:= --with-mysql="$(STAGING_DIR)/usr"
 endif
 
 ifneq ($(Package/ulogd-mod-pcap),)
-ULOGD_PCAP_HEADER:=yes
+  ULOGD_PCAP_HEADER:=yes
 else
-ULOGD_PCAP_HEADER:=no
+  ULOGD_PCAP_HEADER:=no
 endif
 
 ifneq ($(Package/ulogd-mod-pgsql),)
-ULOGD_PGSQL_OPTION:=--with-pgsql=$(STAGING_DIR)/usr
+  ULOGD_PGSQL_OPTION:= --with-pgsql="$(STAGING_DIR)/usr"
 endif
 
 ifneq ($(Package/ulogd-mod-sqlite),)
-ULOGD_SQLITE_OPTION:=--with-sqlite3=$(STAGING_DIR)/usr
+  ULOGD_SQLITE_OPTION:= --with-sqlite3="$(STAGING_DIR)/usr"
 endif
 
 define Build/Configure
-$(call Build/Configure/Default,--enable-shared \
-                       --disable-static \
-                       $(ULOGD_MYSQL_OPTION) \
-                       $(ULOGD_PGSQL_OPTION) \
-                       $(ULOGD_SQLITE_OPTION),ac_cv_header_pcap_h=$(ULOGD_PCAP_HEADER))
+       $(call Build/Configure/Default, \
+               $(ULOGD_MYSQL_OPTION) \
+               $(ULOGD_PGSQL_OPTION) \
+               $(ULOGD_SQLITE_OPTION) \
+               , \
+               ac_cv_header_pcap_h=$(ULOGD_PCAP_HEADER) \
+       )
 endef
 
 define Build/Compile
-$(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" \
-               STAGING_DIR=$(STAGING_DIR) \
-               all install)
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               all install
 endef
 
 define Package/ulogd/install   
        install -d -m0755 $(1)/etc
        $(CP) $(PKG_INSTALL_DIR)/etc/ulogd.conf $(1)/etc/
+       install -d -m0755 $(1)/usr/sbin
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ulogd $(1)/usr/sbin/
+       install -d -m0755 $(1)/usr/lib/ulogd
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_BASE.so $(1)/usr/lib/ulogd/
        install -d -m0755 $(1)/etc/default
        install -m0644 ./files/ulogd.default $(1)/etc/default/ulogd
        install -d -m0755 $(1)/etc/init.d
        install -m0755 ./files/ulogd.init $(1)/etc/init.d/ulogd
-       install -d -m0755 $(1)/usr/lib/ulogd
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_BASE.so $(1)/usr/lib/ulogd/
-       install -d -m0755 $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ulogd $(1)/usr/sbin/
 endef
 
 define BuildPlugin

diff --git a/net/ulogd/patches/ulogd-1.23-pcap_ldflags.patch b/net/ulogd/patches/ulogd-1.23-pcap_ldflags.patch
index d451823..c97d879 100644 (file)
--- a/net/ulogd/patches/ulogd-1.23-pcap_ldflags.patch
+++ b/net/ulogd/patches/ulogd-1.23-pcap_ldflags.patch
@@ -6,7 +6,7 @@ diff -urN ulogd-1.23/pcap/Makefile.in ulogd-1.23.new/pcap/Makefile.in
  
  $(SHARED_LIBS): %.so: %_sh.o
 -      $(LD) -shared -o $@ $< -lc -lpcap
-+      $(LD) -shared -o $@ $< -lc -lpcap -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
- 
++      $(LD) -shared -o $@ $< @LDFLAGS@ -lc -lpcap 
+
  %_sh.o: %.c
        $(CC) $(SH_CFLAGS) -o $@ -c $<