From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb 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/frickin/Makefile | 3 ++- package/frickin/patches/patch-Makefile | 9 +++++++++ package/frickin/patches/patch-src_Makefile | 9 +++++++++ package/frickin/patches/patch-src_main_c | 20 ++++++++++++++++++++ 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 package/frickin/patches/patch-Makefile create mode 100644 package/frickin/patches/patch-src_Makefile create mode 100644 package/frickin/patches/patch-src_main_c (limited to 'package/frickin') diff --git a/package/frickin/Makefile b/package/frickin/Makefile index e43d5d0eb..0c16037a8 100644 --- a/package/frickin/Makefile +++ b/package/frickin/Makefile @@ -15,7 +15,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,FRICKIN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -BUILD_STYLE= auto +CONFIG_STYLE:= manual +INSTALL_STYLE:= manual do-install: ${INSTALL_DIR} ${IDIR_FRICKIN}/usr/sbin diff --git a/package/frickin/patches/patch-Makefile b/package/frickin/patches/patch-Makefile new file mode 100644 index 000000000..eb8052f4f --- /dev/null +++ b/package/frickin/patches/patch-Makefile @@ -0,0 +1,9 @@ +--- frickin-1.3.orig/Makefile 2004-10-13 18:24:56.000000000 +0200 ++++ frickin-1.3/Makefile 2010-02-05 19:12:36.101852925 +0100 +@@ -1,5 +1,5 @@ + #CFLAGS = -g -Wall +-CFLAGS = -O3 -Wall ++CFLAGS ?= -O3 -Wall + + all: frickin + diff --git a/package/frickin/patches/patch-src_Makefile b/package/frickin/patches/patch-src_Makefile new file mode 100644 index 000000000..97e0adf86 --- /dev/null +++ b/package/frickin/patches/patch-src_Makefile @@ -0,0 +1,9 @@ +--- frickin-1.3.orig/src/Makefile 2004-10-13 18:24:56.000000000 +0200 ++++ frickin-1.3/src/Makefile 2010-02-05 19:13:44.344334596 +0100 +@@ -1,5 +1,5 @@ + #CFLAGS = -g3 -Wall +-CFLAGS = -O3 -Wall ++CFLAGS ?= -O3 -Wall + + all: frickin + diff --git a/package/frickin/patches/patch-src_main_c b/package/frickin/patches/patch-src_main_c new file mode 100644 index 000000000..8a893d3c0 --- /dev/null +++ b/package/frickin/patches/patch-src_main_c @@ -0,0 +1,20 @@ +--- frickin-1.3.orig/src/main.c 2005-05-31 16:51:36.000000000 +0200 ++++ frickin-1.3/src/main.c 2010-02-05 19:12:23.654334206 +0100 +@@ -259,7 +259,7 @@ int _connect_to_server() + { + SIN sin; + +- bzero(&sin, sizeof(SIN)); ++ memset(&sin, 0, sizeof(SIN)); + sin.sin_family = AF_INET; + sin.sin_port = htons(PPTP_PORT); + sin.sin_addr.s_addr = inet_addr(g_target_ip); +@@ -713,7 +713,7 @@ int main(int argc, char **argv) + { + SIN sin; + +- bzero(&sin, sizeof(SIN)); ++ memset(&sin, 0, sizeof(SIN)); + sin.sin_family = AF_INET; + sin.sin_port = htons(PPTP_PORT); + sin.sin_addr.s_addr = inet_addr(g_listen_ip); -- cgit v1.2.3