Support X11-less installation. One sample executable -- xep -- will not

be built/installed. Add a missing backslash at EOL -- a fresh typo.
Remove a non-existing directory from CFLAGS -- a three year old typo.
This commit is contained in:
Mikhail Teterin 2002-10-31 23:36:04 +00:00
parent 2f6e05e344
commit d515a78c14
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=69225
4 changed files with 21 additions and 4 deletions

View File

@ -15,7 +15,14 @@ EXTRACT_SUFX= .tgz
MAINTAINER= demon@FreeBSD.org
.if defined(WITHOUT_X11)
PKGNAMESUFFIX= -nox11
MAKE_ENV+= WITHOUT_X11=yes
PLIST_SUB+= X11='@comment '
.else
USE_XLIB= yes
PLIST_SUB+= X11=''
.endif
WRKSRC= ${WRKDIR}/pvm3
MAKE_ENV+= PVM_ROOT=${WRKSRC} ARCHCFLAGS="${CFLAGS}"
@ -47,7 +54,7 @@ MAN3= libpvm.3 pvm_addhosts.3 pvm_addmhf.3 pvm_advise.3 \
MLINKS= pvm_intro.1 PVM.1 pvmd3.1 pvmd.1 \
libpvm.3 libfpvm.3 pvm_putinfo.3 pvm_delinfo.3 \
pvm_addmhf.3 pvm_delmhf.3 pvm_newcontext.3 pvm_freecontext.3 \
pvm_newcontext.3 pvm_getcontext.3
pvm_newcontext.3 pvm_getcontext.3 \
pvm_putinfo.3 pvm_getmboxinfo.3 pvm_setmwid.3 pvm_getmwid.3 \
pvm_settmask.3 pvm_gettmask.3 pvm_pack.3 pvm_packf.3 \
pvm_pack.3 pvm_pkbyte.3 pvm_pack.3 pvm_pkcplx.3 \

View File

@ -1,4 +1,4 @@
--- xep/Makefile.aimk.orig Fri Mar 12 22:31:23 1999
--- xep/Makefile.aimk Fri Mar 12 22:31:23 1999
+++ xep/Makefile.aimk Fri Mar 12 22:35:01 1999
@@ -24,8 +24,8 @@
CFLAGS = $(CFLOPTS) -I$(PVMIDIR) -L$(PVMLDIR) $(ARCHCFLAGS)
@ -6,7 +6,7 @@
XLIBS = -lXaw -lXmu -lXext -lXt -lX11
-XCFLAGS = -I/usr/local/X11R5/include -I/usr/local/X11/include \
- -L/usr/local/X11R5/lib -L/usr/local/X11/lib
+XCFLAGS = -I${X11BASE}/include -I{X11BASE}/X11/include \
+XCFLAGS = -I${X11BASE}/include \
+ -L${X11BASE}/lib
HEADERS = $(SDIR)/hostc.h $(SDIR)/imp.h $(SDIR)/myalloc.h \

10
net/pvm/files/patch-nox11 Normal file
View File

@ -0,0 +1,10 @@
--- xep/Makefile.aimk Fri Aug 29 10:17:48 1997
+++ xep/Makefile.aimk Thu Oct 31 18:28:36 2002
@@ -32,3 +32,7 @@
+.if defined(WITHOUT_X11)
+default: mtile$(EXESFX)
+.else
default: mtile$(EXESFX) xep$(EXESFX)
+.endif

View File

@ -57,7 +57,7 @@ lib/pvm/bin/FREEBSD/tracer
lib/pvm/bin/FREEBSD/trcsort
lib/pvm/bin/FREEBSD/trsg
lib/pvm/bin/FREEBSD/tst
lib/pvm/bin/FREEBSD/xep
%%X11%%lib/pvm/bin/FREEBSD/xep
include/fpvm3.h
include/fpvm3_watcom.h
include/pvm3.h