Update to version 0.8.

PR:		22934
Submitted by:	maintainer
This commit is contained in:
Steve Price 2000-12-11 02:05:28 +00:00
parent 76dff64688
commit bddaa2860e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=35832
8 changed files with 81 additions and 72 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= abs
PORTVERSION= 0.6a
PORTVERSION= 0.8
CATEGORIES= math
MASTER_SITES= http://www.ping.be/bertin/ \
http://www.giovannelli.it/~gmarco/files/
@ -16,18 +16,17 @@ MAINTAINER= gmarco@giovannelli.it
USE_XLIB= yes
USE_XPM= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/src
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/abs ${PREFIX}/bin
post-install:
@${ECHO} "For the changes from previous version 0.5"
@${ECHO} "you can read the NEWS file in ${WRKDIR}"
@${ECHO} ""
@${ECHO} "There are also some examples (not installed) in :"
@${ECHO} "${WRKDIR}/Examples"
@${ECHO} ""
@${ECHO} ""
@${ECHO_MSG} "For the changes from previous version"
@${ECHO_MSG} "you can read the NEWS file in ${WRKSRC}"
@${ECHO_MSG} ""
@${ECHO_MSG} "There are also some examples (not installed) in :"
@${ECHO_MSG} "${WRKSRC}/Examples"
@${ECHO_MSG} ""
@${ECHO_MSG} ""
.include <bsd.port.mk>

View File

@ -1 +1 @@
MD5 (abs-src-0.6a.tar.gz) = 3c391e2ea78ac66e78a5153ca94e7234
MD5 (abs-src-0.8.tar.gz) = 421faf4cc2f3a82907cfe012e35e3d37

View File

@ -1,43 +1,53 @@
--- Makefile.orig Mon Apr 5 16:43:35 1999
+++ Makefile Fri Aug 11 07:31:39 2000
@@ -3,16 +3,16 @@
### Compilers, Programs and Flags
#################################
### C Compiler
-CC = cc -c
+CC ?= cc -c
/*CC = cc -c -Aa -D_HPUX_SOURCE*/
-CFLAGS = -I./pixmaps -I./Xpm -I./TextField-1.0 -I/usr/contrib/X11R6/include
+CFLAGS += -I./pixmaps -I./TextField-1.0 -I$(X11BASE)/include
### Fortran Compiler
FC = xlf
FFLAGS = -qlanglvl=90ext
### Linker/Loader
-LD = cc
+LD = $(CC)
LDFLAGS =
### Shell Command
@@ -199,17 +199,17 @@
### Program Libraries #
#######################
-LIBS = -L /usr/lib -L /lib/X11 -L /usr/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext -L./Xpm -lxpm ./TextField-1.0/*.o
+LIBS = -L$(X11BASE)/lib -lXaw -lX11 -lm -lXt -lXmu -lXext -lXpm ./TextField-1.0/*.o
--- Makefile.orig Thu Nov 16 04:59:20 2000
+++ Makefile Fri Nov 17 03:29:05 2000
@@ -1,28 +1,28 @@
CURRENT_DIR = .
-SUBDIRS = cd Xpm; make; cd ../TextField-1.0; make; cd ..
+SUBDIRS = cd ./TextField-1.0; $(MAKE); cd ..
-SUBDIRS = Xpm ABV X11 Kernel Plot Database Fig Interface X11/xedit SAMCEF
+SUBDIRS = ABV X11 Kernel Plot Database Fig Interface X11/xedit SAMCEF
SUBDIRS2 = ABV X11 Kernel Plot Database Fig Interface
-MAKE = make
+MAKE ?= make
#for linux and aix LIBS = -L /lib/X11 -L /usr/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext
#for silicon: LIBS = -lXaw -lX11 -lm -lXt -lXmu -lXext
#for hp LIBS = -L /lib/X11 -L /usr/X11R6/lib -L /usr/contrib/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext
#for netBSD LIBS = -L /usr/lib -L /usr/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext
-LIBS = -L /lib/X11 -L /usr/X11R6/lib -L /usr/contrib/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext
+LIBS = -L${X11BASE}/lib -lXaw -lX11 -lm -lXt -lXmu -lXext -lXpm
#for hp DEFINE = -D_HPUX_SOURCE
DEFINE =
-CFLAGS = -O2
+CFLAGS ?= -O2
#for hp IncludeDir = /usr/contrib/X11R6/include
#for net-BSD IncludeDir = /usr/X11R6/include
-IncludeDir = .
+IncludeDir = ${X11BASE}/include
#for hp Ccompiler = c89
-Ccompiler = cc
+Ccompiler = ${CC}
all::
rm -f ./abs;\
@@ -31,12 +31,12 @@
if [ -d $$i ] ; \
then \
(cd $$i ; echo "making" all "in $(CURRENT_DIR)/$$i..."; \
- $(MAKE) TOPCFLAGS=$(CFLAGS) IncludeDir=$(IncludeDir) Ccompiler=$(Ccompiler) DEFINE=$(DEFINE) all); \
+ $(MAKE) TOPCFLAGS="$(CFLAGS)" IncludeDir="$(IncludeDir)" Ccompiler="$(Ccompiler)" DEFINE="$(DEFINE)" all); \
fi \
done
- cc -o abs ./Plot/*.o ./ABV/*.o \
+ ${CC} -o abs ./Plot/*.o ./ABV/*.o \
Fig/*.o Interface/*.o X11/xedit/*.o \
- ./Kernel/*.o ./X11/*.o ./Database/*.o ./Xpm/libxpm.a\
+ ./Kernel/*.o ./X11/*.o ./Database/*.o\
$(LIBS) $(DEFINE)
########################
### Additional Targets #
########################
all: $(OBJS)
- cd Xpm; make; cd ../TextField-1.0; make; cd ..
+ cd ./TextField-1.0; $(MAKE); cd ..
@echo "Linking $(PROGRAM) ..."
@$(LD) $(LDFLAGS) $(OBJS) $(LIBS) -o $(PROGRAM)
@echo "done"

View File

@ -1,11 +0,0 @@
--- TextField-1.0/Makefile.orig Sun Apr 11 09:23:53 1999
+++ TextField-1.0/Makefile Sun Apr 11 09:24:09 1999
@@ -1,7 +1,7 @@
# Makefile for widget demo programs
ATHENALIBS = -lXaw -lXmu -lXt -lX11 -lm
-CFLAGS = $(DEFINES) $(CDEBUGFLAGS) -I/usr/contrib/X11R6/include
+CFLAGS += $(DEFINES) $(CDEBUGFLAGS) -I$(X11BASE)/include
CDEBUGFLAGS =
DEFINES =
RM = rm -f

View File

@ -1,11 +0,0 @@
--- widget_makerX11.h.orig Sun Apr 18 16:50:18 1999
+++ widget_makerX11.h Sun Apr 18 16:51:08 1999
@@ -28,7 +28,7 @@
#include <stdio.h>
#include "param.h"
-#include "xpm.h"
+#include <X11/xpm.h>
extern void mpst();
extern void mcut();

11
math/abs/files/patch-ad Normal file
View File

@ -0,0 +1,11 @@
--- X11/button.h.orig Thu Nov 16 06:10:42 2000
+++ X11/button.h Fri Nov 17 03:19:31 2000
@@ -28,7 +28,7 @@
#define WIDGET_BUTTON_H
#include "param.h"
-#include "xpm.h"
+#include <X11/xpm.h>
extern int make_pixmap_from_data (Widget parent, char **bits, Pixmap * bm);
extern Widget

11
math/abs/files/patch-ae Normal file
View File

@ -0,0 +1,11 @@
--- X11/popnindex.h.orig Thu Nov 16 06:10:42 2000
+++ X11/popnindex.h Fri Nov 17 03:20:13 2000
@@ -29,7 +29,7 @@
#include <stdio.h>
#include "param.h"
-#include "xpm.h"
+#include <X11/xpm.h>
extern void m_paste ();
extern void m_cut ();

View File

@ -5,7 +5,7 @@ syntax as Microsoft Visual Basic.
Author : Andre.Bertin@ping.be
WWW: http://www.ping.be/bertin/abs.shtml
Distfile: abs-src-0.6a.tar.gz (270 kb)
Distfile: abs-src-0.8.tar.gz (287 kb)
Ported to FreeBSD by:
- Gianmarco Giovannelli (gmarco@giovannelli.it)