mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

- X11BASE clean

Browse Source 
- properly link libpgplot.so against -lpng (so that each program which
  links with libpgplot.so does not have to specify -lpng)
- a bit cleaner (use macros where possible, etc.)

Submitted by:	knu
This commit is contained in:
Jean-Marc Zucconi 2001-06-26 21:11:16 +00:00
parent 88f263f5c0
commit 75de1f6dd9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=44478
5 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/pgplot/Makefile
View File

@ -7,16 +7,17 @@
PORTNAME= pgplot PORTNAME= pgplot
PORTVERSION= 5.2.2 PORTVERSION= 5.2.2
PORTREVISION= 1
CATEGORIES= graphics CATEGORIES= graphics
MASTER_SITES= ftp://ftp.astro.caltech.edu/pub/pgplot/ MASTER_SITES= ftp://ftp.astro.caltech.edu/pub/pgplot/
DISTNAME= ${PORTNAME}5.2 DISTNAME= ${PORTNAME}${PORTVERSION:R}
MAINTAINER= jmz@FreeBSD.org MAINTAINER= jmz@FreeBSD.org
LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png
USE_XLIB= yes USE_XLIB= yes
INSTALLS_SHLIB= yes INSTALLS_SHLIB= yes
WRKSRC= ${WRKDIR}/pgplot WRKSRC= ${WRKDIR}/${PORTNAME}
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
@ -33,6 +34,7 @@ FC= f77
.endif .endif
MAKE_ENV+= FC=${FC} MAKE_ENV+= FC=${FC}
MAKE_ARGS+= X11BASE="${X11BASE}"
post-install: post-install:
.for f in libcpgplot.so libpgplot.so .for f in libcpgplot.so libpgplot.so

7
graphics/pgplot/files/Makefile
View File

@ -1,8 +1,8 @@
D=examples/ # $FreeBSD$
all: all:
make -f Makefile.flib make -f Makefile.flib X11BASE="${X11BASE}"
make -f Makefile.clib make -f Makefile.clib
make -f Makefile.bin make -f Makefile.bin X11BASE="${X11BASE}"
make -f Makefile.doc make -f Makefile.doc
install: install:
@ -13,4 +13,3 @@ install:
install -c Makefile.demo examples/pgdemo*.f cpg/cpgdemo.c ${PREFIX}/share/pgplot install -c Makefile.demo examples/pgdemo*.f cpg/cpgdemo.c ${PREFIX}/share/pgplot
cp pgdispd/aaaread.me ${PREFIX}/share/pgplot/readme.pgdisp cp pgdispd/aaaread.me ${PREFIX}/share/pgplot/readme.pgdisp
install -c -s pgxwin_server pgdisp ${PREFIX}/bin install -c -s pgxwin_server pgdisp ${PREFIX}/bin

5
graphics/pgplot/files/Makefile.bin
View File

@ -1,7 +1,6 @@
DRVDIR=./drivers DRVDIR=./drivers
LIBS=-L${X11BASE}/lib -lX11 -lm
LIBS=-L/usr/X11R6/lib -lX11 -lm XINCL=-I${X11BASE}/include
XINCL=-I/usr/X11R6/include
CFLAGS+= $(XINCL) -DPGDISP CFLAGS+= $(XINCL) -DPGDISP
.PATH: . ./pgdispd .PATH: . ./pgdispd

6
graphics/pgplot/files/Makefile.demo
View File

@ -1,6 +1,6 @@
PGPLOT_LIB = -L/usr/local/lib -lpgplot -lpng PGPLOT_LIB = -L/usr/local/lib -lpgplot
CPGPLOT_LIB = -L/usr/local/lib -lcpgplot -lpng CPGPLOT_LIB = -L/usr/local/lib -lcpgplot
LIBS= -L/usr/X11R6/lib -lX11 -lm LIBS= -L${X11BASE}/lib -lX11 -lm
OSVERSION!= /sbin/sysctl -n kern.osreldate OSVERSION!= /sbin/sysctl -n kern.osreldate
.if ${OSVERSION} > 400004 .if ${OSVERSION} > 400004

3
graphics/pgplot/files/Makefile.flib
View File

@ -15,6 +15,7 @@ DRIVERS=gidriv.f gldriv.f hgdriv.f lxdriv.f nudriv.f ppdriv.f psdriv.f ttdriv.f
SRCS= ${PG_ROUTINES} ${PG_NON_STANDARD} ${GR_ROUTINES} ${SYSTEM_ROUTINES} \ SRCS= ${PG_ROUTINES} ${PG_NON_STANDARD} ${GR_ROUTINES} ${SYSTEM_ROUTINES} \
${DRIVERS} grexec.f ${DRIVERS} grexec.f
CFLAGS+=-DPG_PPU -I/usr/X11R6/include -I${PREFIX}/include CFLAGS+=-DPG_PPU -I${X11BASE}/include -I${PREFIX}/include
LDADD=-L${PREFIX}/lib -lpng
.include <bsd.lib.mk> .include <bsd.lib.mk>