diff options
| -rw-r--r-- | emulators/gbe/Makefile | 5 | ||||
| -rw-r--r-- | emulators/gbe/files/patch-aa | 58 | ||||
| -rw-r--r-- | graphics/seejpeg/Makefile | 5 | ||||
| -rw-r--r-- | graphics/seejpeg/files/patch-aa | 25 | ||||
| -rw-r--r-- | mail/kavmilter/Makefile | 11 | ||||
| -rw-r--r-- | mail/kavmilter/files/patch-Makefile | 28 | ||||
| -rw-r--r-- | mail/kavmilter/files/patch-libconf_Makefile | 12 |
7 files changed, 115 insertions, 29 deletions
diff --git a/emulators/gbe/Makefile b/emulators/gbe/Makefile index ac63bf7d1733..adb1b97877aa 100644 --- a/emulators/gbe/Makefile +++ b/emulators/gbe/Makefile @@ -7,15 +7,18 @@ PORTNAME= gbe PORTVERSION= 0.0.22 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://www.zophar.net/unix/Files/ MAINTAINER= nakai@FreeBSD.org COMMENT= Nintendo GameBoy(tm) emulator with GNU source code -LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt +USE_GETOPT_LONG=yes WRKSRC= ${WRKDIR}/${PORTNAME} +MAKE_ENV= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include" \ + LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" USE_X_PREFIX= yes diff --git a/emulators/gbe/files/patch-aa b/emulators/gbe/files/patch-aa index 0aa72cececc3..ca6942297088 100644 --- a/emulators/gbe/files/patch-aa +++ b/emulators/gbe/files/patch-aa @@ -1,10 +1,58 @@ ---- Makefile.orig Mon Apr 16 21:07:21 2001 -+++ Makefile Mon Apr 16 21:13:21 2001 -@@ -1,5 +1,5 @@ +--- Makefile.orig Mon Sep 27 00:29:10 1999 ++++ Makefile Sun Jul 6 19:34:42 2003 +@@ -1,42 +1,42 @@ -LFLAGS = -L/usr/X11R6/lib -lX11 -g3 -lreadline -lncurses -lvga -CFLAGS = -O6 -DBUILD_SVGA -DBUILD_X11 -DBUILD_JLIB -DCPU_DEBUG -g3 -ffast-math -fomit-frame-pointer -finline-functions #-DNOT_LINEBASED #-DCPU_DEBUG_EXTENDED -+LFLAGS = -L/usr/X11R6/lib -lX11 -g3 -lgnugetopt -L/usr/local/lib -+CFLAGS = -I/usr/X11R6/include -I/usr/local/include -O6 -DBUILD_X11 -g3 -ffast-math -fomit-frame-pointer -finline-functions #-DNOT_LINEBASED #-DCPU_DEBUG_EXTENDED ++LFLAGS = -lX11 -g3 $(LDFLAGS) ++CFLAGS += ${CPPFLAGS} -DBUILD_X11 -g3 #-DNOT_LINEBASED #-DCPU_DEBUG_EXTENDED OBJS = main.o rom.o mem.o cpu.o vram.o debug.o joypad.o jlib.o x11.o svga.o BIN = gbe + all: $(BIN) + + $(BIN): $(OBJS) +- gcc $(CFLAGS) -o $(BIN) $(OBJS) $(LFLAGS) ++ $(CC) $(CFLAGS) -o $(BIN) $(OBJS) $(LFLAGS) + + main.o: main.c rom.h mem.h data.h vram.h +- gcc $(CFLAGS) -o main.o -c main.c ++ $(CC) $(CFLAGS) -o main.o -c main.c + + rom.o: rom.c rom.h mem.h +- gcc $(CFLAGS) -o rom.o -c rom.c ++ $(CC) $(CFLAGS) -o rom.o -c rom.c + + mem.o: mem.c mem.h regs.h +- gcc $(CFLAGS) -o mem.o -c mem.c ++ $(CC) $(CFLAGS) -o mem.o -c mem.c + + cpu.o: cpu.c cpu.h mem.h data.h +- gcc $(CFLAGS) -o cpu.o -c cpu.c ++ $(CC) $(CFLAGS) -o cpu.o -c cpu.c + + vram.o: vram.c vram.h x11.h mem.h regs.h +- gcc $(CFLAGS) -o vram.o -c vram.c ++ $(CC) $(CFLAGS) -o vram.o -c vram.c + + debug.o: debug.c debug.h +- gcc $(CFLAGS) -o debug.o -c debug.c ++ $(CC) $(CFLAGS) -o debug.o -c debug.c + + joypad.o: joypad.c joypad.c jlib.h +- gcc $(CFLAGS) -o joypad.o -c joypad.c ++ $(CC) $(CFLAGS) -o joypad.o -c joypad.c + + jlib.o: jlib.c jlib.h +- gcc $(CFLAGS) -o jlib.o -c jlib.c ++ $(CC) $(CFLAGS) -o jlib.o -c jlib.c + + x11.o: x11.c x11.h +- gcc $(CFLAGS) -o x11.o -c x11.c ++ $(CC) $(CFLAGS) -o x11.o -c x11.c + + svga.o: svga.c svga.h +- gcc $(CFLAGS) -o svga.o -c svga.c ++ $(CC) $(CFLAGS) -o svga.o -c svga.c + + clean: + rm -f $(BIN) $(OBJS) *~ core vram.dump diff --git a/graphics/seejpeg/Makefile b/graphics/seejpeg/Makefile index 7ac68db8cea4..dd2e87a96fd8 100644 --- a/graphics/seejpeg/Makefile +++ b/graphics/seejpeg/Makefile @@ -7,6 +7,7 @@ PORTNAME= seejpeg PORTVERSION= 1.10 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= apps/graphics/viewers/svga @@ -16,14 +17,16 @@ MAINTAINER= greid@ukug.uk.freebsd.org COMMENT= A console graphics viewer using the svga console graphics library LIB_DEPENDS= vga.1:${PORTSDIR}/graphics/svgalib \ - gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \ jpeg.9:${PORTSDIR}/graphics/jpeg ALL_TARGET= seejpeg MAN1= seejpeg.1 +USE_GETOPT_LONG=yes MANCOMPRESSED= yes USE_GMAKE= yes +MAKE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" post-extract: ${CHMOD} 0644 ${WRKSRC}/Makefile diff --git a/graphics/seejpeg/files/patch-aa b/graphics/seejpeg/files/patch-aa index 1f63ef8b85f9..9dffdebde3f2 100644 --- a/graphics/seejpeg/files/patch-aa +++ b/graphics/seejpeg/files/patch-aa @@ -1,6 +1,6 @@ ---- Makefile.orig Sun Nov 7 00:55:19 1999 -+++ Makefile Thu Oct 19 10:31:56 2000 -@@ -6,19 +6,19 @@ +--- Makefile.orig Sun Nov 7 14:55:19 1999 ++++ Makefile Sun Jul 6 19:53:33 2003 +@@ -6,30 +6,30 @@ # $Id: Makefile,v 1.8 1999/11/07 05:55:19 evan Exp $ # The installation directories. @@ -24,22 +24,21 @@ #JPEG_LIBS= -L /usr/X11R6/lib # These may be changed, if desired. -@@ -29,13 +29,13 @@ + +-CC= gcc +-CCOPTS= -O3 ++#CC= gcc ++#CCOPTS= -O -pipe + # Editing of the rest of this Makefile shouldn't be necessary. - CFLAGS= $(JPEG_HEADERS) -I jpeglib $(CCOPTS) $(OPTIONS) +-CFLAGS= $(JPEG_HEADERS) -I jpeglib $(CCOPTS) $(OPTIONS) -LIBS= -lvga $(JPEG_LIBS) -ljpeg -lm -+LIBS= -lvga $(JPEG_LIBS) -ljpeg -lgnugetopt -lm ++CFLAGS+= $(JPEG_HEADERS) -I jpeglib $(OPTIONS) ++LIBS= -lvga $(JPEG_LIBS) -ljpeg -lm $(LDFLAGS) LDOPTS= -s SEEJPEG= seejpeg.o jpeg.o image.o display.o cmap.o \ - jpeglib/rdbmp.o jpeglib/rdgif.o jpeglib/rdppm.o \ - jpeglib/rdtarga.o -- -+ - default: - @echo "To build seejpeg, first obtain the library for v6 of libjpeg. This ought" - @echo "to be available from the same place that you obtained seejpeg. Having" @@ -54,7 +54,8 @@ install: diff --git a/mail/kavmilter/Makefile b/mail/kavmilter/Makefile index bdcbadc946a3..393640806bee 100644 --- a/mail/kavmilter/Makefile +++ b/mail/kavmilter/Makefile @@ -7,14 +7,13 @@ PORTNAME= kavmilter PORTVERSION= 0.91.3 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= ftp://granch.ru/pub/kavmilter/ MAINTAINER= shelton@granch.ru COMMENT= Sendmail antivirus filter, based on Kaspersky Antivirus and Milter API -LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt - .if !exists(/usr/lib/libmilter.a) IGNORE= requires Sendmail 8.12; upgrade the base system .endif @@ -26,10 +25,10 @@ USE_REINPLACE= yes MAN5= kavmilter.5 MAN8= kavmilter.8 -MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} - -post-patch: - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${MAKEFILE} +CPPFLAGS= ${PTHREAD_CFLAGS} +LDFLAGS= ${PTHREAD_LIBS} +MAKE_ENV= CPPFLAGS="${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" post-install: ${STRIP_CMD} ${PREFIX}/libexec/kavmilter diff --git a/mail/kavmilter/files/patch-Makefile b/mail/kavmilter/files/patch-Makefile index c5b3d348277f..d2235b91c51a 100644 --- a/mail/kavmilter/files/patch-Makefile +++ b/mail/kavmilter/files/patch-Makefile @@ -1,6 +1,28 @@ ---- Makefile.orig Mon Jun 16 22:58:51 2003 -+++ Makefile Mon Jun 16 22:58:44 2003 -@@ -58,6 +58,11 @@ +--- Makefile.orig Thu Jun 12 19:19:59 2003 ++++ Makefile Mon Jul 7 06:57:24 2003 +@@ -38,11 +38,11 @@ + VARDIR=/var + PIDDIR=$(VARDIR)/run + +-LIBS=-lmilter -lgnugetopt -lconf ++LIBS=-lmilter -lconf + DEFS=-DCONFIG="\"$(PREFIX)/etc/kavmilter.conf\"" + +-CFLAGS += -Wall -pipe $(INCDIRS) +-LDFLAGS += -pthread ++CFLAGS += -Wall -pipe $(INCDIRS) $(CPPFLAGS) ++#LDFLAGS += ${PTHREAD_LIBS} + # + # Remove command + RMF = -/bin/rm -f +@@ -51,13 +51,16 @@ + echo $(CFLAGS) + $(CC) -c $(DEFS) $(CFLAGS) $< + +-CC=gcc +- + all: $(BINS) + $(OBJS): $(HEADERS) install: kavmilter stop diff --git a/mail/kavmilter/files/patch-libconf_Makefile b/mail/kavmilter/files/patch-libconf_Makefile new file mode 100644 index 000000000000..9a48aa006312 --- /dev/null +++ b/mail/kavmilter/files/patch-libconf_Makefile @@ -0,0 +1,12 @@ +--- libconf/Makefile.orig Wed Oct 30 17:29:18 2002 ++++ libconf/Makefile Sun Jul 6 20:03:55 2003 +@@ -31,8 +31,7 @@ + INCDIR=$(PREFIX) + # + # Compile flags +-CC=gcc +-CFLAGS=-Wall -pipe -I$(INCDIR) ++CFLAGS+=-Wall -pipe -I$(INCDIR) + # + # Libraries + LIBS=-lm |