Merge branch 'master' of git+ssh://openadk.org/git/openadk

3 files changed, 96 insertions, 0 deletions

diff --git a/package/tptest/Makefile b/package/tptest/Makefile
new file mode 100644
index 000000000..3f6c0fc3c
--- /dev/null
+++ b/package/tptest/Makefile
@@ -0,0 +1,28 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		tptest
+PKG_VERSION:=		3.1.7
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		46f941bdab738a2a11ecc2a5f757ec77
+PKG_DESCR:=		Internet bandwidth tester
+PKG_SECTION:=		utils
+PKG_URL:=		http://tptest.sourceforge.net/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=tptest/}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,TPTEST,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+do-build:
+	(cd ${WRKSRC}/apps/unix/server && ${MAKE} && ${MAKE} install DESTDIR="${WRKINST}")
+	(cd ${WRKSRC}/apps/unix/client && ${MAKE} && ${MAKE} install DESTDIR="${WRKINST}")
+
+do-install:
+	$(INSTALL_DIR) $(IDIR_TPTEST)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/tptest{client,server} \
+		$(IDIR_TPTEST)/usr/bin/
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/tptest/patches/patch-apps_unix_client_Makefile b/package/tptest/patches/patch-apps_unix_client_Makefile
new file mode 100644
index 000000000..4043f3ec2
--- /dev/null
+++ b/package/tptest/patches/patch-apps_unix_client_Makefile
@@ -0,0 +1,34 @@
+	- assign CC only if not already defined
+	- add CFLAGS and LDFLAGS instead of replacing them
+	- allow for specifying DESTDIR to 'make install'
+	- drop the local subdir (openadk doesnt use this path)
+	- create the directories to install into
+--- tptest-3.1.7.orig/apps/unix/client/Makefile	2004-04-07 15:22:56.000000000 +0200
++++ tptest-3.1.7/apps/unix/client/Makefile	2010-01-28 00:00:45.000000000 +0100
+@@ -1,4 +1,4 @@
+-CC		= gcc
++CC		?= gcc
+ #
+ #      Use this for Linux and other systems that have makedepend
+ #      instead of mkdep.
+@@ -25,8 +25,8 @@ EXTRADEFINES	= -DUNIX -DLINUX
+ #
+ #EXTRADEFINES	= -DUSE_GMTIME
+ 
+-CFLAGS		= ${CDEBUG} ${EXTRADEFINES} ${INCL} -Wall
+-LDFLAGS		= ${CDEBUG}
++CFLAGS		+= ${CDEBUG} ${EXTRADEFINES} ${INCL} -Wall
++LDFLAGS		+= ${CDEBUG}
+ LIBDIR		= 
+ LOCLIBS		= 
+ 
+@@ -69,7 +69,8 @@ clean:
+ 	rm -f tptestclient core *.o *.BAK *.bak *.CKP a.out tpio_unix.c tpengine.c tpcommon.c tpclient.c
+ 
+ install:
+-	install -c -s -o bin -g bin -m 555 tptestclient /usr/local/bin
++	install -d -m 755 ${DESTDIR}/usr/bin
++	install -c -m 755 tptestclient ${DESTDIR}/usr/bin
+ 
+ depend: 
+ 	${MAKEDEPEND} ${INCL} ${SRCS} ${LIBSRCS}
diff --git a/package/tptest/patches/patch-apps_unix_server_Makefile b/package/tptest/patches/patch-apps_unix_server_Makefile
new file mode 100644
index 000000000..127bd0a72
--- /dev/null
+++ b/package/tptest/patches/patch-apps_unix_server_Makefile
@@ -0,0 +1,34 @@
+        - assign CC only if not already defined
+        - add CFLAGS and LDFLAGS instead of replacing them
+        - allow for specifying DESTDIR to 'make install'
+        - drop the local subdir (openadk doesnt use this path)
+        - create the directories to install into
+--- tptest-3.1.7.orig/apps/unix/server/Makefile	2003-01-22 11:42:45.000000000 +0100
++++ tptest-3.1.7/apps/unix/server/Makefile	2010-01-28 00:00:23.000000000 +0100
+@@ -1,4 +1,4 @@
+-CC		= gcc
++CC		?= gcc
+ #
+ #      Use this for Linux and other systems that have makedepend
+ #      instead of mkdep.
+@@ -25,8 +25,8 @@ EXTRADEFINES	= -DUNIX -DLINUX
+ #
+ #EXTRADEFINES	= -DUSE_GMTIME
+ 
+-CFLAGS		= ${CDEBUG} ${EXTRADEFINES} ${INCL} -Wall
+-LDFLAGS		= ${CDEBUG}
++CFLAGS		+= ${CDEBUG} ${EXTRADEFINES} ${INCL} -Wall
++LDFLAGS		+= ${CDEBUG}
+ LIBDIR		= 
+ LOCLIBS		= 
+ 
+@@ -66,7 +66,8 @@ clean:
+ 	rm -f tptestserver core *.o *.BAK *.bak *.CKP a.out tpio_unix.c tpengine.c tpcommon.c
+ 
+ install:
+-	install -c -s -o bin -g bin -m 555 tptestserver /usr/local/bin
++	install -d -m 755 ${DESTDIR}/usr/bin
++	install -c -m 755 tptestserver ${DESTDIR}/usr/bin
+ 
+ depend: 
+ 	${MAKEDEPEND} ${INCL} ${SRCS} ${LIBSRCS}