Date: Sat, 7 Sep 2002 21:56:03 +0200 (CEST) From: Tilman Linneweh <tilman@arved.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/42514: [Maintainer-Update] graphics/metapixel: Fix Build after values.h Removal Message-ID: <200209071956.g87Ju3Jg012232@sauna.arved.de>
next in thread | raw e-mail | index | archive | help
>Number: 42514
>Category: ports
>Synopsis: [Maintainer-Update] graphics/metapixel: Fix Build after values.h Removal
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Sep 07 13:00:11 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Tilman Linneweh
>Release: FreeBSD 4.6-STABLE i386
>Organization:
BSD Usergroup Austria
>Environment:
System: FreeBSD sauna.arved.de 4.6-STABLE FreeBSD 4.6-STABLE #0: Sun Jul 7 20:02:41 CEST 2002 tilman@sauna.arved.de:/usr/obj/usr/src/sys/SAUNA i386
>Description:
- Fix Build after values.h Removal
- Respect CFLAGS
- Don't Build own version of getopt
>How-To-Repeat:
>Fix:
--- metapixel.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/metapixel/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile 23 May 2002 19:07:57 -0000 1.1
+++ Makefile 7 Sep 2002 19:49:30 -0000
@@ -16,9 +16,13 @@
gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
USE_GMAKE= yes
+USE_REINPLACE= yes
post-patch:
@${RM} ${WRKSRC}/getopt.h
+ ${REINPLACE_CMD} -e 's,values.h,limits.h,' ${WRKSRC}/libzoom/simple.h
+ ${REINPLACE_CMD} -e 's,MINSHORT,SHRT_MAX,; \
+ s,MAXSHORT,SHRT_MAX,' ${WRKSRC}/libzoom/zoom.c
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/metapixel ${PREFIX}/bin
Index: files/patch-Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/metapixel/files/patch-Makefile,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile
--- files/patch-Makefile 23 May 2002 19:07:58 -0000 1.1
+++ files/patch-Makefile 7 Sep 2002 19:50:47 -0000
@@ -1,10 +1,8 @@
---- Makefile.orig Fri May 24 03:03:30 2002
-+++ Makefile Fri May 24 03:04:54 2002
-@@ -1,15 +1,17 @@
+--- Makefile.orig Fri Jan 21 23:32:17 2000
++++ Makefile Tue Sep 24 03:40:26 2002
+@@ -1,18 +1,18 @@
-PREFIX = /usr/local
-INSTALL = install
-+#PREFIX = /usr/local
-+#INSTALL = install
BINDIR = $(PREFIX)/bin
@@ -12,14 +10,18 @@
#PROFILE = -pg
+CFLAGS+= -I/usr/local/include
-+LDFLAGS+= -L/usr/local/lib
++LDFLAGS+= -L/usr/local/lib -lgnugetopt
-LDOPTS = -L/usr/X11R6/lib $(PROFILE)
-CCOPTS = -I/usr/X11R6/include -I/usr/X11R6/include/X11 -Wall -O9 $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\"
-CC = gcc
+LDOPTS = ${LDFLAGS} -L/usr/X11R6/lib $(PROFILE)
-+CCOPTS = ${CFLAGS} -I/usr/X11R6/include -I/usr/X11R6/include/X11 -Wall -O9 $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\"
++CCOPTS = ${CFLAGS} -I/usr/X11R6/include -I/usr/X11R6/include/X11 -Wall $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\"
+#CC = gcc
#LIBFFM = -lffm
- OBJS = metapixel.o vector.o rwpng.o rwjpeg.o readimage.o writeimage.o getopt.o getopt1.o
+-OBJS = metapixel.o vector.o rwpng.o rwjpeg.o readimage.o writeimage.o getopt.o getopt1.o
++OBJS = metapixel.o vector.o rwpng.o rwjpeg.o readimage.o writeimage.o
+
+ all : metapixel
+
--- metapixel.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209071956.g87Ju3Jg012232>