Date: Sun, 12 Jan 2003 15:31:27 +0100 (CET) From: Ulrich Spoerlein <q@uni.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46993: Unfetchable Port fix: astro/saoimage Message-ID: <200301121431.h0CEVRGk000584@coyote.dnsalias.net>
next in thread | raw e-mail | index | archive | help
>Number: 46993 >Category: ports >Synopsis: Unfetchable Port fix: astro/saoimage >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Jan 12 06:40:01 PST 2003 >Closed-Date: >Last-Modified: >Originator: Ulrich Spoerlein >Release: FreeBSD 4.7-STABLE i386 >Organization: >Environment: System: FreeBSD coyote.dnsalias.net 4.7-STABLE FreeBSD 4.7-STABLE #1: Mon Nov 18 09:46:38 CET 2002 root@coyote.dnsalias.net:/usr/obj/usr/src/sys/COYOTE i386 >Description: Port can't fetch, because distfile is no longer available See: http://people.freebsd.org/~fenner/portsurvey/astro.html#saoimage >How-To-Repeat: Try to build. >Fix: Update to newer version, I removed some s^/usr/foo^${foobase}^g from the patches and introduced some sed-magic in the Makefile. --- saoimage.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/astro/saoimage/Makefile,v retrieving revision 1.19 diff -u -r1.19 Makefile --- Makefile 10 Nov 2002 16:45:01 -0000 1.19 +++ Makefile 12 Jan 2003 14:06:12 -0000 @@ -2,22 +2,30 @@ # Date created: 21 Feb 1998 # Whom: giffunip@asme.org # -# $FreeBSD: ports/astro/saoimage/Makefile,v 1.19 2002/11/10 16:45:01 lioux Exp $ +# $FreeBSD$ # PORTNAME= saoimage -PORTVERSION= 1.31.1 +PORTVERSION= 1.32.1 CATEGORIES= astro MASTER_SITES= http://tdc-www.harvard.edu/software/saoimage/ MAINTAINER= ports@FreeBSD.org USE_X_PREFIX= yes +USE_REINPLACE= yes MAKEFILE= makefile MAKE_ENV= OFLAGS="${CFLAGS}" ALL_TARGET= ${OPSYS} MAN1= saoimage.1 + +post-patch: + ${REINPLACE_CMD} -e 's,/usr/local,$${PREFIX},g' \ + -e 's,/usr/X11R6,$${X11BASE},g' \ + -e 's,/usr/include/X11,$${X11BASE}/include/X11,g' \ + ${WRKSRC}/makefile.FreeBSD \ + ${WRKSRC}/btnlib/makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/saoimage ${PREFIX}/bin Index: distinfo =================================================================== RCS file: /home/ncvs/ports/astro/saoimage/distinfo,v retrieving revision 1.8 diff -u -r1.8 distinfo --- distinfo 27 Jul 2002 02:36:04 -0000 1.8 +++ distinfo 12 Jan 2003 14:06:12 -0000 @@ -1 +1 @@ -MD5 (saoimage-1.31.1.tar.gz) = 4c2934a3a650f5e6e37ec26def90b277 +MD5 (saoimage-1.32.1.tar.gz) = 7d698bd7da36fba7be70f549da415319 Index: files/patch-aa =================================================================== RCS file: /home/ncvs/ports/astro/saoimage/files/patch-aa,v retrieving revision 1.7 diff -u -r1.7 patch-aa --- files/patch-aa 27 Jul 2002 02:36:06 -0000 1.7 +++ files/patch-aa 12 Jan 2003 14:06:12 -0000 @@ -1,18 +1,5 @@ ---- makefile.FreeBSD.orig Thu Sep 20 06:27:49 2001 -+++ makefile.FreeBSD Wed Jul 24 01:12:35 2002 -@@ -36,9 +36,9 @@ - # FBCONFIG_2, which is set to the value of IMTOOLRC in the definition of - # the CFLAGS macro below.) - --SAOBINDIR = $(ROOT)/usr/local/bin/ --SAOMANDIR = $(ROOT)/usr/local/man/manl/ --IMTRCDIR = $(ROOT)/usr/local/lib/ -+SAOBINDIR = $(ROOT)$(PREFIX)/bin/ -+SAOMANDIR = $(ROOT)$(PREFIX)/man/manl/ -+IMTRCDIR = $(ROOT)$(PREFIX)/etc/ - - IMTOOLRC = $(IMTRCDIR)imtoolrc - FIFO_I = $(ROOT)/dev/imt1i +--- makefile.FreeBSD.orig Fri Jan 10 18:31:18 2003 ++++ makefile.FreeBSD Fri Jan 10 18:31:30 2003 @@ -46,7 +46,7 @@ FIFO_LN = $(ROOT)/dev/imt1 @@ -22,7 +9,7 @@ # Uncomment these two lines to compile with gcc (add any optimizers you wish). #CC = gcc -finline-functions -fdelayed-branch -fstrength-reduce # Delayed branches could win big on RISC: many inner loops have branches -@@ -76,12 +76,12 @@ +@@ -76,7 +76,7 @@ # OFLAGS: compiler optimization/debug options. #OFLAGS = -g -DDEBUG @@ -31,38 +18,3 @@ # ADFLAGS: architecture-dependent floating point flags, etc. - #ADFLAGS = -I/usr/openwin/share/include # ATTENTION: OpenWindows users... --ADFLAGS = -I/usr/X11R6/include -+ADFLAGS = -I${X11BASE}/include - - # Libraries that move about or may require special specification. - # -@@ -89,7 +89,7 @@ - # usual link search path, i.e., it is not in /usr/lib, it may be necessary - # to specify its path fully in XLIB. - --XLIB = -L/usr/X11R6/lib -lX11 -+XLIB = -L${X11BASE}/lib -lX11 - #XLIB = -L/usr/X11R6/lib -lX11 # ATTENTION: OpenWindows users... - #F77LIB = -lF77 -lI77 -lU77 - F77LIB = -lf2c -@@ -307,7 +307,7 @@ - $(MAKE) ARCFILE=$(TAPEDEV) tar - - --XLIBH = /usr/X11R6/include/X11/Xlib.h /usr/X11R6/include/X11/Xutil.h -+XLIBH = ${X11BASE}/include/X11/Xlib.h ${X11BASE}/include/X11/Xutil.h - STRUCT = hfiles/struct.h hfiles/buffer.h hfiles/color.h hfiles/control.h \ - hfiles/coord.h hfiles/cursor.h hfiles/image.h hfiles/window.h - WORKS = $(XLIBH) $(STRUCT) hfiles/constant.h hfiles/extern.h $(WCSH) -@@ -419,8 +419,8 @@ - defs/dispbox.def defs/magnibox.def defs/panbox.def \ - defs/btnbox.def defs/colorbox.def defs/graphbox.def \ - defs/desktop.def defs/cursor.def --mainkey.o : $(WORKS) /usr/include/X11/keysym.h \ -- /usr/include/X11/keysymdef.h -+mainkey.o : $(WORKS) ${X11BASE}/include/X11/keysym.h \ -+ ${X11BASE}/include/X11/keysymdef.h - #mainkey.o : $(WORKS) # for OpenWindows - mainslct.o : $(WORKS) - mainutil.o : $(XLIBH) $(STRUCT) hfiles/extern.h Index: files/patch-ab =================================================================== RCS file: /home/ncvs/ports/astro/saoimage/files/patch-ab,v retrieving revision 1.3 diff -u -r1.3 patch-ab --- files/patch-ab 29 Feb 2000 03:23:16 -0000 1.3 +++ files/patch-ab 12 Jan 2003 14:06:12 -0000 @@ -9,12 +9,3 @@ LINT = lint RANLIB = ranlib -@@ -27,7 +27,7 @@ - press.o remote.o resize.o util.o - - LIB = libbtn.a --XLIBH = /usr/include/X11/Xlib.h -+XLIBH = ${X11BASE}/include/X11/Xlib.h - #XLIBH = /usr/openwin/share/include/X11/Xlib.h #for OpenWindows - - all: $(LIB) Index: files/patch-af =================================================================== RCS file: /home/ncvs/ports/astro/saoimage/files/patch-af,v retrieving revision 1.2 diff -u -r1.2 patch-af --- files/patch-af 27 Jul 2002 02:36:06 -0000 1.2 +++ files/patch-af 12 Jan 2003 14:06:12 -0000 @@ -1,11 +1,11 @@ ---- lin.c.orig Thu May 9 04:35:06 2002 -+++ lin.c Wed Jul 24 00:52:50 2002 +--- lin.c.orig Fri Jan 10 18:07:18 2003 ++++ lin.c Fri Jan 10 18:07:34 2003 @@ -163,7 +163,7 @@ * $Id: lin.c,v 2.8 2002/01/30 06:04:03 mcalabre Exp $ *===========================================================================*/ -#if defined(__convexc__) || defined(__APPLE__) -+#if defined(__convexc__) || defined(__STDC__) ++#if defined(__convexc__) || defined(__APPLE__) || defined(__STDC__) #include <stdlib.h> #else #include <malloc.h> --- saoimage.patch 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?200301121431.h0CEVRGk000584>