1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00

Clean up port

PR:		21481
Submitted by:	maintainer
This commit is contained in:
Ade Lovett 2000-10-13 20:16:30 +00:00
parent a3276d2388
commit ac4acd2783
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=33776
3 changed files with 25 additions and 14 deletions

View File

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

View File

@ -1,24 +1,35 @@
--- Makefile.orig Mon Apr 5 02:43:35 1999 --- Makefile.orig Mon Apr 5 16:43:35 1999
+++ Makefile Sun Apr 18 16:35:49 1999 +++ Makefile Fri Aug 11 07:31:39 2000
@@ -5,7 +5,7 @@ @@ -3,16 +3,16 @@
### Compilers, Programs and Flags
#################################
### C Compiler ### C Compiler
CC = cc -c -CC = cc -c
+CC ?= cc -c
/*CC = cc -c -Aa -D_HPUX_SOURCE*/ /*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./Xpm -I./TextField-1.0 -I/usr/contrib/X11R6/include
+CFLAGS = -I./pixmaps -I./TextField-1.0 -I$(X11BASE)/include +CFLAGS += -I./pixmaps -I./TextField-1.0 -I$(X11BASE)/include
### Fortran Compiler ### Fortran Compiler
FC = xlf FC = xlf
FFLAGS = -qlanglvl=90ext
### Linker/Loader
-LD = cc
+LD = $(CC)
LDFLAGS =
### Shell Command
@@ -199,17 +199,17 @@ @@ -199,17 +199,17 @@
### Program Libraries # ### 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 /usr/lib -L /lib/X11 -L /usr/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext -L./Xpm -lxpm ./TextField-1.0/*.o
+LIBS = -L /usr/lib -L /usr/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext -lXpm ./TextField-1.0/*.o +LIBS = -L$(X11BASE)/lib -lXaw -lX11 -lm -lXt -lXmu -lXext -lXpm ./TextField-1.0/*.o
-SUBDIRS = cd Xpm; make; cd ../TextField-1.0; make; cd .. -SUBDIRS = cd Xpm; make; cd ../TextField-1.0; make; cd ..
+SUBDIRS = cd ./TextField-1.0; make; cd .. +SUBDIRS = cd ./TextField-1.0; $(MAKE); cd ..
######################## ########################
### Additional Targets # ### Additional Targets #
@ -26,7 +37,7 @@
all: $(OBJS) all: $(OBJS)
- cd Xpm; make; cd ../TextField-1.0; make; cd .. - cd Xpm; make; cd ../TextField-1.0; make; cd ..
+ cd ./TextField-1.0; make; cd .. + cd ./TextField-1.0; $(MAKE); cd ..
@echo "Linking $(PROGRAM) ..." @echo "Linking $(PROGRAM) ..."
@$(LD) $(LDFLAGS) $(OBJS) $(LIBS) -o $(PROGRAM) @$(LD) $(LDFLAGS) $(OBJS) $(LIBS) -o $(PROGRAM)
@echo "done" @echo "done"

View File

@ -5,7 +5,7 @@
ATHENALIBS = -lXaw -lXmu -lXt -lX11 -lm ATHENALIBS = -lXaw -lXmu -lXt -lX11 -lm
-CFLAGS = $(DEFINES) $(CDEBUGFLAGS) -I/usr/contrib/X11R6/include -CFLAGS = $(DEFINES) $(CDEBUGFLAGS) -I/usr/contrib/X11R6/include
+CFLAGS = $(DEFINES) $(CDEBUGFLAGS) -I/usr/X11R6/include +CFLAGS += $(DEFINES) $(CDEBUGFLAGS) -I$(X11BASE)/include
CDEBUGFLAGS = CDEBUGFLAGS =
DEFINES = DEFINES =
RM = rm -f RM = rm -f