Support CC/CFLAGS/X11BASE properly

Support install macros
Install sample configuration file

PR:		17048
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

4 files changed, 46 insertions, 14 deletions

diff --git a/astro/saoimage/Makefile b/astro/saoimage/Makefile
index fdb3424d0c4a..0c9337727aa0 100644
--- a/astro/saoimage/Makefile
+++ b/astro/saoimage/Makefile
@@ -13,15 +13,13 @@ MASTER_SITES=	ftp://cfa-ftp.harvard.edu/pub/gsc/SAOimage/
 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 --git a/astro/saoimage/files/patch-aa b/astro/saoimage/files/patch-aa
index b418a4ecc2ec..050999c21fea 100644
--- a/astro/saoimage/files/patch-aa
+++ b/astro/saoimage/files/patch-aa
@@ -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 --git a/astro/saoimage/files/patch-ab b/astro/saoimage/files/patch-ab
index 7b58e790b618..a2e953f0882b 100644
--- a/astro/saoimage/files/patch-ab
+++ b/astro/saoimage/files/patch-ab
@@ -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 --git a/astro/saoimage/pkg-plist b/astro/saoimage/pkg-plist
index fcfebbbbab68..e977f548debd 100644
--- a/astro/saoimage/pkg-plist
+++ b/astro/saoimage/pkg-plist
@@ -1 +1,2 @@
 bin/saoimage
+etc/imtoolrc.sample