svn commit: r434163 - in head/net/pvm: . files
Tijl Coosemans
tijl at FreeBSD.org
Wed Feb 15 14:02:47 UTC 2017
Author: tijl
Date: Wed Feb 15 14:02:45 2017
New Revision: 434163
URL: https://svnweb.freebsd.org/changeset/ports/434163
Log:
- Add missing Xorg dependencies.
- Add patches to build a shared libgpvm3.so for net/p5-Parallel-Pvm.
- Remove unnecessary linking to librpcsvc.
Added:
head/net/pvm/files/patch-Makefile.aimk (contents, props changed)
head/net/pvm/files/patch-pvmgs-Makefile.aimk (contents, props changed)
Modified:
head/net/pvm/Makefile
head/net/pvm/files/patch-FREEBSD.def
head/net/pvm/pkg-plist
Modified: head/net/pvm/Makefile
==============================================================================
--- head/net/pvm/Makefile Wed Feb 15 13:19:45 2017 (r434162)
+++ head/net/pvm/Makefile Wed Feb 15 14:02:45 2017 (r434163)
@@ -3,7 +3,7 @@
PORTNAME= pvm
PORTVERSION= 3.4.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net parallel
MASTER_SITES= NL/pvm3 ftp://ftp.chg.ru/pub/prog/parallel/pvm3/
DISTNAME= pvm${PORTVERSION}
@@ -17,16 +17,16 @@ USES= tar:tgz
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/pvm3
-MAKE_ENV= PVM_ROOT=${WRKSRC} SHAREDLDFLAGS="-shared"
+MAKE_ENV= PVM_ROOT=${WRKSRC} SHAREDLDFLAGS="${LDFLAGS} -shared"
PVM_ROOT_REL= lib/pvm
PVM_ROOT= ${PREFIX}/${PVM_ROOT_REL}
SUB_FILES= pkg-message
OPTIONS_DEFINE= X11
-OPTIONS_DEFAULT= X11
+OPTIONS_DEFAULT=X11
OPTIONS_SUB= yes
-X11_USE= XORG=x11,xaw,xt
+X11_USE= XORG=x11,xaw,xext,xmu,xt
.include <bsd.port.options.mk>
@@ -69,6 +69,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libgpvm3.a ${STAGEDIR}${PREFIX}/lib
${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libpvmtrc.a ${STAGEDIR}${PREFIX}/lib
${INSTALL_LIB} ${WRKSRC}/lib/FREEBSD/libpvm3.so ${STAGEDIR}${PREFIX}/lib
+ ${INSTALL_LIB} ${WRKSRC}/lib/FREEBSD/libgpvm3.so ${STAGEDIR}${PREFIX}/lib
${INSTALL_DATA} ${WRKSRC}/conf/FREEBSD.def ${STAGEDIR}${PVM_ROOT}/conf
${INSTALL_DATA} ${WRKSRC}/include/* ${STAGEDIR}${PREFIX}/include
${INSTALL_MAN} ${WRKSRC}/man/man1/* ${STAGEDIR}${PREFIX}/man/man1
Modified: head/net/pvm/files/patch-FREEBSD.def
==============================================================================
--- head/net/pvm/files/patch-FREEBSD.def Wed Feb 15 13:19:45 2017 (r434162)
+++ head/net/pvm/files/patch-FREEBSD.def Wed Feb 15 14:02:45 2017 (r434163)
@@ -1,10 +1,14 @@
---- conf/FREEBSD.def.orig Wed Dec 19 11:09:23 2001
-+++ conf/FREEBSD.def Wed Dec 19 11:09:39 2001
-@@ -1,6 +1,6 @@
+--- conf/FREEBSD.def.orig 1998-10-01 21:02:13 UTC
++++ conf/FREEBSD.def
+@@ -1,9 +1,9 @@
ARCHCFLAGS = -DSOCKADHASLEN -DNOREXEC -DRSHCOMMAND=\"/usr/bin/rsh\" \
-DHASSTDLIB -DNEEDMENDIAN -DHASERRORVARS \
- -DFAKEXDRFLOAT -DSYSERRISCONST
+ -DFAKEXDRFLOAT -DSYSERRISCONST -DSHAREDTMP $(EXTRACFLAGS)
ARCHDLIB =
ARCHDOBJ =
- ARCHLIB = -lrpcsvc
+-ARCHLIB = -lrpcsvc
++ARCHLIB =
+ HASRANLIB = t
+ AR = ar
+ PVM_ARCH = FREEBSD
Added: head/net/pvm/files/patch-Makefile.aimk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pvm/files/patch-Makefile.aimk Wed Feb 15 14:02:45 2017 (r434163)
@@ -0,0 +1,10 @@
+--- Makefile.aimk.orig 2007-03-07 18:16:06 UTC
++++ Makefile.aimk
+@@ -136,4 +136,7 @@ shared:
+ @ echo "building shared in src"
+ cd src; ../lib/aimk $(PVMOPTS) install-shared
+ @ echo "done building shared in src"
++ @ echo "building shared in pvmgs"
++ cd pvmgs; ../lib/aimk $(PVMOPTS) install-shared
++ @ echo "done building shared in pvmgs"
+
Added: head/net/pvm/files/patch-pvmgs-Makefile.aimk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pvm/files/patch-pvmgs-Makefile.aimk Wed Feb 15 14:02:45 2017 (r434163)
@@ -0,0 +1,33 @@
+--- pvmgs/Makefile.aimk.orig 2001-11-30 20:33:11 UTC
++++ pvmgs/Makefile.aimk
+@@ -46,11 +46,14 @@ PROGS = $(PVMXDIR)/pvm_gstat$(EXESFX) \
+ LPROGS = $(PVMLDIR)/pvmgs$(EXESFX)
+
+ LIBGPVM = $(LIBPREFIX)gpvm3.a
++LIBGPVMSO = $(LIBPREFIX)gpvm3.so
+
+ install: all
+
+ install-mpp: all-mpp
+
++install-shared: $(PVMLDIR) $(PVMLDIR)/$(LIBGPVMSO)
++
+ all: $(DIRS) $(PROGS) $(PVMLDIR)/$(LIBGPVM) $(LPROGS)
+
+ all-mpp: $(DIRS) $(PROGS) $(PVMLDIR)/$(LIBGPVM)-mpp $(LPROGS)
+@@ -103,6 +106,15 @@ $(LIBGPVM)-mpp: $(LOBJ)
+ pvm_gstat$(EXESFX): pvm_gstat.o $(LIBGPVM) $(PVMLIBDEP)
+ $(CC) $(CFLAGS) -o $@ pvm_gstat.o $(LIBGPVM) $(LIBS)
+
++# shared library libgpvm3.so
++
++$(PVMLDIR)/$(LIBGPVMSO): $(LIBGPVMSO)
++ cp $(LIBGPVMSO) $(PVMLDIR)
++
++$(LIBGPVMSO): $(LOBJ)
++ rm -f $(LIBGPVMSO)
++ $(CC) $(SHAREDLDFLAGS) -o $(LIBGPVMSO) $(LOBJ) $(LIBS)
++
+ clean:
+ rm -f $(DOBJ) $(LOBJ) pvmgs$(EXESFX) $(LIBGPVM) \
+ pvm_gstat.o pvmgroups.o pvm_gstat$(EXESFX) pvmgroups$(EXESFX)
Modified: head/net/pvm/pkg-plist
==============================================================================
--- head/net/pvm/pkg-plist Wed Feb 15 13:19:45 2017 (r434162)
+++ head/net/pvm/pkg-plist Wed Feb 15 14:02:45 2017 (r434163)
@@ -8,6 +8,7 @@ include/pvmproto.h
include/pvmtev.h
lib/libfpvm3.a
lib/libgpvm3.a
+lib/libgpvm3.so
lib/libpvm3.a
lib/libpvm3.so
lib/libpvmtrc.a
More information about the svn-ports-all
mailing list