Date: Sun, 24 Mar 2013 12:12:32 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315112 - in head: devel/libgii devel/libgiigic graphics/libggi graphics/libggigcp graphics/libggimisc graphics/libggiwmh Message-ID: <201303241212.r2OCCWRq060634@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine (src committer) Date: Sun Mar 24 12:12:31 2013 New Revision: 315112 URL: http://svnweb.freebsd.org/changeset/ports/315112 Log: Cleanup the GGI ports: - trim header - remove a dead master site - update my email address - remove article in COMMENT - add LICENSE - use OPTIONS(NG) - do not specify lib version in LIB_DEPENDS - libvgl can be used on amd64 since ~3 years (libgii and libggi) - libgii can use xxf86dga extension PR: ports/177332 Approved by: bapt Modified: head/devel/libgii/Makefile head/devel/libgiigic/Makefile head/graphics/libggi/Makefile head/graphics/libggigcp/Makefile head/graphics/libggimisc/Makefile head/graphics/libggiwmh/Makefile Modified: head/devel/libgii/Makefile ============================================================================== --- head/devel/libgii/Makefile Sun Mar 24 12:05:08 2013 (r315111) +++ head/devel/libgii/Makefile Sun Mar 24 12:12:31 2013 (r315112) @@ -1,22 +1,18 @@ -# New ports collection makefile for: libgii -# Date created: 4 January 2000 -# Whom: mwest@uct.ac.za -# +# Created by: mwest@uct.ac.za # $FreeBSD$ -# PORTNAME= libgii PORTVERSION= 1.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel -MASTER_SITES= http://www.ggi-project.org/ftp/ggi/v2.2/ \ - SF/ggi/ggi-core/${PORTNAME}-${PORTVERSION} - +MASTER_SITES= SF/ggi/ggi-core/${PORTNAME}-${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}.src -MAINTAINER= antoine.brodin@laposte.net +MAINTAINER= antoine@FreeBSD.org COMMENT= GGI API for input sources +LICENSE= MIT + WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_BZIP2= yes USE_LDCONFIG= yes @@ -184,28 +180,34 @@ MLINKS= gg-error.3 ggi-error.3 - gii-er gii_cmddata_getvalinfo.3 gii_phystype.3 - gii_valrange.3 \ filter-key.7 filter-keytrans.7 +OPTIONS_DEFINE= X11 +OPTIONS_DEFAULT=X11 + +.include <bsd.port.options.mk> + .if exists(/usr/include/dev/kii/kii.h) -CONFIGURE_ARGS+= --enable-kii --with-extra-includes=/usr/include/dev +CONFIGURE_ARGS+=--enable-kii --with-extra-includes=/usr/include/dev PLIST_SUB+= KII="" .else +CONFIGURE_ARGS+=--disable-kii PLIST_SUB+= KII="@comment " .endif -.if !defined(WITHOUT_X11) -USE_XORG= x11 +.if ${PORT_OPTIONS:MX11} +USE_XORG= x11 xxf86dga +CONFIGURE_ARGS+=--enable-x --with-x PLIST_SUB+= WITH_X="" .else -CONFIGURE_ARGS+= --disable-x --without-x +CONFIGURE_ARGS+=--disable-x --without-x PLIST_SUB+= WITH_X="@comment " .endif -.include <bsd.port.pre.mk> - -.if !exists(/usr/include/vgl.h) || ${ARCH} != "i386" -CONFIGURE_ARGS+= --disable-vgl -PLIST_SUB+= VGL="@comment " -.else +.if exists(/usr/include/vgl.h) && (${ARCH} == "i386" || ${ARCH} == "amd64") +CONFIGURE_ARGS+=--enable-vgl PLIST_SUB+= VGL="" +.else +CONFIGURE_ARGS+=--disable-vgl +PLIST_SUB+= VGL="@comment " .endif post-install: @@ -213,4 +215,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/filter/mouse/mouse ${PREFIX}/etc/ggi/filter/mouse.dist ${INSTALL_DATA} ${WRKSRC}/filter/keytrans/keytrans ${PREFIX}/etc/ggi/filter/keytrans.dist -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/libgiigic/Makefile ============================================================================== --- head/devel/libgiigic/Makefile Sun Mar 24 12:05:08 2013 (r315111) +++ head/devel/libgiigic/Makefile Sun Mar 24 12:12:31 2013 (r315112) @@ -1,23 +1,19 @@ -# New ports collection makefile for: libgiigic -# Date created: 7 December 2004 -# Whom: antoine.brodin@laposte.net -# +# Created by: Antoine Brodin <antoine@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libgiigic PORTVERSION= 1.1.2 PORTREVISION= 1 CATEGORIES= devel -MASTER_SITES= http://www.ggi-project.org/ftp/ggi/v2.2/ \ - SF/ggi/ggi-libs/${PORTNAME}-${PORTVERSION} - +MASTER_SITES= SF/ggi/ggi-libs/${PORTNAME}-${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}.src -MAINTAINER= antoine.brodin@laposte.net -COMMENT= A library on top of libgii, gic stands for General Input Configuration +MAINTAINER= antoine@FreeBSD.org +COMMENT= Library on top of libgii, gic stands for General Input Configuration + +LICENSE= MIT -LIB_DEPENDS= gii.1:${PORTSDIR}/devel/libgii +LIB_DEPENDS= gii:${PORTSDIR}/devel/libgii WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_BZIP2= yes Modified: head/graphics/libggi/Makefile ============================================================================== --- head/graphics/libggi/Makefile Sun Mar 24 12:05:08 2013 (r315111) +++ head/graphics/libggi/Makefile Sun Mar 24 12:12:31 2013 (r315112) @@ -1,24 +1,20 @@ -# New ports collection makefile for: libggi -# Date created: 4 January 2000 -# Whom: mwest@uct.ac.za -# +# Created by: mwest@uct.ac.za # $FreeBSD$ -# PORTNAME= libggi PORTVERSION= 2.2.2 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= graphics devel -MASTER_SITES= http://www.ggi-project.org/ftp/ggi/v2.2/ \ - SF/ggi/ggi-core/${PORTNAME}-${PORTVERSION} - +MASTER_SITES= SF/ggi/ggi-core/${PORTNAME}-${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}.src -MAINTAINER= antoine.brodin@laposte.net -COMMENT= A flexible drawing library +MAINTAINER= antoine@FreeBSD.org +COMMENT= Flexible drawing library + +LICENSE= MIT -LIB_DEPENDS= gii.1:${PORTSDIR}/devel/libgii +LIB_DEPENDS= gii:${PORTSDIR}/devel/libgii USE_BZIP2= yes USE_LDCONFIG= yes @@ -26,7 +22,6 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -CPPFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} MAN1= cube3d.1 ggi-demo.1 ggiteleserver.1 monitest.1 @@ -123,38 +118,47 @@ MLINKS= ggi-demo.1 demo.1 \ CONFIGURE_ARGS= --disable-directfb +OPTIONS_DEFINE= AALIB SVGALIB X11 +OPTIONS_DEFAULT=X11 + +.include <bsd.port.options.mk> + .if exists(/usr/include/dev/kgi/kgi.h) -CONFIGURE_ARGS+= --enable-kgi --with-extra-includes=/usr/include/dev +CONFIGURE_ARGS+=--enable-kgi --with-extra-includes=/usr/include/dev .endif -.if !defined(WITHOUT_X11) +.if ${PORT_OPTIONS:MX11} +CONFIGURE_ARGS+=--enable-x --with-x USE_XORG= x11 xxf86dga xxf86vm ice sm xau xext PLIST_SUB+= WITH_X="" .else -CONFIGURE_ARGS+= --disable-x --disable-dga +CONFIGURE_ARGS+=--disable-x --without-x PLIST_SUB+= WITH_X="@comment " .endif -.include <bsd.port.pre.mk> - -.if !exists(/usr/include/vgl.h) || ${ARCH} != "i386" -CONFIGURE_ARGS+= --disable-vgl -PLIST_SUB+= WITH_VGL="@comment " -.else +.if exists(/usr/include/vgl.h) && (${ARCH} == "i386" || ${ARCH} == "amd64") +CONFIGURE_ARGS+=--enable-vgl PLIST_SUB+= WITH_VGL="" +.else +CONFIGURE_ARGS+=--disable-vgl +PLIST_SUB+= WITH_VGL="@comment " .endif -.if defined(WITH_AALIB) || exists(${LOCALBASE}/include/aalib.h) -LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib +.if ${PORT_OPTIONS:MAALIB} +CONFIGURE_ARGS+=--enable-aa +LIB_DEPENDS+= aa:${PORTSDIR}/graphics/aalib PLIST_SUB+= WITH_AALIB="" .else +CONFIGURE_ARGS+=--disable-aa PLIST_SUB+= WITH_AALIB="@comment " .endif -.if defined(WITH_SVGALIB) || exists(${LOCALBASE}/include/vga.h) -LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib +.if ${PORT_OPTIONS:MSVGALIB} +CONFIGURE_ARGS+=--enable-vgagl --enable-svga +LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib PLIST_SUB+= WITH_SVGALIB="" .else +CONFIGURE_ARGS+=--disable-vgagl --disable-svga PLIST_SUB+= WITH_SVGALIB="@comment " .endif @@ -164,4 +168,4 @@ post-install: ${TOUCH} ${PREFIX}/lib/ggi/helper/.keep ${INSTALL_DATA} ${WRKSRC}/libggi.conf ${PREFIX}/etc/ggi/libggi.conf.dist -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/libggigcp/Makefile ============================================================================== --- head/graphics/libggigcp/Makefile Sun Mar 24 12:05:08 2013 (r315111) +++ head/graphics/libggigcp/Makefile Sun Mar 24 12:12:31 2013 (r315112) @@ -1,30 +1,25 @@ -# New ports collection makefile for: libggigcp -# Date created: 7 December 2004 -# Whom: antoine.brodin@laposte.net -# +# Created by: Antoine Brodin <antoine@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libggigcp PORTVERSION= 1.0.2 PORTREVISION= 1 CATEGORIES= graphics devel -MASTER_SITES= http://www.ggi-project.org/ftp/ggi/v2.2/ \ - SF/ggi/misc/${PORTNAME}-${PORTVERSION} - +MASTER_SITES= SF/ggi/misc/${PORTNAME}-${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}.src -MAINTAINER= antoine.brodin@laposte.net -COMMENT= A libggi extension for advanced color and palette handling +MAINTAINER= antoine@FreeBSD.org +COMMENT= Libggi extension for advanced color and palette handling + +LICENSE= MIT -LIB_DEPENDS= ggi.2:${PORTSDIR}/graphics/libggi +LIB_DEPENDS= ggi:${PORTSDIR}/graphics/libggi WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_BZIP2= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CPPFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} MAN3= gcpBlendColor.3 \ Modified: head/graphics/libggimisc/Makefile ============================================================================== --- head/graphics/libggimisc/Makefile Sun Mar 24 12:05:08 2013 (r315111) +++ head/graphics/libggimisc/Makefile Sun Mar 24 12:12:31 2013 (r315112) @@ -1,30 +1,25 @@ -# New ports collection makefile for: libggimisc -# Date created: 7 December 2004 -# Whom: antoine.brodin@laposte.net -# +# Created by: Antoine Brodin <antoine@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libggimisc PORTVERSION= 2.2.2 PORTREVISION= 1 CATEGORIES= graphics devel -MASTER_SITES= http://www.ggi-project.org/ftp/ggi/v2.2/ \ - SF/ggi/lowlevel/${PORTNAME}-${PORTVERSION} - +MASTER_SITES= SF/ggi/lowlevel/${PORTNAME}-${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}.src -MAINTAINER= antoine.brodin@laposte.net -COMMENT= A libggi extension providing support for hard to categorize features +MAINTAINER= antoine@FreeBSD.org +COMMENT= Libggi extension providing support for hard to categorize features + +LICENSE= MIT -LIB_DEPENDS= ggi.2:${PORTSDIR}/graphics/libggi +LIB_DEPENDS= ggi:${PORTSDIR}/graphics/libggi WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_BZIP2= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CPPFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} MAN3= ggiGetRayPos.3 \ @@ -32,16 +27,20 @@ MAN3= ggiGetRayPos.3 \ ggiWaitRayPos.3 MAN7= libggimisc.7 -.include <bsd.port.pre.mk> +OPTIONS_DEFINE= SVGALIB + +.include <bsd.port.options.mk> -.if defined(WITH_SVGALIB) || exists(${LOCALBASE}/include/vga.h) -LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib +.if ${PORT_OPTIONS:MSVGALIB} +CONFIGURE_ARGS+=--enable-svgalib +LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib PLIST_SUB+= WITH_SVGALIB="" .else +CONFIGURE_ARGS+=--disable-svgalib PLIST_SUB+= WITH_SVGALIB="@comment " .endif post-install: ${INSTALL_DATA} ${WRKSRC}/libggimisc.conf ${PREFIX}/etc/ggi/libggimisc.conf.dist -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/libggiwmh/Makefile ============================================================================== --- head/graphics/libggiwmh/Makefile Sun Mar 24 12:05:08 2013 (r315111) +++ head/graphics/libggiwmh/Makefile Sun Mar 24 12:12:31 2013 (r315112) @@ -1,30 +1,25 @@ -# New ports collection makefile for: libggiwmh -# Date created: 7 December 2004 -# Whom: antoine.brodin@laposte.net -# +# Created by: Antoine Brodin <antoine@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libggiwmh PORTVERSION= 0.3.2 PORTREVISION= 2 CATEGORIES= graphics devel -MASTER_SITES= http://www.ggi-project.org/ftp/ggi/v2.2/ \ - SF/ggi/misc/${PORTNAME}-${PORTVERSION} - +MASTER_SITES= SF/ggi/misc/${PORTNAME}-${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}.src -MAINTAINER= antoine.brodin@laposte.net -COMMENT= A libggi extension, wmh stands for Window Manager Hints +MAINTAINER= antoine@FreeBSD.org +COMMENT= Libggi extension, wmh stands for Window Manager Hints + +LICENSE= MIT -LIB_DEPENDS= ggi.2:${PORTSDIR}/graphics/libggi +LIB_DEPENDS= ggi:${PORTSDIR}/graphics/libggi WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_BZIP2= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CPPFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} MAN3= ggiWmhIconify.3 \ @@ -41,11 +36,17 @@ MLINKS= ggiWmhIconify.3 ggiWmhMoveIcon. - ggiWmhGetPos.3 - ggiWmhGetSize.3 \ - ggiWmhMaximize.3 - ggiWmhResize.3 -.if !defined(WITHOUT_X11) +OPTIONS_DEFINE= X11 +OPTIONS_DEFAULT=X11 + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MX11} +CONFIGURE_ARGS+=--enable-x --with-x USE_XORG= x11 PLIST_SUB+= XWMH="" .else -CONFIGURE_ARGS+=--disable-x +CONFIGURE_ARGS+=--disable-x --without-x PLIST_SUB+= XWMH="@comment " .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303241212.r2OCCWRq060634>