From 9cfd98fcee29697aa9da5b5fb11c7e7f0ce318b7 Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil.sutter@viprinet.com>
Date: Wed, 20 Jan 2010 19:34:35 +0100
Subject: port tptest

---
 package/tptest/Makefile                            | 39 ++++++++++++++++++++++
 .../tptest/patches/patch-apps_unix_client_Makefile | 34 +++++++++++++++++++
 .../tptest/patches/patch-apps_unix_server_Makefile | 34 +++++++++++++++++++
 3 files changed, 107 insertions(+)
 create mode 100644 package/tptest/Makefile
 create mode 100644 package/tptest/patches/patch-apps_unix_client_Makefile
 create mode 100644 package/tptest/patches/patch-apps_unix_server_Makefile

(limited to 'package/tptest')

diff --git a/package/tptest/Makefile b/package/tptest/Makefile
new file mode 100644
index 000000000..af9e000e7
--- /dev/null
+++ b/package/tptest/Makefile
@@ -0,0 +1,39 @@
+# 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_DEPENDS:=
+PKG_URL:=		http://tptest.sourceforge.net/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=tptest/}
+
+# if downloaded package is not ending with .tar.gz use following
+#DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,TPTEST,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+# use following to add ./configure options
+#CONFIGURE_ARGS+=	--disable-foo
+# overwrite any configure variables
+#CONFIGURE_ENV+=	ac_cv_func_setpgrp_void=yes
+#BUILD_STYLE:=		auto
+#INSTALL_STYLE:=	auto
+
+do-build:
+	(cd ${WRKSRC}/apps/unix/server && ${MAKE} && ${MAKE} install DESTDIR="${WRKINST}")
+	(cd ${WRKSRC}/apps/unix/client && ${MAKE} && ${MAKE} install DESTDIR="${WRKINST}")
+
+# please install all files and directories to the package dir
+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..239d4770e
--- /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-20 12:01:14.267178336 +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 -s -m 555 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..e4ea1eab8
--- /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-20 12:01:24.758178270 +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 -s -m 555 tptestserver ${DESTDIR}/usr/bin
+ 
+ depend: 
+ 	${MAKEDEPEND} ${INCL} ${SRCS} ${LIBSRCS}
-- 
cgit v1.2.3


From e417a01d00a49441432c03a0693b279f2f5db73c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 21 Jan 2010 20:02:27 +0100
Subject: remove comments and finetune packages.

pdnsd, rngd and proftpd need a init script...
do not install anything to /var, because this is on /tmp aka
tmpfs. Use init scripts to create missing directories or files.
---
 package/tptest/Makefile | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'package/tptest')

diff --git a/package/tptest/Makefile b/package/tptest/Makefile
index af9e000e7..3f6c0fc3c 100644
--- a/package/tptest/Makefile
+++ b/package/tptest/Makefile
@@ -9,31 +9,20 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		46f941bdab738a2a11ecc2a5f757ec77
 PKG_DESCR:=		Internet bandwidth tester
 PKG_SECTION:=		utils
-PKG_DEPENDS:=
 PKG_URL:=		http://tptest.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=tptest/}
 
-# if downloaded package is not ending with .tar.gz use following
-#DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,TPTEST,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-# use following to add ./configure options
-#CONFIGURE_ARGS+=	--disable-foo
-# overwrite any configure variables
-#CONFIGURE_ENV+=	ac_cv_func_setpgrp_void=yes
-#BUILD_STYLE:=		auto
-#INSTALL_STYLE:=	auto
-
 do-build:
 	(cd ${WRKSRC}/apps/unix/server && ${MAKE} && ${MAKE} install DESTDIR="${WRKINST}")
 	(cd ${WRKSRC}/apps/unix/client && ${MAKE} && ${MAKE} install DESTDIR="${WRKINST}")
 
-# please install all files and directories to the package dir
 do-install:
 	$(INSTALL_DIR) $(IDIR_TPTEST)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/tptest{client,server} $(IDIR_TPTEST)/usr/bin/
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/tptest{client,server} \
+		$(IDIR_TPTEST)/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3


From 56cbee0cb11c894340b1961910cf9af18e4cb8a3 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 28 Jan 2010 18:43:08 +0100
Subject: do not strip binaries via install -s

---
 package/tptest/patches/patch-apps_unix_client_Makefile | 4 ++--
 package/tptest/patches/patch-apps_unix_server_Makefile | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'package/tptest')

diff --git a/package/tptest/patches/patch-apps_unix_client_Makefile b/package/tptest/patches/patch-apps_unix_client_Makefile
index 239d4770e..4043f3ec2 100644
--- a/package/tptest/patches/patch-apps_unix_client_Makefile
+++ b/package/tptest/patches/patch-apps_unix_client_Makefile
@@ -4,7 +4,7 @@
 	- 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-20 12:01:14.267178336 +0100
++++ tptest-3.1.7/apps/unix/client/Makefile	2010-01-28 00:00:45.000000000 +0100
 @@ -1,4 +1,4 @@
 -CC		= gcc
 +CC		?= gcc
@@ -28,7 +28,7 @@
  install:
 -	install -c -s -o bin -g bin -m 555 tptestclient /usr/local/bin
 +	install -d -m 755 ${DESTDIR}/usr/bin
-+	install -c -s -m 555 tptestclient ${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
index e4ea1eab8..127bd0a72 100644
--- a/package/tptest/patches/patch-apps_unix_server_Makefile
+++ b/package/tptest/patches/patch-apps_unix_server_Makefile
@@ -4,7 +4,7 @@
         - 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-20 12:01:24.758178270 +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
@@ -28,7 +28,7 @@
  install:
 -	install -c -s -o bin -g bin -m 555 tptestserver /usr/local/bin
 +	install -d -m 755 ${DESTDIR}/usr/bin
-+	install -c -s -m 555 tptestserver ${DESTDIR}/usr/bin
++	install -c -m 755 tptestserver ${DESTDIR}/usr/bin
  
  depend: 
  	${MAKEDEPEND} ${INCL} ${SRCS} ${LIBSRCS}
-- 
cgit v1.2.3