summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--adk/tools/pkgmaker.c33
-rw-r--r--package/asterisk/Makefile38
-rw-r--r--package/findutils/Makefile4
-rw-r--r--package/freeradius-client/Makefile7
-rw-r--r--package/freeradius-server/Makefile33
-rw-r--r--package/hostapd/Makefile2
-rw-r--r--package/lighttpd/Makefile41
-rw-r--r--package/lua/Makefile3
-rw-r--r--package/mini_httpd/Makefile7
-rw-r--r--package/olsrd/Makefile12
-rw-r--r--package/opensips/Makefile56
-rw-r--r--package/openssh/Makefile18
-rw-r--r--package/php/Makefile3
-rw-r--r--package/ppp/Makefile30
-rw-r--r--package/pptp/Makefile2
-rw-r--r--package/quagga/Makefile10
-rw-r--r--package/rp-pppoe/Makefile60
-rw-r--r--package/sane-backends/Makefile80
-rw-r--r--package/squid/Makefile18
-rw-r--r--package/ulogd/Makefile5
-rw-r--r--package/updatedd/Makefile16
21 files changed, 340 insertions, 138 deletions
diff --git a/adk/tools/pkgmaker.c b/adk/tools/pkgmaker.c
index ef10d1120..84eda58bc 100644
--- a/adk/tools/pkgmaker.c
+++ b/adk/tools/pkgmaker.c
@@ -321,7 +321,7 @@ int main() {
char variable[2*MAXVAR];
char *key, *value, *token, *cftoken, *sp, *hkey, *val, *pkg_fd;
char *pkg_name, *pkg_depends, *pkg_depends_system, *pkg_section, *pkg_descr, *pkg_url;
- char *pkg_cxx, *pkg_subpkgs, *pkg_cfline, *pkg_dflt, *pkg_multi;
+ char *pkg_cxx, *pkg_subpkgs, *pkg_cfline, *pkg_dflt;
char *pkg_need_cxx, *pkg_need_java, *pkgname, *sysname, *pkg_debug;
char *pkg_libc_depends, *pkg_host_depends, *pkg_system_depends, *pkg_arch_depends, *pkg_flavours, *pkg_flavours_string, *pkg_choices, *pseudo_name;
char *packages, *pkg_name_u, *pkgs, *pkg_opts, *pkg_libname;
@@ -349,7 +349,6 @@ int main() {
pkg_cxx = NULL;
pkg_dflt = NULL;
pkg_cfline = NULL;
- pkg_multi = NULL;
pkg_need_cxx = NULL;
pkg_need_java = NULL;
pkgname = NULL;
@@ -560,8 +559,6 @@ int main() {
continue;
if ((parse_var(buf, "PKG_NEED_JAVA", NULL, &pkg_need_java)) == 0)
continue;
- if ((parse_var(buf, "PKG_MULTI", NULL, &pkg_multi)) == 0)
- continue;
if ((parse_var(buf, "PKG_DEPENDS", pkg_depends, &pkg_depends)) == 0)
continue;
if ((parse_var_with_system(buf, "PKG_DEPENDS_", pkg_depends_system, &pkg_depends_system, &sysname, 12)) == 0)
@@ -596,6 +593,8 @@ int main() {
continue;
if ((parse_var_hash(buf, "PKGSC_", pkgmap)) == 0)
continue;
+ if ((parse_var_hash(buf, "PKGSN_", pkgmap)) == 0)
+ continue;
}
}
@@ -634,8 +633,6 @@ int main() {
fprintf(stderr, "Package homepage is %s\n", pkg_url);
if (pkg_cfline != NULL)
fprintf(stderr, "Package cfline is %s\n", pkg_cfline);
- if (pkg_multi != NULL)
- fprintf(stderr, "Package multi is %s\n", pkg_multi);
if (pkg_opts != NULL)
fprintf(stderr, "Package options are %s\n", pkg_opts);
@@ -661,9 +658,6 @@ int main() {
if (nobinpkgs == 0) {
fprintf(cfg, "\tdepends on ");
if (pkgs != NULL) {
- if (pkg_multi != NULL)
- if (strncmp(pkg_multi, "1", 1) == 0)
- fprintf(cfg, "ADK_HAVE_DOT_CONFIG || ");
token = strtok(pkgs, " ");
fprintf(cfg, "ADK_PACKAGE_%s", token);
token = strtok(NULL, " ");
@@ -756,11 +750,6 @@ int main() {
}
fprintf(cfg, "\ttristate\n");
- if (pkg_multi != NULL)
- if (strncmp(pkg_multi, "1", 1) == 0)
- if (strncmp(toupperstr(token), toupperstr(pkgdirp->d_name), strlen(pkgdirp->d_name)) != 0)
- fprintf(cfg, "\tdepends on ADK_PACKAGE_%s\n", toupperstr(pkgdirp->d_name));
-
free(pseudo_name);
/* print custom cf line */
@@ -775,6 +764,20 @@ int main() {
}
/* add sub package dependencies */
+ strncat(hkey, "PKGSN_", 6);
+ strncat(hkey, toupperstr(token), strlen(token));
+ memset(hvalue, 0, MAXVALUE);
+ result = strmap_get(pkgmap, hkey, hvalue, sizeof(hvalue));
+ if (result == 1) {
+ val = strtok_r(hvalue, " ", &saveptr);
+ while (val != NULL) {
+ fprintf(cfg, "\tdepends on ADK_PACKAGE_%s\n", toupperstr(val));
+ val = strtok_r(NULL, " ", &saveptr);
+ }
+ }
+ memset(hkey, 0, MAXVAR);
+
+ /* add sub package auto selections */
strncat(hkey, "PKGSS_", 6);
strncat(hkey, toupperstr(token), strlen(token));
memset(hvalue, 0, MAXVALUE);
@@ -1192,7 +1195,6 @@ int main() {
free(pkg_cxx);
free(pkg_dflt);
free(pkg_cfline);
- free(pkg_multi);
pkg_name = NULL;
pkg_libname = NULL;
pkg_descr = NULL;
@@ -1210,7 +1212,6 @@ int main() {
pkg_cxx = NULL;
pkg_dflt = NULL;
pkg_cfline = NULL;
- pkg_multi = NULL;
strmap_delete(pkgmap);
nobinpkgs = 0;
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 6e5ef72ab..d3204c311 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -7,13 +7,12 @@ PKG_NAME:= asterisk
PKG_VERSION:= 1.8.20.1
PKG_RELEASE:= 3
PKG_MD5SUM:= 99204257de80a42c4e287fc93dfe714a
-PKG_DESCR:= Open Source PBX
+PKG_DESCR:= open source PBX
PKG_SECTION:= phone
PKG_DEPENDS:= libncurses libpthread libopenssl libcurl
PKG_BUILDDEP:= ncurses openssl zlib curl popt gtk+
PKG_URL:= http://www.asterisk.org/
PKG_SITES:= http://downloads.asterisk.org/pub/telephony/asterisk/releases/
-PKG_MULTI:= 1
PKG_NOPARALLEL:= 1
PKG_NEED_CXX:= 1
@@ -24,28 +23,43 @@ PKG_LIBC_DEPENDS:= uclibc glibc
PKG_SUBPKGS:= ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS
PKG_SUBPKGS+= ASTERISK_CHAN_SKINNY ASTERISK_CHAN_IAX2 ASTERISK_CODEC_SPEEX ASTERISK_CODEC_GSM
PKG_SUBPKGS+= ASTERISK_PBX_DUNDI ASTERISK_RES_AGI
-PKGSB_ASTERISK_CODEC_SPEEX:= speex
+PKGSD_ASTERISK_VOICEMAIL:= voicemail support
+PKGSN_ASTERISK_VOICEMAIL:= asterisk
+PKGSD_ASTERISK_CODEC_GSM:= GSM codec support
+PKGSN_ASTERISK_CODEC_GSM:= asterisk
+PKGSD_ASTERISK_PBX_DUNDI:= PBX dundi support
+PKGSN_ASTERISK_PBX_DUNDI:= asterisk
+PKGSD_ASTERISK_RES_AGI:= res agi support
+PKGSN_ASTERISK_RES_AGI:= asterisk
+PKGSD_ASTERISK_PGSQL:= postgresql support
PKGSB_ASTERISK_PGSQL:= postgresql
+PKGSN_ASTERISK_PGSQL:= asterisk
PKGSD_ASTERISK_CHAN_MGCP:= Media Gateway Control Protocol implementation
-PKGSD_ASTERISK_CHAN_SKINNY:= Skinny Client Control Protocol implementation
-PKGSD_ASTERISK_CHAN_IAX2:= Support for the Inter Asterisk Protocol
-PKGSD_ASTERISK_CODEC_SPEEX:= Speex/PCM16 Codec Translator
-PKGSD_ASTERISK_SOUNDS:= Various soundfiles in GSM format
+PKGSN_ASTERISK_CHAN_MGCP:= asterisk
+PKGSD_ASTERISK_CHAN_SKINNY:= skinny client control protocol implementation
+PKGSN_ASTERISK_CHAN_SKINNY:= asterisk
+PKGSD_ASTERISK_CHAN_IAX2:= support for the Inter Asterisk Protocol
+PKGSN_ASTERISK_CHAN_IAX2:= asterisk
+PKGSD_ASTERISK_CODEC_SPEEX:= speex/PCM16 Codec translator
+PKGSB_ASTERISK_CODEC_SPEEX:= speex
+PKGSN_ASTERISK_CODEC_SPEEX:= asterisk
+PKGSD_ASTERISK_SOUNDS:= various soundfiles in GSM format
+PKGSN_ASTERISK_SOUNDS:= asterisk
PKGSS_ASTERISK_SOUNDS:= asterisk-codec-gsm
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,ASTERISK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_PGSQL},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_VOICEMAIL},${PKG_SECTION}))
$(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_ASTERISK_SOUNDS},${PKGSD_ASTERISK_SOUNDS},${PKG_SECTION}))
#$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_MGCP},${PKG_SECTION}))
$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_SKINNY},${PKG_SECTION}))
$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_IAX2},${PKG_SECTION}))
$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CODEC_SPEEX},${PKG_SECTION}))
-$(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CODEC_GSM},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_PBX_DUNDI},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_RES_AGI},${PKG_SECTION}))
CONFIGURE_ARGS= --with-z=${STAGING_TARGET_DIR}/usr \
--with-ncurses=${STAGING_TARGET_DIR}/usr \
diff --git a/package/findutils/Makefile b/package/findutils/Makefile
index fa0dd0601..350ad0b0a 100644
--- a/package/findutils/Makefile
+++ b/package/findutils/Makefile
@@ -14,14 +14,16 @@ PKG_BUILDDEP:= autotool
HOST_BUILDDEP:= autotool
PKG_URL:= http://www.gnu.org/software/findutils/
PKG_SITES:= http://ftp.gnu.org/pub/gnu/findutils/
-PKG_MULTI:= 1
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= FINDUTILS XARGS LOCATE FIND
PKGSD_LOCATE:= locate utility
+PKGSN_LOCATE:= findutils
PKGSD_XARGS:= xargs utility
+PKGSN_XARGS:= findutils
PKGSD_FIND:= find utility
+PKGSN_FIND:= findutils
include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
diff --git a/package/freeradius-client/Makefile b/package/freeradius-client/Makefile
index 670b745da..a7888561a 100644
--- a/package/freeradius-client/Makefile
+++ b/package/freeradius-client/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 2
PKG_MD5SUM:= edd4d904e802ff66d35532be1475cfa7
PKG_DESCR:= RADIUS client
PKG_SECTION:= ppp
-PKG_DEPENDS:= libopenssl
+PKG_DEPENDS:= libopenssl libfreeradius-client
PKG_BUILDDEP:= openssl
PKG_URL:= http://www.freeradius.org/
PKG_SITES:= ftp://ftp.freeradius.org/pub/radius/
@@ -17,14 +17,13 @@ PKG_SITES:= ftp://ftp.freeradius.org/pub/radius/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= FREERADIUS_CLIENT LIBFREERADIUS_CLIENT
-PKGSS_LIBFREERADIUS_CLIENT:= libs
+PKGSC_LIBFREERADIUS_CLIENT:= libs
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,FREERADIUS_CLIENT,freeradius-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBFREERADIUS_CLIENT,libfreeradius-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSS_LIBFREERADIUS_CLIENT}))
+$(eval $(call PKG_template,LIBFREERADIUS_CLIENT,libfreeradius-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBFREERADIUS_CLIENT}))
-TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ENV+= ac_cv_func_uname=no
freeradius-client-install:
diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index 3f61502cd..d05f35f1e 100644
--- a/package/freeradius-server/Makefile
+++ b/package/freeradius-server/Makefile
@@ -13,7 +13,6 @@ PKG_DEPENDS:= libltdl libopenssl libpthread libpcre
PKG_BUILDDEP:= autotool libtool openssl samba pcre
PKG_URL:= http://www.freeradius.org/
PKG_SITES:= ftp://ftp.freeradius.org/pub/radius/
-PKG_MULTI:= 1
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
@@ -30,20 +29,34 @@ PKGSS_FREERADIUS_MOD_LDAP:= libopenldap
PKGSS_FREERADIUS_MOD_SQL_MYSQL:= libmysqlclient
PKGSS_FREERADIUS_MOD_SQL_PGSQL:= libpq
-PKGSD_FREERADIUS_DEMOCERTS:= Demo certificates to test the server
-PKGSD_FREERADIUS_MOD_CHAP:= CHAP authentication module
-PKGSD_FREERADIUS_MOD_DETAIL:= Detailed accounting module
-PKGSD_FREERADIUS_MOD_DIGEST:= Digest authentication module
-PKGSD_FREERADIUS_MOD_FILES:= Module using local files for authorization
-PKGSD_FREERADIUS_MOD_LDAP:= LDAP module
-PKGSD_FREERADIUS_MOD_MSCHAP:= MS-CHAP and MS-CHAPv2 module
+PKGSD_FREERADIUS_DEMOCERTS:= Demo certificates to test the server
+PKGSN_FREERADIUS_DEMOCERTS:= freeradius-server
+PKGSD_FREERADIUS_MOD_CHAP:= CHAP authentication module
+PKGSN_FREERADIUS_MOD_CHAP:= freeradius-server
+PKGSD_FREERADIUS_MOD_DETAIL:= Detailed accounting module
+PKGSN_FREERADIUS_MOD_DETAIL:= freeradius-server
+PKGSD_FREERADIUS_MOD_DIGEST:= Digest authentication module
+PKGSN_FREERADIUS_MOD_DIGEST:= freeradius-server
+PKGSD_FREERADIUS_MOD_FILES:= Module using local files for authorization
+PKGSN_FREERADIUS_MOD_FILES:= freeradius-server
+PKGSD_FREERADIUS_MOD_LDAP:= LDAP module
+PKGSN_FREERADIUS_MOD_LDAP:= freeradius-server
+PKGSD_FREERADIUS_MOD_MSCHAP:= MS-CHAP and MS-CHAPv2 module
+PKGSN_FREERADIUS_MOD_MSCHAP:= freeradius-server
PKGSD_FREERADIUS_MOD_PAP:= PAP authentication module
+PKGSN_FREERADIUS_MOD_PAP:= freeradius-server
PKGSD_FREERADIUS_MOD_PREPROCESS:= Request pre-processing module
-PKGSD_FREERADIUS_MOD_REALM:= Realms handling module
+PKGSN_FREERADIUS_MOD_PREPROCESS:= freeradius-server
+PKGSD_FREERADIUS_MOD_REALM:= Realms handling module
+PKGSN_FREERADIUS_MOD_REALM:= freeradius-server
PKGSD_FREERADIUS_MOD_SQL:= Base SQL module
+PKGSN_FREERADIUS_MOD_SQL:= freeradius-server
PKGSD_FREERADIUS_MOD_SQL_MYSQL:= MySQL module
+PKGSN_FREERADIUS_MOD_SQL_MYSQL:= freeradius-server
PKGSD_FREERADIUS_MOD_SQL_PGSQL:= PostgreSQL module
-PKGSD_FREERADIUS_UTILS:= Misc. client utilities
+PKGSN_FREERADIUS_MOD_SQL_PGSQL:= freeradius-server
+PKGSD_FREERADIUS_UTILS:= Misc. client utilities
+PKGSN_FREERADIUS_UTILS:= freeradius-server
PKG_CONFIGURE_OPTS:=
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index f5810f380..44a5ae16c 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -13,7 +13,6 @@ PKG_DEPENDS:= libnl
PKG_BUILDDEP:= libnl
PKG_URL:= http://hostap.epitest.fi/
PKG_SITES:= http://hostap.epitest.fi/releases/
-PKG_MULTI:= 1
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
@@ -25,6 +24,7 @@ PKGCB_WITH_OPENSSL:= openssl
PKGCD_WITH_GNUTLS:= use GnuTLS for crypto
PKGCS_WITH_GNUTLS:= libgnutls
PKGCB_WITH_GNUTLS:= gnutls
+PKGSN_HOSTAPD_UTILS:= hostapd
WRKSRC= ${WRKDIST}/${PKG_NAME}
diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile
index 1b360ab47..6b639ed0c 100644
--- a/package/lighttpd/Makefile
+++ b/package/lighttpd/Makefile
@@ -12,7 +12,6 @@ PKG_SECTION:= www
PKG_DEPENDS:= libgcc
PKG_URL:= http://www.lighttpd.net/
PKG_SITES:= http://download.lighttpd.net/lighttpd/releases-1.4.x/
-PKG_MULTI:= 1
PKG_FLAVOURS_LIGHTTPD:= WITH_IPV6 WITH_SSL
PKGFD_WITH_IPV6:= enable IPv6 support
@@ -21,30 +20,46 @@ PKGFB_WITH_SSL:= openssl
PKGFS_WITH_SSL:= libopenssl
PKG_SUBPKGS:= LIGHTTPD LIGHTTPD_MOD_ALIAS LIGHTTPD_MOD_AUTH
-PKG_SUBPKGS+= LIGHTTPD_MOD_CGI LIGHTTPD_MOD_DIRLISTING LIGHTTPD_MOD_EVASIVE LIGHTTPD_MOD_EXPIRE LIGHTTPD_MOD_FASTCGI
+PKG_SUBPKGS+= LIGHTTPD_MOD_CGI LIGHTTPD_MOD_DIRLIST LIGHTTPD_MOD_EVASIVE LIGHTTPD_MOD_EXPIRE LIGHTTPD_MOD_FASTCGI
PKG_SUBPKGS+= LIGHTTPD_MOD_PROXY LIGHTTPD_MOD_REDIRECT LIGHTTPD_MOD_REWRITE LIGHTTPD_MOD_SETENV
-PKG_SUBPKGS+= LIGHTTPD_MOD_SIMPLE_VHOST LIGHTTPD_MOD_SSI LIGHTTPD_MOD_STATUS LIGHTTPD_MOD_USERTRACK
+PKG_SUBPKGS+= LIGHTTPD_MOD_VHOST LIGHTTPD_MOD_SSI LIGHTTPD_MOD_STATUS LIGHTTPD_MOD_USERTRACK
PKG_SUBPKGS+= LIGHTTPD_MOD_WEBDAV
PKGSD_LIGHTTPD_MOD_ALIAS:= alias support
+PKGSN_LIGHTTPD_MOD_ALIAS:= lighttpd
PKGSD_LIGHTTPD_MOD_AUTH:= authentication support
+PKGSN_LIGHTTPD_MOD_AUTH:= lighttpd
PKGSD_LIGHTTPD_MOD_CGI:= CGI support
-PKGSD_LIGHTTPD_MOD_DIRLISTING:= Dirlisting support
-PKGSB_LIGHTTPD_MOD_DIRLISTING:= pcre
-PKGSS_LIGHTTPD_MOD_DIRLISTING:= libpcre
+PKGSN_LIGHTTPD_MOD_CGI:= lighttpd
+PKGSD_LIGHTTPD_MOD_DIRLIST:= Dirlisting support
+PKGSB_LIGHTTPD_MOD_DIRLIST:= pcre
+PKGSS_LIGHTTPD_MOD_DIRLIST:= libpcre
+PKGSN_LIGHTTPD_MOD_DIRLIST:= lighttpd
PKGSD_LIGHTTPD_MOD_EVASIVE:= Evasive support
+PKGSN_LIGHTTPD_MOD_EVASIVE:= lighttpd
PKGSD_LIGHTTPD_MOD_EXPIRE:= Expire support
+PKGSN_LIGHTTPD_MOD_EXPIRE:= lighttpd
PKGSD_LIGHTTPD_MOD_FASTCGI:= FastCGI support
+PKGSN_LIGHTTPD_MOD_FASTCGI:= lighttpd
PKGSD_LIGHTTPD_MOD_PROXY:= Proxy support
+PKGSN_LIGHTTPD_MOD_PROXY:= lighttpd
PKGSD_LIGHTTPD_MOD_REDIRECT:= Redirect support
+PKGSN_LIGHTTPD_MOD_REDIRECT:= lighttpd
PKGSD_LIGHTTPD_MOD_REWRITE:= Rewrite support
+PKGSN_LIGHTTPD_MOD_REWRITE:= lighttpd
PKGSD_LIGHTTPD_MOD_SETENV:= Setenv support
-PKGSD_LIGHTTPD_MOD_SIMPLE_VHOST:= Simple Vhost support
+PKGSN_LIGHTTPD_MOD_SETENV:= lighttpd
+PKGSD_LIGHTTPD_MOD_VHOST:= Simple Vhost support
+PKGSN_LIGHTTPD_MOD_VHOST:= lighttpd
PKGSD_LIGHTTPD_MOD_SSI:= SSI support
+PKGSN_LIGHTTPD_MOD_SSI:= lighttpd
PKGSD_LIGHTTPD_MOD_STATUS:= Status support
+PKGSN_LIGHTTPD_MOD_STATUS:= lighttpd
PKGSD_LIGHTTPD_MOD_USERTRACK:= Usertracking support
+PKGSN_LIGHTTPD_MOD_USERTRACK:= lighttpd
PKGSD_LIGHTTPD_MOD_WEBDAV:= Webdav support
PKGSB_LIGHTTPD_MOD_WEBDAV:= libxml2 sqlite
PKGSS_LIGHTTPD_MOD_WEBDAV:= libxml2 libsqlite
+PKGSN_LIGHTTPD_MOD_WEBDAV:= lighttpd
include $(TOPDIR)/mk/package.mk
@@ -62,7 +77,7 @@ $(eval $(call PKG_template,LIGHTTPD,lighttpd,$(PKG_VERSION)-${PKG_RELEASE},${PKG
$(eval $(call PKG_template,LIGHTTPD_MOD_ALIAS,lighttpd-mod-alias,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_ALIAS},${PKG_SECTION}))
$(eval $(call PKG_template,LIGHTTPD_MOD_AUTH,lighttpd-mod-auth,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_AUTH},${PKG_SECTION}))
$(eval $(call PKG_template,LIGHTTPD_MOD_CGI,lighttpd-mod-cgi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_CGI},${PKG_SECTION}))
-$(eval $(call PKG_template,LIGHTTPD_MOD_DIRLISTING,lighttpd-mod-dirlisting,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_DIRLISTING},${PKG_SECTION}))
+$(eval $(call PKG_template,LIGHTTPD_MOD_DIRLIST,lighttpd-mod-dirlist,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_DIRLIST},${PKG_SECTION}))
$(eval $(call PKG_template,LIGHTTPD_MOD_EVASIVE,lighttpd-mod-evasive,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_EVASIVE},${PKG_SECTION}))
$(eval $(call PKG_template,LIGHTTPD_MOD_EXPIRE,lighttpd-mod-expire,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_EXPIRE},${PKG_SECTION}))
$(eval $(call PKG_template,LIGHTTPD_MOD_FASTCGI,lighttpd-mod-fastcgi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_FASTCGI},${PKG_SECTION}))
@@ -70,7 +85,7 @@ $(eval $(call PKG_template,LIGHTTPD_MOD_PROXY,lighttpd-mod-proxy,$(PKG_VERSION)-
$(eval $(call PKG_template,LIGHTTPD_MOD_REDIRECT,lighttpd-mod-redirect,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_REDIRECT},${PKG_SECTION}))
$(eval $(call PKG_template,LIGHTTPD_MOD_REWRITE,lighttpd-mod-rewrite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_REWRITE},${PKG_SECTION}))
$(eval $(call PKG_template,LIGHTTPD_MOD_SETENV,lighttpd-mod-setenv,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_SETENV},${PKG_SECTION}))
-$(eval $(call PKG_template,LIGHTTPD_MOD_SIMPLE_VHOST,lighttpd-mod-simple-vhost,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_SIMPLE_VHOST},${PKG_SECTION}))
+$(eval $(call PKG_template,LIGHTTPD_MOD_VHOST,lighttpd-mod-vhost,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_VHOST},${PKG_SECTION}))
$(eval $(call PKG_template,LIGHTTPD_MOD_SSI,lighttpd-mod-ssi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_SSI},${PKG_SECTION}))
$(eval $(call PKG_template,LIGHTTPD_MOD_STATUS,lighttpd-mod-status,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_STATUS},${PKG_SECTION}))
$(eval $(call PKG_template,LIGHTTPD_MOD_USERTRACK,lighttpd-mod-usertrack,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_USERTRACK},${PKG_SECTION}))
@@ -79,7 +94,7 @@ $(eval $(call PKG_template,LIGHTTPD_MOD_WEBDAV,lighttpd-mod-webdav,$(PKG_VERSION
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_ALIAS,alias))
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_AUTH,auth))
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_CGI,cgi))
-$(eval $(call PKG_mod_template,LIGHTTPD_MOD_DIRLISTING,dirlisting))
+$(eval $(call PKG_mod_template,LIGHTTPD_MOD_DIRLIST,dirlisting))
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_EVASIVE,evasive))
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_EXPIRE,expire))
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_FASTCGI,fastcgi))
@@ -87,13 +102,12 @@ $(eval $(call PKG_mod_template,LIGHTTPD_MOD_PROXY,proxy))
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_REDIRECT,redirect))
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_REWRITE,rewrite))
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_SETENV,setenv))
-$(eval $(call PKG_mod_template,LIGHTTPD_MOD_SIMPLE_VHOST,simple_vhost))
+$(eval $(call PKG_mod_template,LIGHTTPD_MOD_VHOST,simple_vhost))
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_SSI,ssi))
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_STATUS,status))
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_USERTRACK,usertrack))
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_WEBDAV,webdav))
-#TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/libxml2
CONFIGURE_ARGS+= --libdir=/usr/lib/lighttpd \
--sysconfdir=/etc/lighttpd \
--without-attr \
@@ -115,7 +129,7 @@ CONFIGURE_ARGS+= --without-webdav-props \
--without-webdav-locks
endif
-ifneq ($(ADK_PACKAGE_LIGHTTPD_MOD_SSI)$(ADK_PACKAGE_LIGHTTPD_MOD_DIRLISTING)$(ADK_PACKAGE_LIGHTTPD_MOD_REWRITE)$(ADK_PACKAGE_LIGHTTPD_MOD_REDIRECT),)
+ifneq ($(ADK_PACKAGE_LIGHTTPD_MOD_SSI)$(ADK_PACKAGE_LIGHTTPD_MOD_DIRLIST)$(ADK_PACKAGE_LIGHTTPD_MOD_REWRITE)$(ADK_PACKAGE_LIGHTTPD_MOD_REDIRECT),)
CONFIGURE_ARGS+= --with-pcre
CONFIGURE_ENV+= PCRE_LIB="-lpcre"
else
@@ -133,7 +147,6 @@ else
CONFIGURE_ARGS+= --without-openssl
endif
-
post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
${INSTALL_DIR} $(IDIR_LIGHTTPD)/etc/lighttpd/conf.d
${INSTALL_DATA} ./files/lighttpd.conf $(IDIR_LIGHTTPD)/etc/lighttpd
diff --git a/package/lua/Makefile b/package/lua/Makefile
index 7ad5ea268..153d61c07 100644
--- a/package/lua/Makefile
+++ b/package/lua/Makefile
@@ -13,13 +13,14 @@ PKG_DEPENDS:= libreadline
PKG_BUILDDEP:= readline
PKG_URL:= http://www.lua.org/
PKG_SITES:= http://www.lua.org/ftp/
-PKG_MULTI:= 1
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= LUA LUAC LUA_EXAMPLES
PKGSD_LUAC:= LUA bytecode compiler
+PKGSN_LUAC:= lua
PKGSD_LUAEXAMPLES:= LUA script examples
+PKGSN_LUAEXAMPLES:= lua
include ${TOPDIR}/mk/package.mk
diff --git a/package/mini_httpd/Makefile b/package/mini_httpd/Makefile
index 37abf2c00..731b95d4d 100644
--- a/package/mini_httpd/Makefile
+++ b/package/mini_httpd/Makefile
@@ -7,24 +7,19 @@ PKG_NAME:= mini-httpd
PKG_VERSION:= 1.19
PKG_RELEASE:= 10
PKG_MD5SUM:= 7c68293ad265ecfe2edea917912f6f1f
-PKG_DESCR:= A small HTTP server with SSL
-PKG_MULTI:= 1
+PKG_DESCR:= small HTTP server with SSL
PKG_SECTION:= www
PKG_DEPENDS:= libopenssl
PKG_BUILDDEP:= openssl
PKG_URL:= http://www.acme.com/software/mini_httpd/
PKG_SITES:= http://www.acme.com/software/mini_httpd/
-PKG_SUBPKGS:= MINI_HTTPD MINI_HTTPD_HTPASSWD
-PKGSD_HTPASSWD:= htpasswd utility
-
DISTFILES:= mini_httpd-${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/mini_httpd-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,MINI_HTTPD,mini-httpd,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION}))
-#$(eval $(call PKG_template,MINI_HTTPD_HTPASSWD,mini-httpd-htpasswd,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_HTPASSWD},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/olsrd/Makefile b/package/olsrd/Makefile
index 41ab598ea..e65b75ed9 100644
--- a/package/olsrd/Makefile
+++ b/package/olsrd/Makefile
@@ -7,11 +7,10 @@ PKG_NAME:= olsrd
PKG_VERSION:= 0.6.6.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 65181a5280391d69411908c186fd0c1f
-PKG_DESCR:= Optimized Link State Routing protocol
+PKG_DESCR:= optimized link state routing protocol
PKG_SECTION:= wifi
PKG_URL:= http://www.olsr.org/
PKG_SITES:= http://www.olsr.org/releases/0.6/
-PKG_MULTI:= 1
PKG_NOPARALLEL:= 1
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
@@ -19,6 +18,15 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= OLSRD OLSRD_MOD_DYN_GW OLSRD_MOD_HTTPINFO
PKG_SUBPKGS+= OLSRD_MOD_NAMESERVICE OLSRD_MOD_TAS
+PKGSD_OLSRD_MOD_DYN_GW:= support for dynamic gateway
+PKGSN_OLSRD_MOD_DYN_GW:= olsrd
+PKGSD_OLSRD_MOD_HTTPINFO:= support for httpinfo
+PKGSN_OLSRD_MOD_HTTPINFO:= olsrd
+PKGSD_OLSRD_MOD_NAMESERVICE:= nameservice support
+PKGSN_OLSRD_MOD_NAMESERVICE:= olsrd
+PKGSD_OLSRD_MOD_TAS:= tas support
+PKGSN_OLSRD_MOD_TAS:= olsrd
+
include ${TOPDIR}/mk/package.mk
define PKG_mod_template
diff --git a/package/opensips/Makefile b/package/opensips/Makefile
index 2d479ab70..a34797fad 100644
--- a/package/opensips/Makefile
+++ b/package/opensips/Makefile
@@ -4,17 +4,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= opensips
-PKG_VERSION:= 1.6.1
+PKG_VERSION:= 1.11.1
PKG_RELEASE:= 1
-PKG_VARIANT:= tls
-PKG_MD5SUM:= e7e59910183ca8a213c76a7a80789ea1
-PKG_DESCR:= a high-performance, configurable, free SIP server
+PKG_MD5SUM:= 34d30e9ce870988970dff5f8a9abd239
+PKG_DESCR:= high-performance, configurable, free SIP server
PKG_SECTION:= phone
PKG_DEPENDS:= libopenssl
PKG_BUILDDEP:= openssl
PKG_URL:= http://opensips.org/
PKG_SITES:= http://opensips.org/pub/opensips/$(PKG_VERSION)/src/
-PKG_MULTI:= 1
PKG_SUBPKGS:= OPENSIPS OPENSIPS_MOD_ACCOUNTING OPENSIPS_MOD_AUTH
PKG_SUBPKGS+= OPENSIPS_MOD_AUTH_DB OPENSIPS_MOD_AVPOPS OPENSIPS_MOD_DISPATCHER
@@ -23,10 +21,50 @@ PKG_SUBPKGS+= OPENSIPS_MOD_GROUP OPENSIPS_MOD_MEDIAPROXY OPENSIPS_MOD_MSILO
PKG_SUBPKGS+= OPENSIPS_MOD_NATHELPER OPENSIPS_MOD_OPTIONS OPENSIPS_MOD_PDT
PKG_SUBPKGS+= OPENSIPS_MOD_PERMISSIONS OPENSIPS_MOD_PIKE OPENSIPS_MOD_SMS
PKG_SUBPKGS+= OPENSIPS_MOD_UAC OPENSIPS_MOD_UAC_REDIRECT OPENSIPS_MOD_URI
-PKG_SUBPKGS+= OPENSIPS_MOD_XLOG
-DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)-$(PKG_VARIANT)_src.tar.gz
-WRKDIST= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_VARIANT)
+PKGSD_OPENSIPS_MOD_ACCOUNTING:= accounting support
+PKGSN_OPENSIPS_MOD_ACCOUNTING:= opensips
+PKGSD_OPENSIPS_MOD_AUTH:= authentication support
+PKGSN_OPENSIPS_MOD_AUTH:= opensips
+PKGSD_OPENSIPS_MOD_AUTH_DB:= authentication database support
+PKGSN_OPENSIPS_MOD_AUTH_DB:= opensips
+PKGSD_OPENSIPS_MOD_AVPOPS:= avpops support
+PKGSN_OPENSIPS_MOD_AVPOPS:= opensips
+PKGSD_OPENSIPS_MOD_DISPATCHER:= dispatcher support
+PKGSN_OPENSIPS_MOD_DISPATCHER:= opensips
+PKGSD_OPENSIPS_MOD_DIVERSION:= diversion support
+PKGSN_OPENSIPS_MOD_DIVERSION:= opensips
+PKGSD_OPENSIPS_MOD_FLATSTORE:= flatstore support
+PKGSN_OPENSIPS_MOD_FLATSTORE:= opensips
+PKGSD_OPENSIPS_MOD_GFLAGS:= gflags support
+PKGSN_OPENSIPS_MOD_GFLAGS:= opensips
+PKGSD_OPENSIPS_MOD_GROUP:= group support
+PKGSN_OPENSIPS_MOD_GROUP:= opensips
+PKGSD_OPENSIPS_MOD_MEDIAPROXY:= mediaproxy support
+PKGSN_OPENSIPS_MOD_MEDIAPROXY:= opensips
+PKGSD_OPENSIPS_MOD_MSILO:= msilo support
+PKGSN_OPENSIPS_MOD_MSILO:= opensips
+PKGSD_OPENSIPS_MOD_NATHELPER:= nathelper support
+PKGSN_OPENSIPS_MOD_NATHELPER:= opensips
+PKGSD_OPENSIPS_MOD_OPTIONS:= options support
+PKGSN_OPENSIPS_MOD_OPTIONS:= opensips
+PKGSD_OPENSIPS_MOD_PDT:= pdt support
+PKGSN_OPENSIPS_MOD_PDT:= opensips
+PKGSD_OPENSIPS_MOD_PERMISSIONS:= permissions support
+PKGSN_OPENSIPS_MOD_PERMISSIONS:= opensips
+PKGSD_OPENSIPS_MOD_PIKE:= pike support
+PKGSN_OPENSIPS_MOD_PIKE:= opensips
+PKGSD_OPENSIPS_MOD_SMS:= sms support
+PKGSN_OPENSIPS_MOD_SMS:= opensips
+PKGSD_OPENSIPS_MOD_UAC:= uac support
+PKGSN_OPENSIPS_MOD_UAC:= opensips
+PKGSD_OPENSIPS_MOD_UAC_REDIRECT:= uac redirect support
+PKGSN_OPENSIPS_MOD_UAC_REDIRECT:= opensips
+PKGSD_OPENSIPS_MOD_URI:= uri support
+PKGSN_OPENSIPS_MOD_URI:= opensips
+
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)_src.tar.gz
+WRKDIST= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-tls
include $(TOPDIR)/mk/package.mk
@@ -62,7 +100,6 @@ $(eval $(call PKG_template,OPENSIPS_MOD_SMS,opensips-mod-sms,$(PKG_VERSION)-${PK
$(eval $(call PKG_template,OPENSIPS_MOD_UAC,opensips-mod-uac,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,OPENSIPS_MOD_UAC_REDIRECT,opensips-mod-uac-redirect,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,OPENSIPS_MOD_URI,opensips-mod-uri,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,OPENSIPS_MOD_XLOG,opensips-mod-xlog,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_mod_template,OPENSIPS_MOD_ACCOUNTING,acc))
$(eval $(call PKG_mod_template,OPENSIPS_MOD_AUTH,auth))
@@ -85,7 +122,6 @@ $(eval $(call PKG_mod_template,OPENSIPS_MOD_SPEEDIAL,speeddial))
$(eval $(call PKG_mod_template,OPENSIPS_MOD_UAC,uac))
$(eval $(call PKG_mod_template,OPENSIPS_MOD_UAC_REDIRECT,uac_redirect))
$(eval $(call PKG_mod_template,OPENSIPS_MOD_URI,uri))
-$(eval $(call PKG_mod_template,OPENSIPS_MOD_XLOG,xlog))
# Select here the modules for the main package
OPENSIPS_MODULES:= sl tm rr maxfwd usrloc registrar db_text textops exec mi_fifo signaling
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 7de3e9509..4a5b6c924 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -7,24 +7,28 @@ PKG_NAME:= openssh
PKG_VERSION:= 6.6p1
PKG_RELEASE:= 1
PKG_MD5SUM:= 3e9800e6bca1fbac0eea4d41baa7f239
-PKG_DESCR:= OpenSSH
+PKG_DESCR:= secure shell implementation
PKG_SECTION:= net/security
PKG_BUILDDEP:= zlib openssl
PKG_DEPENDS:= zlib libopenssl libpthread libgcc
PKG_URL:= http://www.openssh.com/
PKG_SITES:= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/
-PKG_MULTI:= 1
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= OPENSSH OPENSSH_SERVER OPENSSH_CLIENT OPENSSH_CLIENT_UTILS
PKG_SUBPKGS+= OPENSSH_SFTP_CLIENT OPENSSH_SFTP_SERVER
-PKGSD_OPENSSH_SERVER:= OpenSSH server
-PKGSD_OPENSSH_CLIENT:= OpenSSH client
-PKGSD_OPENSSH_CLIENT_UTILS:= OpenSSH client utilities
-PKGSD_OPENSSH_SFTP_CLIENT:= OpenSSH sftp client
-PKGSD_OPENSSH_SFTP_SERVER:= OpenSSH sftp server
+PKGSD_OPENSSH_SERVER:= secure shell server
+PKGSN_OPENSSH_SERVER:= openssh
+PKGSD_OPENSSH_CLIENT:= secure shell client
+PKGSN_OPENSSH_CLIENT:= openssh
+PKGSD_OPENSSH_CLIENT_UTILS:= client utilities
+PKGSN_OPENSSH_CLIENT_UTILS:= openssh
+PKGSD_OPENSSH_SFTP_CLIENT:= sftp client
+PKGSN_OPENSSH_SFTP_CLIENT:= openssh
+PKGSD_OPENSSH_SFTP_SERVER:= sftp server
+PKGSN_OPENSSH_SFTP_SERVER:= openssh
PKG_CHOICES_OPENSSH:= NOKRB WITH_KRB5 WITH_HEIMDAL
PKGCD_NOKRB:= no Kerberos support
diff --git a/package/php/Makefile b/package/php/Makefile
index ea7b221b8..c2ee40888 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -12,11 +12,12 @@ PKG_SECTION:= lang
PKG_DEPENDS:= libpthread librt libgcc
PHP_URL:= http://www.php.net/
PKG_SITES:= http://de.php.net/distributions/
-PKG_MULTI:= 1
PKG_SUBPKGS:= PHP PHP_CLI PHP_FASTCGI
PKGSD_PHP_FASTCGI:= PHP for FastCGI usage
+PKGSN_PHP_FASTCGI:= php
PKGSD_PHP_CLI:= PHP CLI
+PKGSN_PHP_CLI:= php
PKG_FLAVOURS_PHP:= MOD_BZ2 MOD_CURL MOD_FTP MOD_GD MOD_GMP MOD_MYSQL
PKG_FLAVOURS_PHP+= MOD_OPENSSL MOD_PGSQL MOD_SESSION MOD_SNMP MOD_SQLITE
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index d805712d9..44ac4bb98 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -13,25 +13,39 @@ PKG_DEPENDS:= kmod-ppp
PKG_BUILDDEP:= libpcap
PKG_URL:= http://ppp.samba.org/
PKG_SITES:= ftp://ftp.samba.org/pub/ppp/
-PKG_MULTI:= 1
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= PPP PPP_MOD_PPPOA PPP_MOD_PPPOE PPP_MOD_RADIUS
PKG_SUBPKGS+= PPP_MOD_CHAT PPP_MOD_PPPDUMP PPP_MOD_PPPSTATS PPP_MOD_PPPUMTS
+PKGSD_PPP_MOD_PPPOE:= PPP over Ethernet support
PKGSS_PPP_MOD_PPPOE:= kmod-pppoe
+PKGSN_PPP_MOD_PPPOE:= ppp
+PKGSD_PPP_MOD_PPPUMTS:= PPP UMTS support
PKGSS_PPP_MOD_PPPUMTS:= comgt
+PKGSN_PPP_MOD_PPPUMTS:= ppp
+PKGSD_PPP_MOD_PPPOA:= PPP over ATM support
+PKGSN_PPP_MOD_PPPOA:= ppp
+PKGSD_PPP_MOD_RADIUS:= RADIUS support
+PKGSN_PPP_MOD_RADIUS:= ppp
+PKGSD_PPP_MOD_CHAT:= PPP chat application
+PKGSN_PPP_MOD_CHAT:= ppp
+PKGSD_PPP_MOD_PPPDUMP:= PPP dump utility
+PKGSN_PPP_MOD_PPPDUMP:= ppp
+PKGSD_PPP_MOD_PPPSTATS:=PPP statistic utility
+PKGSN_PPP_MOD_PPPSTATS:=ppp
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,PPP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,PPP_MOD_PPPOA,ppp-mod-pppoa,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,PPP_MOD_PPPOE,ppp-mod-pppoe,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_PPP_MOD_PPPOE},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,PPP_MOD_RADIUS,ppp-mod-radius,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,PPP_MOD_CHAT,ppp-mod-chat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,PPP_MOD_PPPDUMP,ppp-mod-pppdump,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,PPP_MOD_PPPSTATS,ppp-mod-pppstats,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,PPP_MOD_PPPUMTS,ppp-mod-pppumts,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_PPP_MOD_PPPUMTS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PPP_MOD_PPPOA,ppp-mod-pppoa,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PPP_MOD_PPPOA},${PKG_SECTION}))
+$(eval $(call PKG_template,PPP_MOD_PPPOE,ppp-mod-pppoe,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_PPP_MOD_PPPOE},${PKGSD_PPP_MOD_PPPOE},${PKG_SECTION}))
+$(eval $(call PKG_template,PPP_MOD_RADIUS,ppp-mod-radius,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PPP_MOD_RADIUS},${PKG_SECTION}))
+$(eval $(call PKG_template,PPP_MOD_CHAT,ppp-mod-chat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PPP_MOD_CHAT},${PKG_SECTION}))
+$(eval $(call PKG_template,PPP_MOD_PPPDUMP,ppp-mod-pppdump,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PPP_MOD_PPPDUMP},${PKG_SECTION}))
+$(eval $(call PKG_template,PPP_MOD_PPPSTATS,ppp-mod-pppstats,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PPP_MOD_PPPSTATS},${PKG_SECTION}))
+$(eval $(call PKG_template,PPP_MOD_PPPUMTS,ppp-mod-pppumts,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_PPP_MOD_PPPUMTS},${PKGSD_PPP_MOD_PPPUMTS},${PKG_SECTION}))
CONFIG_STYLE:= minimal
CONFIGURE_ARGS+= --system=Linux --prefix="/usr"
diff --git a/package/pptp/Makefile b/package/pptp/M