[Midnightbsd-cvs] mports [18410] trunk/lang/guile: fix plist

[laffer1 at midnightbsd.org]

Revision: 18410
          http://svnweb.midnightbsd.org/mports/?rev=18410
Author:   laffer1
Date:     2015-03-28 16:34:21 -0400 (Sat, 28 Mar 2015)
Log Message:
-----------
fix plist

Modified Paths:
--------------
    trunk/lang/guile/Makefile
    trunk/lang/guile/pkg-plist

Modified: trunk/lang/guile/Makefile
===================================================================
--- trunk/lang/guile/Makefile	2015-03-28 15:03:36 UTC (rev 18409)
+++ trunk/lang/guile/Makefile	2015-03-28 20:34:21 UTC (rev 18410)
@@ -2,7 +2,7 @@
 
 PORTNAME=	guile
 PORTVERSION=	1.8.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang scheme
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	guile
@@ -9,24 +9,25 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	GNU Ubiquitous Intelligent Language for Extension
-LICENSE=	lgpl
 
-LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp
+LICENSE=	lgpl2.1
 
-USE_AUTOTOOLS=	autoconf libltdl
-USE_GMAKE=	yes
-USE_GETTEXT=	yes
+LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
+		libgmp.so:${PORTSDIR}/math/gmp
+
+CONFLICTS_INSTALL=	guile2-[0-9]*
+
+USES=		gmake libtool makeinfo ncurses pathfix
+USE_AUTOTOOLS=	autoheader
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-USE_NCURSES=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-fwrapv
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
-GUILE_VER=	1.8
-PLIST_SUB=	GUILE_VER=${GUILE_VER}
+PLIST_SUB=	GUILE_VER=${PORTVERSION:R}
 
-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
@@ -33,8 +34,12 @@
 
 INFO=		goops guile-tut guile r5rs
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
+
 post-extract:
 	cd ${WRKSRC}; ${CHMOD} u+w ${REINPLACE_FILES}
 	@${FIND} ${WRKSRC}/doc -name "*.info*" -delete
@@ -42,6 +47,7 @@
 post-patch:
 	@cd ${WRKSRC} ; \
 	  ${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' ${REINPLACE_FILES}
-	@${REINPLACE_CMD} -e 's|2.63|%%AUTOCONF_VERSION%%|g' ${WRKSRC}/aclocal.m4
+	@${REINPLACE_CMD} -e 's|2.68|${AUTOCONF_VERSION}|g' ${WRKSRC}/aclocal.m4
+	@${TOUCH} ${WRKSRC}/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/lang/guile/pkg-plist
===================================================================
--- trunk/lang/guile/pkg-plist	2015-03-28 15:03:36 UTC (rev 18409)
+++ trunk/lang/guile/pkg-plist	2015-03-28 20:34:21 UTC (rev 18410)
@@ -111,30 +111,31 @@
 include/libguile/vports.h
 include/libguile/weaks.h
 lib/libguile-srfi-srfi-1-v-3.a
-lib/libguile-srfi-srfi-1-v-3.la
 lib/libguile-srfi-srfi-1-v-3.so
 lib/libguile-srfi-srfi-1-v-3.so.3
+lib/libguile-srfi-srfi-1-v-3.so.3.0.2
 lib/libguile-srfi-srfi-13-14-v-3.a
-lib/libguile-srfi-srfi-13-14-v-3.la
 lib/libguile-srfi-srfi-13-14-v-3.so
 lib/libguile-srfi-srfi-13-14-v-3.so.3
+lib/libguile-srfi-srfi-13-14-v-3.so.3.0.1
 lib/libguile-srfi-srfi-4-v-3.a
-lib/libguile-srfi-srfi-4-v-3.la
 lib/libguile-srfi-srfi-4-v-3.so
 lib/libguile-srfi-srfi-4-v-3.so.3
+lib/libguile-srfi-srfi-4-v-3.so.3.0.1
 lib/libguile-srfi-srfi-60-v-2.a
-lib/libguile-srfi-srfi-60-v-2.la
 lib/libguile-srfi-srfi-60-v-2.so
 lib/libguile-srfi-srfi-60-v-2.so.2
+lib/libguile-srfi-srfi-60-v-2.so.2.0.2
 lib/libguile.a
-lib/libguile.la
 lib/libguile.so
-lib/libguile.so.21
+lib/libguile.so.17
+lib/libguile.so.17.4.0
 lib/libguilereadline-v-17.a
-lib/libguilereadline-v-17.la
 lib/libguilereadline-v-17.so
 lib/libguilereadline-v-17.so.17
+lib/libguilereadline-v-17.so.17.0.3
 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
@@ -290,19 +291,3 @@
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-8.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-88.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-9.scm
- at dirrm %%DATADIR%%/%%GUILE_VER%%/srfi
- at dirrm %%DATADIR%%/%%GUILE_VER%%/scripts
- at dirrm %%DATADIR%%/%%GUILE_VER%%/oop/goops
- at dirrm %%DATADIR%%/%%GUILE_VER%%/oop
- at dirrm %%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives
- at dirrm %%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals
- at dirrm %%DATADIR%%/%%GUILE_VER%%/lang/elisp
- at dirrm %%DATADIR%%/%%GUILE_VER%%/lang
- at dirrm %%DATADIR%%/%%GUILE_VER%%/ice-9/debugging
- at dirrm %%DATADIR%%/%%GUILE_VER%%/ice-9/debugger
- at dirrm %%DATADIR%%/%%GUILE_VER%%/ice-9
- at dirrm %%DATADIR%%/%%GUILE_VER%%
- at dirrm %%DATADIR%%
- at dirrm include/libguile
- at dirrm include/guile/srfi
- at dirrm include/guile