2 files changed, 72 insertions, 15 deletions

diff --git a/benchmarks/siege/Makefile b/benchmarks/siege/Makefile
index 02c821bb8908..9e4559d413cd 100644
--- a/benchmarks/siege/Makefile
+++ b/benchmarks/siege/Makefile
@@ -22,24 +22,16 @@ MAN1=		siege.1 siege.config.1 bombardment.1 siege2csv.1
 MAN5=		urls_txt.5
 MAN7=		layingsiege.7
 
-.include <bsd.port.pre.mk>
-
-.if (${OSVERSION} >= 700000)
-BROKEN=		Does not compile on 7.X
-.endif
-
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/siege ${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/utils/bombardment ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/src/siege ${PREFIX}/bin/
+	@${INSTALL_SCRIPT} ${WRKSRC}/utils/bombardment ${PREFIX}/bin/
 	@${INSTALL_SCRIPT} ${WRKSRC}/utils/siege2csv.pl ${PREFIX}/bin/siege2csv
-.for F in ${MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/doc/${F} ${MAN1PREFIX}/man/man1
-.endfor
-	@${INSTALL_MAN} ${WRKSRC}/doc/${MAN5} ${MAN1PREFIX}/man/man5
-	@${INSTALL_MAN} ${WRKSRC}/doc/${MAN7} ${MAN1PREFIX}/man/man7
+	@${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/doc/,} ${MAN1PREFIX}/man/man1/
+	@${INSTALL_MAN} ${WRKSRC}/doc/${MAN5} ${MAN1PREFIX}/man/man5/
+	@${INSTALL_MAN} ${WRKSRC}/doc/${MAN7} ${MAN1PREFIX}/man/man7/
 	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/siegerc ${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/siegerc ${DATADIR}/
 	@${SED} -e "s,%%DATADIR%%,${DATADIR}," ${FILESDIR}/siege.config.in > ${PREFIX}/bin/siege.config
 	@${CHMOD} 555 ${PREFIX}/bin/siege.config
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/benchmarks/siege/files/patch-configure b/benchmarks/siege/files/patch-configure
new file mode 100644
index 000000000000..fc936b6913a3
--- /dev/null
+++ b/benchmarks/siege/files/patch-configure
@@ -0,0 +1,65 @@
+--- ./configure.orig	2007-10-29 12:09:17.000000000 -0400
++++ ./configure	2007-10-29 12:09:50.000000000 -0400
+@@ -9533,7 +9533,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
++LIBS="$LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -9592,7 +9592,7 @@
+ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+ echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+ if test $ac_cv_lib_dl_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs=""
+ else
+   echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+ echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+@@ -13314,7 +13314,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
++LIBS="$LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -13373,7 +13373,7 @@
+ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+ echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+ if test $ac_cv_lib_dl_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs=""
+ else
+   echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+ echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+@@ -19049,7 +19049,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
++LIBS="$LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -19108,7 +19108,7 @@
+ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+ echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+ if test $ac_cv_lib_dl_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs=""
+ else
+   echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+ echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+@@ -20809,7 +20809,7 @@
+ 
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6;
+-  LDL=-ldl
++  LDL=
+   LIBS=$olibs
+ fi
+ rm -f conftest.err conftest.$ac_objext \