summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorDaniel Harris <dannyboy@FreeBSD.org>2000-07-09 19:43:55 +0000
committerDaniel Harris <dannyboy@FreeBSD.org>2000-07-09 19:43:55 +0000
commitc26b9ffe3118a4f976c929bbd7857e0e7e7c7813 (patch)
treed08ee41717ea753ffdb54264afece6105de6f9d6 /graphics
parentUpdate inn-stable port to last stable version (diff)
Better MASTER_SITES, support CFLAGS/LOCALBASE properly.
PR: 19762 Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Notes
Notes: svn path=/head/; revision=30378
Diffstat (limited to 'graphics')
-rw-r--r--graphics/tiff2png/Makefile4
-rw-r--r--graphics/tiff2png/files/patch-aa15
2 files changed, 9 insertions, 10 deletions
diff --git a/graphics/tiff2png/Makefile b/graphics/tiff2png/Makefile
index 80d2cdb9f6a6..77f2aec85f06 100644
--- a/graphics/tiff2png/Makefile
+++ b/graphics/tiff2png/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tiff2png
PORTVERSION= 0.81
CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.cdrom.com/pub/png/src/ \
+MASTER_SITES= ftp://ftp.libpng.org/pub/png/src/ \
ftp://swrinde.nde.swri.edu/pub/png/applications/
MAINTAINER= ports@FreeBSD.org
@@ -16,8 +16,6 @@ MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
png.4:${PORTSDIR}/graphics/png
-MAKE_ARGS= -E INSTALL
-MAKE_ENV= INSTALL="${PREFIX}"
ALL_TARGET= tiff2png
do-install:
diff --git a/graphics/tiff2png/files/patch-aa b/graphics/tiff2png/files/patch-aa
index d889c288c965..b1de08556f11 100644
--- a/graphics/tiff2png/files/patch-aa
+++ b/graphics/tiff2png/files/patch-aa
@@ -1,14 +1,15 @@
---- Makefile Sun Feb 13 15:39:40 2000
-+++ Makefile.new Tue Jul 4 02:51:02 2000
+--- Makefile.orig Mon Feb 14 05:39:40 2000
++++ Makefile Tue Jul 4 19:29:41 2000
@@ -2,9 +2,9 @@
# Copyright (C) 1996 Willem van Schaik
#CC=cc
-CC=gcc
-+CC?=gcc
- OPTIMFLAGS = -O3
+-OPTIMFLAGS = -O3
-DEBUGFLAGS = -g -Wall -W
-+DEBUGFLAGS = -Wall -W
++#CC=gcc
++#OPTIMFLAGS = -O3
++#DEBUGFLAGS = -g -Wall -W
#COPY=cp
COPY=/bin/cp -p
DEL=/bin/rm -f
@@ -33,8 +34,8 @@
- -L$(ZLIB)/ \
- -lpng -lz -ltiff -ljpeg -lm
+CFLAGS+=$(TIFF_VERSION) -DFAXPECT $(MIN_INVERT) $(OPTIMFLAGS) $(DEBUGFLAGS) \
-+ -I$(INSTALL)/include
-+LDFLAGS=-L. -L$(INSTALL)/lib -lpng -lz -ltiff -ljpeg -lm
++ -I${LOCALBASE}/include
++LDFLAGS=-L. -L${LOCALBASE}/lib -lpng -lz -ltiff -ljpeg -lm
SLDFLAGS=-L. \
$(LIBTIFF)/libtiff.a $(LIBJPEG)/libjpeg.a \
$(LIBPNG)/libpng.a \