cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Install info files from guile2 instead of guile.

Browse Source
This commit is contained in:
ajacoutot 2020-06-04 07:36:10 +00:00
parent ae44cefa1f
commit e974f4a013
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lang/guile/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.51 2019/07/12 20:47:18 sthen Exp $
# $OpenBSD: Makefile,v 1.52 2020/06/04 07:36:10 ajacoutot Exp $
PORTROACH+= limit:^1
@ -6,7 +6,8 @@ COMMENT= GNU's Ubiquitous Intelligent Language for Extension
VERSION= 1.8.8
DISTNAME= guile-${VERSION}
REVISION= 8
REVISION= 9
SHARED_LIBS= guile 20.0 \
guile-srfi-srfi-1-v-3 3.2 \
guile-srfi-srfi-13-14-v-3 3.1 \
@ -24,9 +25,9 @@ PERMIT_PACKAGE= Yes
WANTLIB= c gmp>=6 iconv intl ltdl m curses pthread readline
LIB_DEPENDS= devel/gettext,-runtime \
devel/gmp>=4.1 \
devel/gmp \
devel/libtool,-ltdl
RUN_DEPENDS= devel/slib>=3b4
RUN_DEPENDS= devel/slib
SEPARATE_BUILD= Yes
CONFIGURE_STYLE= gnu
@ -49,6 +50,8 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/guile-config/guile.m4 ${PREFIX}/share/aclocal
# Create symlink from share/guile/slib to share/slib.
# This allows other ports to find guile.init.
@cd ${PREFIX}/share/guile && ln -s ../slib
cd ${PREFIX}/share/guile && ln -s ../slib
# fix conflict with devel/guile2
rm -rf ${PREFIX}/info
.include <bsd.port.mk>

18
lang/guile/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.15 2015/03/16 18:07:49 naddy Exp $
@comment $OpenBSD: PLIST,v 1.16 2020/06/04 07:36:10 ajacoutot Exp $
@conflict slib-guile-*
@pkgpath devel/slib-guile
@bin bin/guile
@ -116,26 +116,22 @@ include/libguile/vectors.h
include/libguile/version.h
include/libguile/vports.h
include/libguile/weaks.h
@info info/goops.info
@info info/guile-tut.info
@info info/guile.info
@comment @info info/r5rs.info
lib/libguile-srfi-srfi-1-v-3.a
@static-lib lib/libguile-srfi-srfi-1-v-3.a
lib/libguile-srfi-srfi-1-v-3.la
@lib lib/libguile-srfi-srfi-1-v-3.so.${LIBguile-srfi-srfi-1-v-3_VERSION}
lib/libguile-srfi-srfi-13-14-v-3.a
@static-lib lib/libguile-srfi-srfi-13-14-v-3.a
lib/libguile-srfi-srfi-13-14-v-3.la
@lib lib/libguile-srfi-srfi-13-14-v-3.so.${LIBguile-srfi-srfi-13-14-v-3_VERSION}
lib/libguile-srfi-srfi-4-v-3.a
@static-lib lib/libguile-srfi-srfi-4-v-3.a
lib/libguile-srfi-srfi-4-v-3.la
@lib lib/libguile-srfi-srfi-4-v-3.so.${LIBguile-srfi-srfi-4-v-3_VERSION}
lib/libguile-srfi-srfi-60-v-2.a
@static-lib lib/libguile-srfi-srfi-60-v-2.a
lib/libguile-srfi-srfi-60-v-2.la
@lib lib/libguile-srfi-srfi-60-v-2.so.${LIBguile-srfi-srfi-60-v-2_VERSION}
lib/libguile.a
@static-lib lib/libguile.a
lib/libguile.la
@lib lib/libguile.so.${LIBguile_VERSION}
lib/libguilereadline-v-17.a
@static-lib lib/libguilereadline-v-17.a
lib/libguilereadline-v-17.la
@lib lib/libguilereadline-v-17.so.${LIBguilereadline-v-17_VERSION}
lib/pkgconfig/guile-${V}.pc

5
lang/guile2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.24 2019/12/14 15:45:01 cwen Exp $
# $OpenBSD: Makefile,v 1.25 2020/06/04 07:36:10 ajacoutot Exp $
# When updating, check that x11/gnome/aisleriot MODGNOME_CPPFLAGS references the
# proper guile2 includes directory
@ -11,7 +11,7 @@ DISTNAME= guile-${VERSION}
PKGNAME= guile2-${VERSION}
V= ${VERSION:R}
SUBST_VARS= V
REVISION= 0
REVISION= 1
CATEGORIES= lang
@ -58,6 +58,5 @@ post-install:
install -d ${PREFIX}/share/guile/site/${V}/
# fix conflict with devel/guile
mv ${PREFIX}/share/aclocal/guile{,${V}}.m4
rm -rf ${PREFIX}/info
.include <bsd.port.mk>

6
lang/guile2/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2018/07/18 10:14:40 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.8 2020/06/04 07:36:10 ajacoutot Exp $
bin/guild${V}
bin/guile-config${V}
bin/guile-snarf${V}
@ -132,6 +132,8 @@ include/guile/${V}/libguile/weak-set.h
include/guile/${V}/libguile/weak-table.h
include/guile/${V}/libguile/weak-vector.h
include/guile/${V}/readline.h
@info info/guile.info
@info info/r5rs.info
@comment lib/charset.alias
lib/guile/
lib/guile/${V}/
@ -475,7 +477,7 @@ lib/guile/${V}/extensions/
lib/guile/${V}/extensions/guile-readline.a
lib/guile/${V}/extensions/guile-readline.la
lib/guile/${V}/extensions/guile-readline.so.0.0
lib/libguile-${V}.a
@static-lib lib/libguile-${V}.a
lib/libguile-${V}.la
@lib lib/libguile-${V}.so.${LIBguile-${V}_VERSION}
lib/libguile-${V}.so.0.2-gdb.scm