Update to amph-0.8.10

This commit is contained in:
pvalchev 2003-01-21 21:59:50 +00:00
parent 8f3504863e
commit 6049894e47
4 changed files with 25 additions and 29 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.8 2002/12/29 15:10:07 fgsch Exp $
# $OpenBSD: Makefile,v 1.9 2003/01/21 21:59:50 pvalchev Exp $
COMMENT= "jump'n run game with unique video effects"
VERSION= 0.8.9
VERSION= 0.8.10
DVERSION= 0.8.6
DISTNAME= amphetamine-${VERSION}
PKGNAME= amph-${VERSION}

View File

@ -1,6 +1,6 @@
MD5 (amphetamine-0.8.9.tar.bz2) = d5a727874cddb6447331e5834be16826
MD5 (amphetamine-0.8.10.tar.bz2) = e861489188fde0e2a22a8c1e202b1c8a
MD5 (amphetamine-data-0.8.6.tar.bz2) = ed5f2a05b76918d3a624b38ba37dda0b
RMD160 (amphetamine-0.8.9.tar.bz2) = 98a66a34ec5663aa4626d56f15c4f3488ec46d4e
RMD160 (amphetamine-0.8.10.tar.bz2) = 80067a1a982d7f0559481c44645661843a14fc2d
RMD160 (amphetamine-data-0.8.6.tar.bz2) = 720c14873b3850e260dcae406bf3b29cf4e540a1
SHA1 (amphetamine-0.8.9.tar.bz2) = a699af31bbb5216105fde90f0124af502cfb3c77
SHA1 (amphetamine-0.8.10.tar.bz2) = c3911ec2be55fd787bd0b852ad34420180f2ee97
SHA1 (amphetamine-data-0.8.6.tar.bz2) = 092c4cd245d2378174f98cb9cfaa59d96e0d39d0

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.5 2002/11/28 23:36:32 pvalchev Exp $
--- Makefile.orig Wed Mar 28 02:11:39 2001
+++ Makefile Thu Nov 28 16:30:40 2002
@@ -3,8 +3,7 @@
$OpenBSD: patch-Makefile,v 1.6 2003/01/21 21:59:51 pvalchev Exp $
--- Makefile.orig Mon Mar 25 12:11:27 2002
+++ Makefile Tue Jan 21 14:50:05 2003
@@ -3,14 +3,13 @@
#===============
# Install Paths
@ -9,9 +9,7 @@ $OpenBSD: patch-Makefile,v 1.5 2002/11/28 23:36:32 pvalchev Exp $
-INSTALL_DIR := ${PREFIX}/games/amph
+INSTALL_DIR := ${PREFIX}/share/amph
# Endianess:
# LITTLE_ENDIAN (for Intel)
@@ -15,7 +14,7 @@ BYTE_ORDER := LITTLE_ENDIAN
# Libraries
USE_LIB_XPM := TRUE
SDL_CONFIG := sdl-config
@ -20,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.5 2002/11/28 23:36:32 pvalchev Exp $
SDL_LIBS := $(shell $(SDL_CONFIG) --libs)
#=======================================================
@@ -31,19 +30,19 @@ SEARCHDIRS := -I${MYCODEDIR} ${SDL_HEADE
@@ -26,19 +25,19 @@ SEARCHDIRS := -I${MYCODEDIR} ${SDL_HEADE
# makemake variables
@ -34,18 +32,27 @@ $OpenBSD: patch-Makefile,v 1.5 2002/11/28 23:36:32 pvalchev Exp $
-CC := gcc
-CFLAGS = ${DEPENDFLAGS}
+CC ?= gcc
+CFLAGS += ${DEPENDFLAGS}
+CFLAGS += ${DEPENDFLAGS}
# C++
-CXX := g++
-CXX := g++
-CXXFLAGS = ${DEPENDFLAGS} -O9 -funroll-loops -fomit-frame-pointer -ffast-math -Wcast-align
+CXX ?= g++
+CXXFLAGS += ${DEPENDFLAGS} -funroll-loops -fomit-frame-pointer -ffast-math -Wcast-align
+CXX ?= g++
+CXXFLAGS += ${DEPENDFLAGS} -funroll-loops -fomit-frame-pointer -ffast-math -Wcast-align
%.o : %.cpp
${CXX} ${CPPFLAGS} -c $< ${CXXFLAGS} -o $@
@@ -204,7 +203,7 @@ jdepend:
@@ -47,7 +46,7 @@ CXXFLAGS = ${DEPENDFLAGS} -O9 -funroll-
${CXX} ${CPPFLAGS} -c $< ${CXXFLAGS}
# C preprocessor (C, C++, FORTRAN)
-CPPFLAGS = -DINSTALL_DIR="\"${INSTALL_DIR}\""
+CPPFLAGS += -DINSTALL_DIR="\"${INSTALL_DIR}\""
ifeq ($(USE_LIB_XPM), TRUE)
CPPFLAGS := $(CPPFLAGS) -D_USE_LIB_XPM
@@ -194,7 +193,7 @@ jdepend:
./src/Surface.o: ./src/AmpHead.hpp ./src/Clut.hpp ./src/ConstVal.hpp ./src/Graphfil.hpp ./src/Shape.hpp ./src/ShapeLd.hpp ./src/Surface.hpp ./src/System.hpp /usr/include/limits.h /usr/include/math.h /usr/include/stdio.h /usr/include/stdlib.h

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_Surface_cpp,v 1.1 2002/09/28 15:24:00 naddy Exp $
--- src/Surface.cpp.orig Sat Sep 28 16:35:02 2002
+++ src/Surface.cpp Sat Sep 28 16:35:12 2002
@@ -3,6 +3,7 @@
#include "ShapeLd.hpp"
#include "Clut.hpp"
#include "ConstVal.hpp"
+#include <string.h>
const short kNoCharSpace = 20;
const char kNoCharChar = '_';