Date: Thu, 10 Oct 2013 00:20:43 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329950 - in head/lang: guile guile/files slib slib-guile Message-ID: <201310100020.r9A0KhBr029739@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Thu Oct 10 00:20:42 2013 New Revision: 329950 URL: http://svnweb.freebsd.org/changeset/ports/329950 Log: - Convert to staging - Convert to USES=gmake - Convert LIB_DEPENDS to new format Modified: head/lang/guile/Makefile head/lang/guile/files/patch-Makefile.am (contents, props changed) head/lang/guile/files/patch-Makefile.in (contents, props changed) head/lang/guile/pkg-plist (contents, props changed) head/lang/slib-guile/Makefile (contents, props changed) head/lang/slib/Makefile (contents, props changed) Modified: head/lang/guile/Makefile ============================================================================== --- head/lang/guile/Makefile Thu Oct 10 00:19:01 2013 (r329949) +++ head/lang/guile/Makefile Thu Oct 10 00:20:42 2013 (r329950) @@ -11,11 +11,10 @@ MASTER_SITE_SUBDIR= guile MAINTAINER= ports@FreeBSD.org COMMENT= GNU Ubiquitous Intelligent Language for Extension -LIB_DEPENDS= gmp:${PORTSDIR}/math/gmp +LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp USE_AUTOTOOLS= autoconf libltdl -USE_GMAKE= yes -USES= gettext ncurses +USES= gettext gmake ncurses GNU_CONFIGURE= yes USE_LDCONFIG= yes LDFLAGS+= -L${LOCALBASE}/lib @@ -24,15 +23,12 @@ CPPFLAGS+= -I${LOCALBASE}/include GUILE_VER= 1.8 PLIST_SUB= GUILE_VER=${GUILE_VER} -MAN1= guile.1 - REINPLACE_FILES= libguile/smob.c libguile/filesys.c libguile/gc.c \ libguile/mallocs.c libguile/eval.c libguile/gc-malloc.c \ libguile/ports.c libguile/gc-mark.c libguile/gc_os_dep.c INFO= goops guile-tut guile r5rs -NO_STAGE= yes post-extract: cd ${WRKSRC}; ${CHMOD} u+w ${REINPLACE_FILES} @${FIND} ${WRKSRC}/doc -name "*.info*" -delete Modified: head/lang/guile/files/patch-Makefile.am ============================================================================== --- head/lang/guile/files/patch-Makefile.am Thu Oct 10 00:19:01 2013 (r329949) +++ head/lang/guile/files/patch-Makefile.am Thu Oct 10 00:20:42 2013 (r329950) @@ -5,7 +5,7 @@ DISTCLEANFILES = check-guile.log -pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(DESTDIR)$(prefix)/libdata/pkgconfig ++pkgconfigdir = $(prefix)/libdata/pkgconfig pkgconfig_DATA = guile-1.8.pc # Makefile.am ends here Modified: head/lang/guile/files/patch-Makefile.in ============================================================================== --- head/lang/guile/files/patch-Makefile.in Thu Oct 10 00:19:01 2013 (r329949) +++ head/lang/guile/files/patch-Makefile.in Thu Oct 10 00:20:42 2013 (r329950) @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I guile-config DISTCLEANFILES = check-guile.log -pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(DESTDIR)$(prefix)/libdata/pkgconfig ++pkgconfigdir = $(prefix)/libdata/pkgconfig pkgconfig_DATA = guile-1.8.pc all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive Modified: head/lang/guile/pkg-plist ============================================================================== --- head/lang/guile/pkg-plist Thu Oct 10 00:19:01 2013 (r329949) +++ head/lang/guile/pkg-plist Thu Oct 10 00:20:42 2013 (r329950) @@ -135,6 +135,7 @@ lib/libguilereadline-v-17.la lib/libguilereadline-v-17.so lib/libguilereadline-v-17.so.17 libdata/pkgconfig/guile-1.8.pc +man/man1/guile.1.gz share/aclocal/guile.m4 %%DATADIR%%/%%GUILE_VER%%/guile-procedures.txt %%DATADIR%%/%%GUILE_VER%%/ice-9/and-let-star.scm Modified: head/lang/slib-guile/Makefile ============================================================================== --- head/lang/slib-guile/Makefile Thu Oct 10 00:19:01 2013 (r329949) +++ head/lang/slib-guile/Makefile Thu Oct 10 00:20:42 2013 (r329950) @@ -18,11 +18,6 @@ BUILD_DEPENDS= ${LOCALBASE}/share/slib/r RUN_DEPENDS:= ${BUILD_DEPENDS} NO_BUILD= yes - -NO_STAGE= yes -do-install: - ${LN} -shf ${PREFIX}/share/slib ${LOCALBASE}/share/guile/1.8/slib - ${LOCALBASE}/bin/guile -q -c \ - "(use-modules (ice-9 slib))(require 'new-catalog)" +NO_INSTALL= yes .include <bsd.port.mk> Modified: head/lang/slib/Makefile ============================================================================== --- head/lang/slib/Makefile Thu Oct 10 00:19:01 2013 (r329949) +++ head/lang/slib/Makefile Thu Oct 10 00:20:42 2013 (r329950) @@ -11,24 +11,21 @@ DISTFILES= slib-${PORTVERSION}${EXTRACT_ MAINTAINER= ports@FreeBSD.org COMMENT= A portable scheme library -USE_GMAKE= yes +USES= gmake ALL_TARGET= slib.info INFO= slib -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|/usr/lib/slib|${PREFIX}/share/slib|' ${WRKSRC}/guile.init do-install: - @${MKDIR} ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/*.scm ${WRKSRC}/*.init ${WRKSRC}/*.txt \ - ${WRKSRC}/*.xyz ${WRKSRC}/*.ps ${DATADIR} - ${INSTALL_MAN} ${WRKSRC}/slib.info ${MANPREFIX}/info -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} + ${WRKSRC}/*.xyz ${WRKSRC}/*.ps ${STAGEDIR}${DATADIR} + ${INSTALL_MAN} ${WRKSRC}/slib.info ${STAGEDIR}${MANPREFIX}/info + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ANNOUNCE ChangeLog FAQ README - ${INSTALL_MAN} ${WRKSRC}/${f} ${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310100020.r9A0KhBr029739>