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

- remove mips64 workaround

Browse Source
This commit is contained in:
jasper 2010-05-22 08:06:33 +00:00
parent 892b20d87e
commit 5cbd24e920
4 changed files with 13 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
biology/nutdb/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.20 2010/02/09 12:23:59 jasper Exp $
# $OpenBSD: Makefile,v 1.21 2010/05/22 08:06:33 jasper Exp $
COMMENT= record and analyze your meals for nutrient composition
DISTNAME= nut-14.4
PKGNAME= nutdb-14.4
PKGNAME= nutdb-14.4p0
CATEGORIES= biology
HOMEPAGE= http://nut.sourceforge.net/
@ -22,11 +22,4 @@ ALL_TARGET= nut
USE_GMAKE= Yes
# gcc 3.3.5 internal compiler error
.if ${MACHINE_ARCH:Mmips64*}
EXTRA_CFLAGS= -O0
.endif
MAKE_FLAGS+= EXTRA_CFLAGS=${EXTRA_CFLAGS}
.include <bsd.port.mk>

16
biology/nutdb/patches/patch-Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.6 2009/04/02 13:24:30 jasper Exp $
--- Makefile.orig Mon Dec 29 17:34:19 2008
+++ Makefile Thu Apr 2 15:23:45 2009
@@ -1,14 +1,24 @@
$OpenBSD: patch-Makefile,v 1.7 2010/05/22 08:06:33 jasper Exp $
--- Makefile.orig Sat May 22 10:06:07 2010
+++ Makefile Sat May 22 10:06:10 2010
@@ -1,9 +1,9 @@
objects := $(patsubst %.c,%.o,$(wildcard *.c))
-CFLAGS= -Os -s -Wall -DNUTDIR=\".nutdb\" -DFOODDIR=\"/usr/local/lib/nut\" -ansi -pedantic
@ -11,15 +11,9 @@ $OpenBSD: patch-Makefile,v 1.6 2009/04/02 13:24:30 jasper Exp $
- $(CC) ${CFLAGS} -o nut $(LDFLAGS) $(objects) -lm
+ $(CC) ${CFLAGS} -o nut $(objects) -lm
+anameal.o: anameal.c
+ ${CC} ${CFLAGS} $(EXTRA_CFLAGS) -c $< -o $@
+
+food.o: food.c
+ ${CC} ${CFLAGS} $(EXTRA_CFLAGS) -c $< -o $@
+
deps:
makedepend *.c
@@ -11,4 +11,8 @@ deps:
clean:
rm -f *.o nut preprocess/*.o preprocess/dbjw

11
comms/efax/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.23 2010/02/09 12:23:59 jasper Exp $
# $OpenBSD: Makefile,v 1.24 2010/05/22 08:09:19 jasper Exp $
COMMENT= small & simple FAX send/receive program
DISTNAME= efax-0.9
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
CATEGORIES= comms
MAINTAINER= Ian Darwin <ian@openbsd.org>
@ -16,12 +16,7 @@ WANTLIB= c
MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/serialcomm/fax/}
# gcc 3.3.5 internal compiler error
.if ${MACHINE_ARCH:Mmips64*}
EXTRA_CFLAGS= -O0
.endif
MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS}" EXTRA_CFLAGS="${EXTRA_CFLAGS}"
MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS}"
NO_REGRESS= Yes

14
comms/efax/patches/patch-Makefile
View File

@ -1,16 +1,8 @@
$OpenBSD: patch-Makefile,v 1.3 2008/06/08 21:41:13 jasper Exp $
$OpenBSD: patch-Makefile,v 1.4 2010/05/22 08:09:19 jasper Exp $
--- Makefile.orig Fri Mar 12 02:00:34 1999
+++ Makefile Wed Jan 30 07:11:19 2008
@@ -23,13 +23,17 @@ MANDIR=/usr/man
+++ Makefile Sat May 22 10:09:02 2010
@@ -25,11 +25,9 @@ all: efax efix
all: efax efix
+efax.o: efax.c
+ ${CC} ${CFLAGS} $(EXTRA_CFLAGS) -c $<
+
+efix.o: efix.c
+ ${CC} ${CFLAGS} $(EXTRA_CFLAGS) -c $<
+
efax: efax.o efaxlib.o efaxio.o efaxos.o efaxmsg.o
$(CC) -o efax $(LDFLAGS) efax.o efaxlib.o efaxio.o efaxos.o efaxmsg.o
- strip efax