From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 7 Feb 2010 20:03:20 +0100
Subject: change defaults for CONFIG/BUILD/INSTALL styles

All packages need an update, so here is a very huge commit.
Most of the 460 source packages use automatic style for configuration,
building and installing. Make these styles default to "auto".
If you have a package, which does not conform to this, just use
manual style and add a do-$task make target.

I added a new style named AUTOTOOL style, which is needed for some
broken packages, which needs to be updated via autoconf or automake.

I renamed CONFIGURE_STYLE to CONFIG_STYLE.

Updates for some packages, which have newer upstream versions.

Renaming of all package/*/extra directories. Use the directory
src/ to provide overwrites of source files or to add the code, when
no upstream package is available or used. src directory will be automatically
used.
---
 package/opensips/Makefile           |  9 +++++++--
 package/opensips/files/opensips.cfg | 16 ++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'package/opensips')

diff --git a/package/opensips/Makefile b/package/opensips/Makefile
index dd48a61de..fa0218885 100644
--- a/package/opensips/Makefile
+++ b/package/opensips/Makefile
@@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		opensips
 PKG_VERSION:=		1.5.1
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		87c6fe40c143775d6a1be1beb75c3eb2
 PKG_DESCR:=		a high-performance, configurable, free SIP server
 PKG_SECTION:=		net
+PKG_BUILDDEP+=		openssl
 PKG_MULTI:=		1
 PKG_VARIANT:=		tls
 PKG_URL:=		http://opensips.org
@@ -85,6 +85,10 @@ OPENSIPS_MODULES:=	sl tm rr maxfwd usrloc registrar db_text textops exec mi_fifo
 OPENSIPS_MODULE_FILES:=	$(foreach module,$(OPENSIPS_MODULES),modules/$(module)/$(module).so)
 OPENSIPS_MODULES:=	$(patsubst %,modules/%,$(OPENSIPS_MODULES))
 
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 do-build:
 	$(MAKE) -C $(WRKBUILD) \
 		prefix=/ \
@@ -105,7 +109,8 @@ do-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
 	${INSTALL_DIR} $(IDIR_OPENSIPS)/usr/lib/opensips/modules
 	$(CP) $(WRKBUILD)/$(PKG_NAME) $(IDIR_OPENSIPS)/usr/sbin/
 	(cd $(WRKBUILD);\
-		$(CP) $(OPENSIPS_MODULE_FILES) $(IDIR_OPENSIPS)/usr/lib/opensips/modules/; \
+		$(CP) $(OPENSIPS_MODULE_FILES) \
+		$(IDIR_OPENSIPS)/usr/lib/opensips/modules/; \
 	)
 	$(CP) ./files/opensips.cfg $(IDIR_OPENSIPS)/etc/opensips/
 
diff --git a/package/opensips/files/opensips.cfg b/package/opensips/files/opensips.cfg
index e94262ebe..dbc14024d 100644
--- a/package/opensips/files/opensips.cfg
+++ b/package/opensips/files/opensips.cfg
@@ -1,7 +1,7 @@
 #
 #
 # simple quick-start config script
-# Please refer to the Core CookBook at http://www.openser.org/dokuwiki/doku.php
+# Please refer to the Core CookBook at http://www.opensips.org/dokuwiki/doku.php
 # for a explanation of possible statements, functions and parameters.
 #
 
@@ -26,14 +26,14 @@ port=5060
 #tls_verify_client = 1
 #tls_require_client_certificate = 0
 #tls_method = TLSv1
-#tls_certificate = "/usr/local/etc/openser/tls/user/user-cert.pem"
-#tls_private_key = "/usr/local/etc/openser/tls/user/user-privkey.pem"
-#tls_ca_list = "/usr/local/etc/openser/tls/user/user-calist.pem"
+#tls_certificate = "/usr/local/etc/opensips/tls/user/user-cert.pem"
+#tls_private_key = "/usr/local/etc/opensips/tls/user/user-privkey.pem"
+#tls_ca_list = "/usr/local/etc/opensips/tls/user/user-calist.pem"
 
 # ------------------ module loading ----------------------------------
 
 #set module path
-mpath="/usr/lib/openser/modules/"
+mpath="/usr/lib/opensips/modules/"
 
 # Uncomment this if you want to use SQL database
 #loadmodule "mysql.so"
@@ -56,7 +56,7 @@ loadmodule "mi_fifo.so"
 
 # -- mi_fifo params --
 
-modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo")
+modparam("mi_fifo", "fifo_name", "/tmp/opensips_fifo")
 
 # -- usrloc params --
 
@@ -135,8 +135,8 @@ route{
 		if (method=="REGISTER") {
 
 			# Uncomment this if you want to use digest authentication
-			#if (!www_authorize("openser.org", "subscriber")) {
-			#	www_challenge("openser.org", "0");
+			#if (!www_authorize("opensips.org", "subscriber")) {
+			#	www_challenge("opensips.org", "0");
 			#	exit;
 			#};
 
-- 
cgit v1.2.3