Date: Tue, 4 Sep 2018 12:37:12 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478952 - head/graphics/aalib Message-ID: <201809041237.w84CbCDk064967@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Sep 4 12:37:12 2018 New Revision: 478952 URL: https://svnweb.freebsd.org/changeset/ports/478952 Log: - Fix license - Switch to USES=localbase - Fix hidden dependency on devel/libslang2 [1] - Add separate option for each supported driver (X11, NCURSES, SLANG) - Sort plist PR: 231044 [1] Reported by: dclarke@blastwave.org [1] Modified: head/graphics/aalib/Makefile head/graphics/aalib/pkg-plist Modified: head/graphics/aalib/Makefile ============================================================================== --- head/graphics/aalib/Makefile Tue Sep 4 12:28:45 2018 (r478951) +++ head/graphics/aalib/Makefile Tue Sep 4 12:37:12 2018 (r478952) @@ -3,35 +3,35 @@ PORTNAME= aalib DISTVERSION= 1.4rc5 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= graphics MASTER_SITES= SF/aa-project/aa-lib/1.4rc5 MAINTAINER= ports@FreeBSD.org COMMENT= ASCII art library -LICENSE= GPLv2 +LICENSE= LGPL20+ LICENSE_FILE= ${WRKSRC}/COPYING -OPTIONS_DEFINE= X11 - -USES= libtool ncurses makeinfo +USES= libtool localbase makeinfo WRKSRC= ${WRKDIR}/${PORTNAME}-1.4.0 GNU_CONFIGURE= yes USE_LDCONFIG= yes INFO= aalib -LDFLAGS+= -L${LOCALBASE}/lib -.include <bsd.port.options.mk> +OPTIONS_MULTI= DRIVERS +OPTIONS_MULTI_DRIVERS= X11 NCURSES SLANG +OPTIONS_DEFAULT= NCURSES -.if ${PORT_OPTIONS:MX11} -USE_XORG= x11 -CONFIGURE_ARGS= --x-includes="${LOCALBASE}/include" \ - --x-libraries="${LOCALBASE}/lib" -.else -CONFIGURE_ARGS= --with-x=no -.endif +DRIVERS_DESC= Drives selection +X11_USE= XORG=x11 +X11_CONFIGURE_WITH= x11-driver=yes +NCURSES_USES= ncurses +NCURSES_CONFIGURE_WITH= curses-driver=yes +SLANG_LIB_DEPENDS= libslang.so:devel/libslang2 +SLANG_CONFIGURE_WITH= slang-driver=yes + post-extract: @${RM} ${WRKSRC}/doc/aalib.info* @@ -47,6 +47,6 @@ post-patch: | ${XARGS} ${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaa.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaa.so .include <bsd.port.mk> Modified: head/graphics/aalib/pkg-plist ============================================================================== --- head/graphics/aalib/pkg-plist Tue Sep 4 12:28:45 2018 (r478951) +++ head/graphics/aalib/pkg-plist Tue Sep 4 12:37:12 2018 (r478952) @@ -1,44 +1,42 @@ bin/aafire bin/aainfo +bin/aalib-config bin/aasavefont bin/aatest -bin/aalib-config include/aalib.h lib/libaa.a lib/libaa.so lib/libaa.so.1 lib/libaa.so.1.0.4 -share/aclocal/aalib.m4 +man/man1/aafire.1.gz man/man3/aa_attrs.3.gz man/man3/aa_autoinit.3.gz +man/man3/aa_autoinitkbd.3.gz +man/man3/aa_autoinitmouse.3.gz man/man3/aa_close.3.gz man/man3/aa_createedit.3.gz man/man3/aa_currentfont.3.gz man/man3/aa_defparams.3.gz -man/man3/aa_autoinitkbd.3.gz -man/man3/aa_autoinitmouse.3.gz man/man3/aa_defrenderparams.3.gz +man/man3/aa_displayrecommended.3.gz man/man3/aa_dithernames.3.gz man/man3/aa_drivers.3.gz -man/man3/mem_d.3.gz man/man3/aa_edit.3.gz -man/man3/aa_fonts.3.gz -man/man3/aa_getkey.3.gz -man/man3/aa_help.3.gz -man/man3/aa_hidecursor.3.gz -man/man3/aa_image.3.gz -man/man3/aa_displayrecommended.3.gz man/man3/aa_editkey.3.gz man/man3/aa_fastrender.3.gz -man/man3/aa_init.3.gz -man/man3/aa_printf.3.gz +man/man3/aa_fonts.3.gz man/man3/aa_formats.3.gz man/man3/aa_getevent.3.gz +man/man3/aa_getkey.3.gz man/man3/aa_getmouse.3.gz man/man3/aa_gotoxy.3.gz +man/man3/aa_help.3.gz +man/man3/aa_hidecursor.3.gz man/man3/aa_hidemouse.3.gz +man/man3/aa_image.3.gz man/man3/aa_imgheight.3.gz man/man3/aa_imgwidth.3.gz +man/man3/aa_init.3.gz man/man3/aa_initkbd.3.gz man/man3/aa_initmouse.3.gz man/man3/aa_kbddrivers.3.gz @@ -48,6 +46,7 @@ man/man3/aa_mmwidth.3.gz man/man3/aa_mousedrivers.3.gz man/man3/aa_mouserecommended.3.gz man/man3/aa_parseoptions.3.gz +man/man3/aa_printf.3.gz man/man3/aa_putpixel.3.gz man/man3/aa_puts.3.gz man/man3/aa_recommendhi.3.gz @@ -71,5 +70,6 @@ man/man3/aa_showmouse.3.gz man/man3/aa_text.3.gz man/man3/aa_uninitkbd.3.gz man/man3/aa_uninitmouse.3.gz +man/man3/mem_d.3.gz man/man3/save_d.3.gz -man/man1/aafire.1.gz +share/aclocal/aalib.m4
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809041237.w84CbCDk064967>