cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- patch updated to respect CFLAGS/CPPFLAGS

Browse Source 
- remove unnessesary lines from Makefile, rearrange
- fix BUILD_DEPENDS
- bump NEED_VERSION

from maintainer
This commit is contained in:
reinhard 2001-03-15 15:37:23 +00:00
parent 619cdd4a93
commit b2c402fe52
2 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
games/gtkpool/Makefile
View File

@ -1,25 +1,24 @@
# $OpenBSD: Makefile,v 1.1.1.1 2001/02/04 18:35:52 reinhard Exp $
# $OpenBSD: Makefile,v 1.2 2001/03/15 15:37:23 reinhard Exp $
DISTNAME= gtkpool-0.3.4
CATEGORIES= games x11
NEED_VERSION= 1.352
NEED_VERSION= 1.359
MASTER_SITES= ${HOMEPAGE}
HOMEPAGE= http://gtkpool.seul.org/
MASTER_SITES= ${HOMEPAGE}
LIB_DEPENDS= gtk.1.2::x11/gtk+
BUILD_DEPENDS= gtk-config::x11/gtk+
MAINTAINER= Peter Valchev <pvalchev@toxiclinux.org>
FAKE_FLAGS= PREFIX="${WRKINST}${PREFIX}"
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
LIB_DEPENDS= gtk.1.2::x11/gtk+
USE_X11= Yes
MAKE_ENV= CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/gtkpool ${PREFIX}/bin/gtkpool

38
games/gtkpool/patches/patch-Makefile
View File

@ -1,12 +1,40 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2001/02/04 18:35:52 reinhard Exp $
--- Makefile.orig Wed Dec 15 23:35:43 1999
+++ Makefile Sat Jan 20 16:52:19 2001
@@ -13,7 +13,7 @@ run: gtkpool
$OpenBSD: patch-Makefile,v 1.2 2001/03/15 15:37:24 reinhard Exp $
--- Makefile.orig Sun Jan 2 16:33:01 2000
+++ Makefile Fri Mar 9 08:15:19 2001
@@ -1,5 +1,6 @@
-CFLAGS=-g
+CFL=${CFLAGS}
+CPPFL=${CPPFLAGS}
all: gtkpool
@@ -13,22 +14,22 @@ run: gtkpool
./gtkpool
gtkpool: $(OBJS)
- g++ $(OBJS) $(CFLAGS) -o gtkpool `gtk-config --libs`
+ g++ $(OBJS) $(CFLAGS) -o gtkpool `gtk-config --libs` -lossaudio
+ g++ $(OBJS) $(CPPFL) $(CFL) -o gtkpool `gtk-config --libs` -lossaudio
popt.o:
gcc -c popt.c -o popt.o
gui.o: gui.cc application.hh pool.hh myconfig.hh options.hh
- g++ $(CFLAGS) -c gui.cc -o gui.o $(GTKFLAGS)
+ g++ $(CPPFL) $(CFL) -c gui.cc -o gui.o $(GTKFLAGS)
application.o: application.cc application.hh pool.hh myconfig.hh sound.hh
- g++ $(CFLAGS) -c application.cc -o application.o $(GTKFLAGS)
+ g++ $(CPPFL) $(CFL) -c application.cc -o application.o $(GTKFLAGS)
pool.o: pool.cc pool.hh myconfig.hh
- g++ $(CFLAGS) -c pool.cc -o pool.o $(GTKFLAGS)
+ g++ $(CPPFL) $(CFL) -c pool.cc -o pool.o $(GTKFLAGS)
options.o: options.cc options.hh application.hh
- g++ $(CFLAGS) -c options.cc -o options.o $(GTKFLAGS)
+ g++ $(CPPFL) $(CFL) -c options.cc -o options.o $(GTKFLAGS)
sound.o: sound.cc sound.hh
- g++ $(CFLAGS) -c sound.cc -o sound.o $(GTKFLAGS)
+ g++ $(CPPFL) $(CFL) -c sound.cc -o sound.o $(GTKFLAGS)