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/elinks/Makefile                   | 10 +++++-----
 package/elinks/patches/patch-Makefile_lib | 17 -----------------
 2 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 package/elinks/patches/patch-Makefile_lib

(limited to 'package/elinks')

diff --git a/package/elinks/Makefile b/package/elinks/Makefile
index cb810d76f..b2d0c6014 100644
--- a/package/elinks/Makefile
+++ b/package/elinks/Makefile
@@ -6,20 +6,21 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		elinks
 PKG_VERSION:=		0.11.7
 PKG_RELEASE:=		2
-PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		145c510cae41c204d0f23dce4bdd23ab
 PKG_DESCR:=		advanced text web browser
 PKG_SECTION:=		text
 PKG_DEPENDS:=		libopenssl
-PKG_URL:=		http://elinks.or.cz
+PKG_BUILDDEP+=		openssl
+PKG_URL:=		http://elinks.or.cz/
 PKG_SITES:=		http://elinks.or.cz/download/
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ELINKS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+INSTALL_STYLE:=		manual
+
 TCFLAGS+=		-fPIC
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		$(shell echo ac_cv_file_./features.conf | tr [:blank:]-/. _)=yes
 CONFIGURE_ENV+=		$(shell echo ac_cv_file_${WRKBUILD}/features.conf | tr [:blank:]-/. _)=yes
 CONFIGURE_ARGS+=	--enable-small \
@@ -43,8 +44,7 @@ CONFIGURE_ARGS+=	--enable-small \
 			--without-spidermonkey \
 			--without-x \
 			--without-zlib
-BUILD_STYLE:=		auto
-MAKE_FLAGS+=		V=1 CC='${TARGET_CC}' LD='${TARGET_CC}'
+MAKE_FLAGS+=		CC='${TARGET_CC}' LD='${TARGET_LD}'
 
 do-install:
 	${INSTALL_DIR} ${IDIR_ELINKS}/usr/bin
diff --git a/package/elinks/patches/patch-Makefile_lib b/package/elinks/patches/patch-Makefile_lib
deleted file mode 100644
index 28b35fc6f..000000000
--- a/package/elinks/patches/patch-Makefile_lib
+++ /dev/null
@@ -1,17 +0,0 @@
---- elinks-0.11.7.orig/Makefile.lib	2009-08-22 13:15:08.000000000 +0200
-+++ elinks-0.11.7/Makefile.lib	2009-08-28 12:26:30.526558172 +0200
-@@ -43,12 +43,12 @@ quiet_cmd_compile = '      [$(CC_COLOR)C
- 
- # Rule to compile a set of .o files into one .o file
- quiet_cmd_ld_objs = "      [$(LD_COLOR)LD$(END_COLOR)]   $(RELPATH)$@"
--      cmd_ld_objs = $(LD) -r -o $@ $(filter $(OBJS), $^) \
-+      cmd_ld_objs = $(LD) -shared -o $@ $(filter $(OBJS), $^) \
-       		    $(foreach subdir,$(sort $(filter-out src,$(SUBDIRS))), \
- 			    `test -e $(subdir)/$(LIB_O_NAME) && echo $(subdir)/$(LIB_O_NAME)`)
- 
-    quiet_cmd_link = '    [$(LINK_COLOR)LINK$(END_COLOR)]   $(RELPATH)$@'
--         cmd_link = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
-+         cmd_link = $(CC) -shared $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
-  quiet_cmd_sparse = '    [SPARSE]   $(RELPATH)$(2)'
-        cmd_sparse = $(SPARSE) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(SPARSE_FLAGS) $(2)
-- 
cgit v1.2.3