Simplify and clean up.

This commit is contained in:
naddy 2002-12-22 01:04:22 +00:00
parent 978208750a
commit 4c6edd1c29
5 changed files with 24 additions and 56 deletions

View File

@ -1,11 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2002/02/28 05:28:12 pvalchev Exp $
# $OpenBSD: Makefile,v 1.2 2002/12/22 01:04:22 naddy Exp $
COMMENT= "astrosmash clone for X"
VERSION= 1.1
DISTNAME= cosmosmash-${VERSION}
DISTNAME= cosmosmash-1.1
CATEGORIES= games
NEED_VERSION= 1.504
HOMEPAGE= http://www3.sympatico.ca/sarrazip/dev/cosmosmash.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,11 +0,0 @@
--- aclocal.m4.orig Sun Nov 25 11:29:16 2001
+++ aclocal.m4 Sun Feb 24 20:00:17 2002
@@ -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/22 01:04:22 naddy Exp $
--- configure.orig Sun Dec 22 01:57:44 2002
+++ configure Sun Dec 22 01:58:05 2002
@@ -795,8 +795,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"
@@ -972,8 +970,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,11 +0,0 @@
--- configure.in.orig Tue Oct 30 19:58:44 2001
+++ configure.in Sun Feb 24 20:00:17 2002
@@ -13,8 +13,6 @@ WITH_CXX # see macros/with-cxx.m4
AC_PROG_CXX
AC_LANG_CPLUSPLUS
-CXXFLAGS="-g -Wall"
-
# Checks for libraries.
WITH_RPM_RELEASE # see macros directory

View File

@ -1,27 +0,0 @@
$OpenBSD: patch-src_sdl_sdlmain_cpp,v 1.1.1.1 2002/02/28 05:28:12 pvalchev Exp $
--- src/sdlmain.cpp.orig Fri Nov 23 21:16:24 2001
+++ src/sdlmain.cpp Sun Feb 24 20:00:17 2002
@@ -30,8 +30,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