View | Details | Raw Unified | Return to bug 219776 | Differences between
and this patch

Collapse All | Expand All

(-)math/R/Makefile (-1 / +9 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=		R
4
PORTNAME=		R
5
PORTVERSION=		3.4.1
5
PORTVERSION=		3.4.1
6
PORTREVISION=		1
6
PORTREVISION=		2
7
CATEGORIES=		math lang
7
CATEGORIES=		math lang
8
MASTER_SITES=		CRAN/src/base/R-${PORTVERSION:C|\..*||}
8
MASTER_SITES=		CRAN/src/base/R-${PORTVERSION:C|\..*||}
9
9
Lines 27-32 Link Here
27
			pathfix perl5 readline:port
27
			pathfix perl5 readline:port
28
28
29
USE_PERL5=		build
29
USE_PERL5=		build
30
USE_LDCONFIG=		${PREFIX}/lib/R/lib
30
31
31
OPTIONS_DEFINE=		ICU INFO LDOUBLE LETTER LIBR MEMPROF NLS RPROF X11
32
OPTIONS_DEFINE=		ICU INFO LDOUBLE LETTER LIBR MEMPROF NLS RPROF X11
32
OPTIONS_GROUP=		NEEDGCC NEEDX11
33
OPTIONS_GROUP=		NEEDGCC NEEDX11
Lines 135-142 Link Here
135
X11_CONFIGURE_WITH=	x
136
X11_CONFIGURE_WITH=	x
136
X11_USE=		xorg=ice,sm,x11,xext,xmu,xscrnsaver,xt
137
X11_USE=		xorg=ice,sm,x11,xext,xmu,xscrnsaver,xt
137
138
139
LIBVER=		0
140
PLIST_SUB=	LIBVER=${LIBVER}
141
138
post-patch:
142
post-patch:
139
	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure
143
	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure
144
	@${REINPLACE_CMD} "s|%%LIBVER%%|${LIBVER}|" \
145
		${WRKSRC}/src/main/Makefile.in \
146
		${WRKSRC}/src/extra/blas/Makefile.in \
147
		${WRKSRC}/src/modules/lapack/Makefile.in
140
148
141
.include <bsd.port.pre.mk>
149
.include <bsd.port.pre.mk>
142
.include "compiler.mk"
150
.include "compiler.mk"
(-)math/R/files/patch-src_extra_blas_Makefile.in (+30 lines)
Line 0 Link Here
1
--- src/extra/blas/Makefile.in.orig	2017-07-16 08:46:49 UTC
2
+++ src/extra/blas/Makefile.in
3
@@ -19,7 +19,7 @@ SOURCES = blas00.c blas.f cmplxblas.f
4
 Rblas_la = libRblas$(R_DYLIB_EXT)
5
 ## @RBLAS_LDFLAGS@ is used on macOS
6
 ## first for internal BLAS
7
-Rblas_la_LIBADD = @RBLAS_LDFLAGS@ $(FLIBS_IN_SO)
8
+Rblas_la_LIBADD = -Wl,-soname,libRblas.so.%%LIBVER%% $(FLIBS_IN_SO)
9
 ## then external one
10
 Rblas_la_LIBADD0 = @RBLAS_LDFLAGS@
11
 
12
@@ -43,6 +43,7 @@ Rblas_install: $(Rblas_la)
13
 	@$(MKINSTALLDIRS) $(DESTDIR)$(Rexeclibdir)
14
 	@$(SHELL) $(top_srcdir)/tools/copy-if-change $(Rblas_la) \
15
 	  $(DESTDIR)$(Rexeclibdir)/$(Rblas_la)
16
+	@cd $(DESTDIR)$(Rexeclibdir) && ln -s $(Rblas_la) $(Rblas_la).%%LIBVER%%
17
 
18
 Rblas_install-strip: $(Rblas_la)
19
 	@$(MKINSTALLDIRS) $(DESTDIR)$(Rexeclibdir)
20
@@ -50,6 +51,7 @@ Rblas_install-strip: $(Rblas_la)
21
 	@if test -n "$(STRIP_LIBS)"; then \
22
 	  $(STRIP_LIBS) "$(DESTDIR)$(Rexeclibdir)/$(Rblas_la)" ;\
23
 	fi
24
+	@cd "$(DESTDIR)$(Rexeclibdir)" && ln -s $(Rblas_la) $(Rblas_la).%%LIBVER%%
25
 
26
 mostlyclean: clean
27
 clean:
28
yes
29
native
30
text/plain
(-)math/R/files/patch-src_main_Makefile.in (+22 lines)
Line 0 Link Here
1
--- src/main/Makefile.in.orig	2017-07-16 08:46:49 UTC
2
+++ src/main/Makefile.in
3
@@ -110,7 +110,7 @@ libR_la_LIBADD =  $(MAIN_OBJS) $(EXTRA_STATIC_LIBS) $(
4
 libR_la_DEPENDENCIES = $(STATIC_LIBS) $(R_TZONE) @WANT_R_SHLIB_TRUE@ @USE_EXPORTFILES_TRUE@ $(top_builddir)/etc/R.exp
5
 
6
 ## The next is needed for macOS only at present
7
-LIBR_LDFLAGS = @LIBR_LDFLAGS@
8
+LIBR_LDFLAGS = -Wl,-soname,libR.so.%%LIBVER%%
9
 
10
 
11
 all: R
12
@@ -200,6 +200,7 @@ install-bin: installdirs
13
 install-lib: installdirs
14
 	@$(MKINSTALLDIRS) "$(DESTDIR)$(Rexeclibdir)"
15
 	@$(SHELL) $(top_srcdir)/tools/copy-if-change $(libR_la) "$(DESTDIR)$(Rexeclibdir)/$(libR_la)"
16
+	@cd "$(DESTDIR)$(Rexeclibdir)" && ln -s $(libR_la) $(libR_la).%%LIBVER%%
17
 install-static: installdirs
18
 	@$(MKINSTALLDIRS) "$(DESTDIR)$(Rexeclibdir)"
19
 	@$(SHELL) $(top_srcdir)/tools/copy-if-change libR.a "$(DESTDIR)$(Rexeclibdir)/libR.a"
20
yes
21
native
22
text/plain
(-)math/R/files/patch-src_modules_lapack_Makefile.in (+33 lines)
Line 0 Link Here
1
--- src/modules/lapack/Makefile.in.orig	2017-07-16 08:46:49 UTC
2
+++ src/modules/lapack/Makefile.in
3
@@ -82,16 +82,17 @@ $(lapack_la): $(lapack_la_OBJECTS)
4
 ## Include BLAS here, as with (static) ATLAS that pulls all the
5
 ## BLAS routines into one place.
6
 $(Rlapack_la): $(LIBOBJECTS)
7
-	$(DYLIB_LINK) -o $@ $(LIBOBJECTS) @RLAPACK_LDFLAGS@ @BLAS_LIBS@ $(Rlapack_la_LIBADD)
8
+	$(DYLIB_LINK) -o $@ $(LIBOBJECTS)  -Wl,-soname,libRlapack.so.%%LIBVER%% @BLAS_LIBS@ $(Rlapack_la_LIBADD)
9
 
10
 Rlapack_install: $(Rlapack_la) 
11
 	@$(MKINSTALLDIRS) "$(DESTDIR)$(Rexeclibdir)"
12
 	@$(SHELL) $(top_srcdir)/tools/copy-if-change $(Rlapack_la) \
13
 	  $(Rexeclibdir)/$(Rlapack_la)
14
-
15
+	@cd $(Rexeclibdir) && ln -s $(Rlapack_la) $(Rlapack_la).%%LIBVER%%
16
 install: installdirs
17
 	@$(SHELL) $(top_srcdir)/tools/copy-if-change $(lapack_la) "$(DESTDIR)$(Rexecmodulesdir)/$(lapack_la)"
18
 @USE_EXTERNAL_LAPACK_FALSE@	@$(SHELL) $(top_srcdir)/tools/copy-if-change $(Rlapack_la) "$(DESTDIR)$(Rexeclibdir)/$(Rlapack_la)"
19
+@USE_EXTERNAL_LAPACK_FALSE@	@cd "$(DESTDIR)$(Rexeclibdir)" && ln -sf $(Rlapack_la) $(Rlapack_la).%%LIBVER%%
20
 installdirs:
21
 	@$(MKINSTALLDIRS) "$(DESTDIR)$(Rexecmodulesdir)"
22
 install-strip-Rlapack:
23
@@ -104,6 +105,7 @@ install-strip: @USE_EXTERNAL_LAPACK_FALSE@ install-str
24
 	@if test -n "$(STRIP_LIBS)"; then \
25
 	  $(STRIP_LIBS) "$(DESTDIR)$(Rexecmodulesdir)/$(lapack_la)"; \
26
 	fi
27
+	@cd "$(DESTDIR)$(Rexeclibdir)" && ln -s $(Rlapack_la) $(Rlapack_la).%%LIBVER%%
28
 uninstall:
29
 	@rm -f "$(Rexecmodulesdir)/$(lapack_la)"
30
 
31
yes
32
native
33
text/plain
(-)math/R/pkg-plist (+3 lines)
Lines 101-108 Link Here
101
lib/R/include/Rversion.h
101
lib/R/include/Rversion.h
102
lib/R/include/S.h
102
lib/R/include/S.h
103
%%RBLAS%%lib/R/lib/libRblas.so
103
%%RBLAS%%lib/R/lib/libRblas.so
104
%%RBLAS%%lib/R/lib/libRblas.so.%%LIBVER%%
104
%%RBLAS%%lib/R/lib/libRlapack.so
105
%%RBLAS%%lib/R/lib/libRlapack.so
106
%%RBLAS%%lib/R/lib/libRlapack.so.%%LIBVER%%
105
%%LIBR%%lib/R/lib/libR.so
107
%%LIBR%%lib/R/lib/libR.so
108
%%LIBR%%lib/R/lib/libR.so.%%LIBVER%%
106
lib/R/library/KernSmooth/DESCRIPTION
109
lib/R/library/KernSmooth/DESCRIPTION
107
lib/R/library/KernSmooth/INDEX
110
lib/R/library/KernSmooth/INDEX
108
lib/R/library/KernSmooth/Meta/features.rds
111
lib/R/library/KernSmooth/Meta/features.rds
(-)math/cantor/Makefile (-3 / +2 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	cantor
3
PORTNAME=	cantor
4
PORTVERSION=	${KDE4_VERSION}
4
PORTVERSION=	${KDE4_VERSION}
5
PORTREVISION=	5
5
PORTREVISION=	6
6
CATEGORIES=	math kde kde-kde4
6
CATEGORIES=	math kde kde-kde4
7
7
8
MAINTAINER=	kde@FreeBSD.org
8
MAINTAINER=	kde@FreeBSD.org
Lines 32-39 Link Here
32
OCTAVE_RUN_DEPENDS=	octave:math/octave
32
OCTAVE_RUN_DEPENDS=	octave:math/octave
33
33
34
R_DESC=		Build R backend and install R
34
R_DESC=		Build R backend and install R
35
R_BUILD_DEPENDS=	R:math/R
35
R_LIB_DEPENDS=	libR.so:math/R
36
R_RUN_DEPENDS=		R:math/R
37
# Required to set CFLAGS for -lgfortran.
36
# Required to set CFLAGS for -lgfortran.
38
R_USES=		fortran
37
R_USES=		fortran
39
R_CMAKE_OFF=	-DWITH_R:BOOL=FALSE
38
R_CMAKE_OFF=	-DWITH_R:BOOL=FALSE
(-)math/rkward-kde4/Makefile (-5 / +4 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	rkward
4
PORTNAME=	rkward
5
PORTVERSION=	0.6.5
5
PORTVERSION=	0.6.5
6
PORTREVISION=	4
6
PORTREVISION=	5
7
CATEGORIES=	math
7
CATEGORIES=	math
8
MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
8
MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
9
PKGNAMESUFFIX=	-kde4
9
PKGNAMESUFFIX=	-kde4
Lines 13-22 Link Here
13
13
14
LICENSE=	GPLv2
14
LICENSE=	GPLv2
15
15
16
BUILD_DEPENDS=	${LOCALBASE}/bin/R:math/R
16
LIB_DEPENDS=	libR.so:math/R \
17
LIB_DEPENDS=	libsoprano.so:textproc/soprano
17
		libsoprano.so:textproc/soprano
18
RUN_DEPENDS=	${LOCALBASE}/bin/R:math/R \
18
RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/katepart.so:editors/kate
19
		${KDE_PREFIX}/lib/kde4/katepart.so:editors/kate
20
19
21
USES=		cmake gettext fortran kde:4 php:cli shared-mime-info
20
USES=		cmake gettext fortran kde:4 php:cli shared-mime-info
22
USE_QT4=	corelib dbus gui qmake_build moc_build network phonon rcc_build	\
21
USE_QT4=	corelib dbus gui qmake_build moc_build network phonon rcc_build	\
(-)math/rkward-kde4/pkg-plist (+2 lines)
Lines 3-8 Link Here
3
lib/R/library/rkward/DESCRIPTION
3
lib/R/library/rkward/DESCRIPTION
4
lib/R/library/rkward/INDEX
4
lib/R/library/rkward/INDEX
5
lib/R/library/rkward/Meta/Rd.rds
5
lib/R/library/rkward/Meta/Rd.rds
6
lib/R/library/rkward/Meta/features.rds
6
lib/R/library/rkward/Meta/hsearch.rds
7
lib/R/library/rkward/Meta/hsearch.rds
7
lib/R/library/rkward/Meta/links.rds
8
lib/R/library/rkward/Meta/links.rds
8
lib/R/library/rkward/Meta/nsInfo.rds
9
lib/R/library/rkward/Meta/nsInfo.rds
Lines 22-27 Link Here
22
lib/R/library/rkwardtests/DESCRIPTION
23
lib/R/library/rkwardtests/DESCRIPTION
23
lib/R/library/rkwardtests/INDEX
24
lib/R/library/rkwardtests/INDEX
24
lib/R/library/rkwardtests/Meta/Rd.rds
25
lib/R/library/rkwardtests/Meta/Rd.rds
26
lib/R/library/rkwardtests/Meta/features.rds
25
lib/R/library/rkwardtests/Meta/hsearch.rds
27
lib/R/library/rkwardtests/Meta/hsearch.rds
26
lib/R/library/rkwardtests/Meta/links.rds
28
lib/R/library/rkwardtests/Meta/links.rds
27
lib/R/library/rkwardtests/Meta/nsInfo.rds
29
lib/R/library/rkwardtests/Meta/nsInfo.rds
(-)math/rpy/Makefile (-5 / +4 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	rpy
4
PORTNAME=	rpy
5
PORTVERSION=	1.0.3
5
PORTVERSION=	1.0.3
6
PORTREVISION=	35
6
PORTREVISION=	36
7
CATEGORIES=	math
7
CATEGORIES=	math
8
MASTER_SITES=	SF
8
MASTER_SITES=	SF
9
9
Lines 13-22 Link Here
13
LICENSE=	GPLv2 LGPL21 MPL
13
LICENSE=	GPLv2 LGPL21 MPL
14
LICENSE_COMB=	dual
14
LICENSE_COMB=	dual
15
15
16
BUILD_DEPENDS=	${PYNUMPY} \
16
BUILD_DEPENDS=	${PYNUMPY}
17
		R:math/R
17
LIB_DEPENDS=	libR.so:math/R
18
RUN_DEPENDS=	${PYNUMPY} \
18
RUN_DEPENDS=	${PYNUMPY}
19
		R:math/R
20
19
21
USES=		python
20
USES=		python
22
USE_PYTHON=	distutils autoplist
21
USE_PYTHON=	distutils autoplist
(-)math/rpy2/Makefile (-4 / +3 lines)
Lines 12-21 Link Here
12
12
13
LICENSE=	GPLv2+
13
LICENSE=	GPLv2+
14
14
15
BUILD_DEPENDS=	${PYNUMPY} \
15
BUILD_DEPENDS=	${PYNUMPY}
16
		R:math/R
16
LIB_DEPENDS=	libR.so:math/R
17
RUN_DEPENDS=	${PYNUMPY} \
17
RUN_DEPENDS=	${PYNUMPY}
18
		R:math/R
19
18
20
USES=		fortran python readline
19
USES=		fortran python readline
21
USE_PYTHON=	distutils autoplist
20
USE_PYTHON=	distutils autoplist
(-)science/afni/Makefile (-4 / +3 lines)
Lines 20-29 Link Here
20
20
21
LICENSE=	GPLv2
21
LICENSE=	GPLv2
22
22
23
BUILD_DEPENDS=	gm4:devel/m4 \
23
BUILD_DEPENDS=	gm4:devel/m4
24
		R:math/R
25
LIB_DEPENDS=	libexpat.so:textproc/expat2 \
24
LIB_DEPENDS=	libexpat.so:textproc/expat2 \
26
		libf2c.so:lang/f2c \
25
		libf2c.so:lang/f2c \
26
		libR.so:math/R \
27
		libgsl.so:math/gsl \
27
		libgsl.so:math/gsl \
28
		libnetcdff.so:science/netcdf-fortran \
28
		libnetcdff.so:science/netcdf-fortran \
29
		libxml2.so:textproc/libxml2 \
29
		libxml2.so:textproc/libxml2 \
Lines 31-38 Link Here
31
RUN_DEPENDS=	endian:sysutils/endian \
31
RUN_DEPENDS=	endian:sysutils/endian \
32
		mpeg_encode:multimedia/mpeg_encode \
32
		mpeg_encode:multimedia/mpeg_encode \
33
		ppmtogif:graphics/netpbm \
33
		ppmtogif:graphics/netpbm \
34
		qhull:math/qhull5 \
34
		qhull:math/qhull5
35
		R:math/R
36
35
37
CONFLICTS=	im-[0-9]* \
36
CONFLICTS=	im-[0-9]* \
38
		nifticlib-[0-9]* \
37
		nifticlib-[0-9]* \

Return to bug 219776