Date: Mon, 28 Feb 2000 10:51:49 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/17048: Update port: astro/saoimage Message-ID: <200002281851.KAA41596@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 17048
>Category: ports
>Synopsis: Update port: astro/saoimage
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Feb 28 11:00:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 3.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Support CC/CFLAGS/X11BASE properly
- Support install macros
- Install sample configuration file
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/astro/saoimage/Makefile astro/saoimage/Makefile
--- /usr/ports/astro/saoimage/Makefile Sun Feb 27 08:14:14 2000
+++ astro/saoimage/Makefile Mon Feb 28 02:59:50 2000
@@ -13,15 +13,13 @@
MAINTAINER= ports@FreeBSD.org
MAKEFILE= makefile
-ALL_TARGET= FreeBSD
-INSTALL_TARGET= -f makefile.$(ALL_TARGET) install_saobin install_saoman
-
-MANL= saoimage.l
+ALL_TARGET= ${OPSYS}
USE_X_PREFIX= yes
+MAN1= saoimage.1
-pre-build:
- @(cd ${WRKSRC}/btnlib; ${MAKE})
-post-install:
- strip $(PREFIX)/bin/saoimage
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/saoimage ${PREFIX}/bin
+ ${INSTALL_DATA} ${WRKSRC}/imtoolrc ${PREFIX}/etc/imtoolrc.sample
+ ${INSTALL_MAN} ${WRKSRC}/doc/saoimage.man ${PREFIX}/man/man1/saoimage.1
.include <bsd.port.mk>
diff -urN /usr/ports/astro/saoimage/patches/patch-aa astro/saoimage/patches/patch-aa
--- /usr/ports/astro/saoimage/patches/patch-aa Mon Jan 24 20:13:06 2000
+++ astro/saoimage/patches/patch-aa Mon Feb 28 02:58:09 2000
@@ -1,5 +1,5 @@
---- makefile.FreeBSD.orig Fri Nov 5 15:57:30 1999
-+++ makefile.FreeBSD Sun Jan 16 23:43:10 2000
+--- makefile.FreeBSD.orig Sat Nov 6 06:57:30 1999
++++ makefile.FreeBSD Mon Feb 28 02:57:59 2000
@@ -36,9 +36,9 @@
# FBCONFIG_2, which is set to the value of IMTOOLRC in the definition of
# the CFLAGS macro below.)
@@ -9,16 +9,49 @@
-IMTRCDIR = $(ROOT)/usr/local/lib/
+SAOBINDIR = $(ROOT)$(PREFIX)/bin/
+SAOMANDIR = $(ROOT)$(PREFIX)/man/manl/
-+IMTRCDIR = $(ROOT)$(PREFIX)/lib/
++IMTRCDIR = $(ROOT)$(PREFIX)/etc/
IMTOOLRC = $(IMTRCDIR)imtoolrc
FIFO_I = $(ROOT)/dev/imt1i
-@@ -76,7 +76,7 @@
+@@ -46,7 +46,7 @@
+ FIFO_LN = $(ROOT)/dev/imt1
+
+ # Compiler specification.
+-CC = cc
++CC ?= cc
+ # 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 @@
# OFLAGS: compiler optimization/debug options.
#OFLAGS = -g -DDEBUG
-OFLAGS = -O2 -m486 -pipe
-+OFLAGS = -O2 -pipe
++#OFLAGS = -O2 -m486 -pipe
# 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
+@@ -106,7 +106,7 @@
+ RM = rm -f
+ SHELL = /bin/sh
+
+-CFLAGS = $(OFLAGS) $(ADFLAGS) $(MFLAGS) $(IFLAGS) -DFBCONFIG_2=\"$(IMTOOLRC)\"
++CFLAGS += $(OFLAGS) $(ADFLAGS) $(MFLAGS) $(IFLAGS) -DFBCONFIG_2=\"$(IMTOOLRC)\"
+
+ # SAOimage libraries that live in subdirectories with their own makefiles.
+ # This definition must be kept in correspondence with the DEPLIBS target.
diff -urN /usr/ports/astro/saoimage/patches/patch-ab astro/saoimage/patches/patch-ab
--- /usr/ports/astro/saoimage/patches/patch-ab Sun Sep 27 19:24:22 1998
+++ astro/saoimage/patches/patch-ab Mon Feb 28 02:12:07 2000
@@ -5,7 +5,7 @@
# make procedure in the parent SAOimage directory.
-CFLAGS = -c -O
-+CFLAGS = -c -O -I${X11BASE}/include
++CFLAGS += -c -I${X11BASE}/include
LINT = lint
RANLIB = ranlib
diff -urN /usr/ports/astro/saoimage/pkg/PLIST astro/saoimage/pkg/PLIST
--- /usr/ports/astro/saoimage/pkg/PLIST Fri Aug 14 07:15:02 1998
+++ astro/saoimage/pkg/PLIST Mon Feb 28 02:59:34 2000
@@ -1 +1,2 @@
bin/saoimage
+etc/imtoolrc.sample
>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?200002281851.KAA41596>