simplify, clean up, drop getopt_long() patch; ok pvalchev@

This commit is contained in:
naddy 2002-12-23 02:36:23 +00:00
parent 07fbe7f6e1
commit e1b5d412e2
5 changed files with 24 additions and 58 deletions

View File

@ -1,11 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2001/12/28 21:51:08 pvalchev Exp $
# $OpenBSD: Makefile,v 1.4 2002/12/23 02:36:23 naddy Exp $
COMMENT= "burgertime clone for X"
VERSION= 1.6
DISTNAME= burgerspace-${VERSION}
DISTNAME= burgerspace-1.6
CATEGORIES= games
NEED_VERSION= 1.502
HOMEPAGE= http://www3.sympatico.ca/sarrazip/dev/burgerspace.html
@ -18,11 +16,9 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://www3.sympatico.ca/sarrazip/dev/
BUILD_DEPENDS= automake::devel/automake
LIB_DEPENDS= gengameng.4.0::devel/gengameng
USE_X11= Yes
CONFIGURE_STYLE= autoconf
CONFIGURE_STYLE= gnu
.include <bsd.port.mk>

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2001/12/28 21:51:08 pvalchev Exp $
--- aclocal.m4.orig Sun Nov 25 12:28:58 2001
+++ aclocal.m4 Fri Dec 28 14:32:55 2001
@@ -109,8 +109,6 @@ dnl will be used. The default is "c++".
AC_DEFUN([WITH_CXX],
[
- CXXFLAGS="-g -Wall" # default compilation options
-
AC_ARG_WITH(cxx,
[ --with-cxx=PROG Specify program to use as C++ compiler [c++]],
[

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-configure,v 1.1 2002/12/23 02:36:24 naddy Exp $
--- configure.orig Sun Dec 22 01:49:18 2002
+++ configure Sun Dec 22 01:49:50 2002
@@ -798,8 +798,6 @@ fi
# Checks for programs.
- CXXFLAGS="-g -Wall" # default compilation options
-
# Check whether --with-cxx or --without-cxx was given.
if test "${with_cxx+set}" = set; then
withval="$with_cxx"
@@ -975,8 +973,6 @@ ac_compile='${CXX-g++} -c $CXXFLAGS $CPP
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross
-
-CXXFLAGS="-g -Wall"
# Checks for libraries.

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure_in,v 1.1 2001/12/28 21:51:08 pvalchev Exp $
--- configure.in.orig Fri Dec 28 14:36:12 2001
+++ configure.in Fri Dec 28 14:36:05 2001
@@ -18,8 +18,6 @@ WITH_CXX # see macros/with-cxx.m4
AC_PROG_CXX
AC_LANG_CPLUSPLUS
-CXXFLAGS="-g -Wall"
-
# Checks for libraries.

View File

@ -1,27 +0,0 @@
$OpenBSD: patch-src_sdlmain_cpp,v 1.1 2001/12/28 21:51:08 pvalchev Exp $
--- src/sdlmain.cpp.orig Fri Nov 23 22:12:36 2001
+++ src/sdlmain.cpp Fri Dec 28 14:32:32 2001
@@ -26,8 +26,22 @@
#include <errno.h>
#include <time.h>
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__OpenBSD__)
#include <getopt.h>
+#elif defined(__OpenBSD__)
+#undef __GNUG__
+extern int getopt_long __P((int __argc, char *const *__argv, const char *__shortopts,
+ const struct option *__longopts, int *__longind));
+struct option
+{
+ char *name;
+ int has_arg;
+ int *flag;
+ int val;
+};
+# define no_argument 0
+# define required_argument 1
+# define optional_argument 2
#endif