diff options
| author | sf <sf@FreeBSD.org> | 2003-07-14 10:36:55 +0800 |
|---|---|---|
| committer | sf <sf@FreeBSD.org> | 2003-07-14 10:36:55 +0800 |
| commit | 38e9fcc1ad49abf15de3a0486aae1d40fd6b5b40 (patch) | |
| tree | 75893cf7dbcd2b1133e761845a4ea9170d45e652 /graphics/seejpeg | |
| parent | 6971f44eb4c66755b51b2ed9210ffefc6166aff1 (diff) | |
| download | freebsd-ports-gnome-38e9fcc1ad49abf15de3a0486aae1d40fd6b5b40.tar.gz freebsd-ports-gnome-38e9fcc1ad49abf15de3a0486aae1d40fd6b5b40.tar.zst freebsd-ports-gnome-38e9fcc1ad49abf15de3a0486aae1d40fd6b5b40.zip | |
get rid of libgnugetopt dependency for -CURRENT,
use USE_GETOPT_LONG instead.
respect CFLAGS.
Diffstat (limited to 'graphics/seejpeg')
| -rw-r--r-- | graphics/seejpeg/Makefile | 5 | ||||
| -rw-r--r-- | graphics/seejpeg/files/patch-aa | 25 |
2 files changed, 16 insertions, 14 deletions
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: |