[Midnightbsd-cvs] mports [18275] trunk/devel/t1lib: switch to USES for libtool/gmake

[laffer1 at midnightbsd.org]

Revision: 18275
          http://svnweb.midnightbsd.org/mports/?rev=18275
Author:   laffer1
Date:     2015-03-22 10:47:03 -0400 (Sun, 22 Mar 2015)
Log Message:
-----------
switch to USES for libtool/gmake

Modified Paths:
--------------
    trunk/devel/t1lib/Makefile
    trunk/devel/t1lib/pkg-plist

Modified: trunk/devel/t1lib/Makefile
===================================================================
--- trunk/devel/t1lib/Makefile	2015-03-22 14:45:47 UTC (rev 18274)
+++ trunk/devel/t1lib/Makefile	2015-03-22 14:47:03 UTC (rev 18275)
@@ -1,50 +1,37 @@
-# ex:ts=8
-# New ports collection makefile for:	libt1
-# Date created:			13, May, 1999
-# Whom:				Ying-Chieh Liao <ijliao at csie.nctu.edu.tw>
-#
 # $MidnightBSD$
 # $FreeBSD: ports/devel/t1lib/Makefile,v 1.33 2006/08/14 22:55:17 clsung Exp $
-#
 
 PORTNAME=	t1lib
 PORTVERSION=	5.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	libs/graphics
+MASTER_SITES=	SUNSITE/libs/graphics/ \
+		http://www.skysmurf.nl/comp/FreeBSD/distfiles/
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	A Type 1 Rasterizer Library for UNIX/X11
-LICENSE=	gpl2
+COMMENT=	Type 1 Rasterizer Library for UNIX/X11
 
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool
+LICENSE=	lgpl
+
+USES=		gmake libtool
+GNU_CONFIGURE=	yes
 ALL_TARGET=	without_doc
 USE_LDCONFIG=	yes
 
-.if !defined(WITHOUT_X11)
-USE_XORG=	xaw
-CONFIGURE_ARGS+=	--with-x
-PLIST_SUB+=	X11=""
-.else
-CONFIGURE_ARGS+=	--without-x
-PLIST_SUB+=	X11="@comment "
-.endif
+OPTIONS_DEFINE=	X11 DOCS
+OPTIONS_DEFAULT=	X11
 
+OPTIONS_SUB=	yes
+X11_USE=	XORG=xaw
+X11_CONFIGURE_WITH=	x
+
 post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|^LIBTOOL[ ]*=.*|LIBTOOL=${LIBTOOL}|g'
 	@${REINPLACE_CMD} -e \
 		'/ALLSUBDIRS/s|$$(DOCSUBDIRS)||g' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e \
-		's|_LT_CURRENT=.*$$|_LT_CURRENT=5|g' ${WRKSRC}/configure
 
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/t1lib_doc.pdf ${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: trunk/devel/t1lib/pkg-plist
===================================================================
--- trunk/devel/t1lib/pkg-plist	2015-03-22 14:45:47 UTC (rev 18274)
+++ trunk/devel/t1lib/pkg-plist	2015-03-22 14:47:03 UTC (rev 18275)
@@ -3,14 +3,12 @@
 include/t1lib.h
 %%X11%%include/t1libx.h
 lib/libt1.a
-lib/libt1.la
 lib/libt1.so
 lib/libt1.so.5
+lib/libt1.so.5.1.2
 %%X11%%lib/libt1x.a
-%%X11%%lib/libt1x.la
 %%X11%%lib/libt1x.so
 %%X11%%lib/libt1x.so.5
+%%X11%%lib/libt1x.so.5.1.2
 %%PORTDOCS%%%%DOCSDIR%%/t1lib_doc.pdf
 %%DATADIR%%/t1lib.config
- at dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%