Attachment 132963 Details for Bug 177332 – ggi.diff

[patch] ggi.diff

ggi.diff (text/plain), 10.85 KB, created by Antoine Brodin on 2013-03-24 11:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Brodin

Created: 2013-03-24 11:00:01 UTC

Size: 10.85 KB

patch

obsolete

>Index: devel/libgii/Makefile
>===================================================================
>--- devel/libgii/Makefile	(revision 315084)
>+++ devel/libgii/Makefile	(working copy)
>@@ -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
> 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 @@
> 		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
>+.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 "
>-.else
>-PLIST_SUB+=	VGL=""
> .endif
> 
> post-install:
>@@ -213,4 +215,4 @@
> 	${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>
>Index: devel/libgiigic/Makefile
>===================================================================
>--- devel/libgiigic/Makefile	(revision 315084)
>+++ devel/libgiigic/Makefile	(working copy)
>@@ -1,24 +1,20 @@
>-# 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
> 
>-LIB_DEPENDS=	gii.1:${PORTSDIR}/devel/libgii
>+LICENSE=	MIT
> 
>+LIB_DEPENDS=	gii:${PORTSDIR}/devel/libgii
>+
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> USE_BZIP2=	yes
> USE_LDCONFIG=	yes
>Index: graphics/libggi/Makefile
>===================================================================
>--- graphics/libggi/Makefile	(revision 315084)
>+++ graphics/libggi/Makefile	(working copy)
>@@ -1,32 +1,27 @@
>-# 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
> 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
> 
>-LIB_DEPENDS=	gii.1:${PORTSDIR}/devel/libgii
>+LICENSE=	MIT
> 
>+LIB_DEPENDS=	gii:${PORTSDIR}/devel/libgii
>+
> USE_BZIP2=	yes
> 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 @@
> 
> 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
>+.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 "
>-.else
>-PLIST_SUB+=	WITH_VGL=""
> .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 @@
> 	${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>
>Index: graphics/libggigcp/Makefile
>===================================================================
>--- graphics/libggigcp/Makefile	(revision 315084)
>+++ graphics/libggigcp/Makefile	(working copy)
>@@ -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
> 
>-LIB_DEPENDS=	ggi.2:${PORTSDIR}/graphics/libggi
>+LICENSE=	MIT
> 
>+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 \
>Index: graphics/libggimisc/Makefile
>===================================================================
>--- graphics/libggimisc/Makefile	(revision 315084)
>+++ graphics/libggimisc/Makefile	(working copy)
>@@ -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
> 
>-LIB_DEPENDS=	ggi.2:${PORTSDIR}/graphics/libggi
>+LICENSE=	MIT
> 
>+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 @@
> 		ggiWaitRayPos.3
> MAN7=		libggimisc.7
> 
>-.include <bsd.port.pre.mk>
>+OPTIONS_DEFINE=	SVGALIB
> 
>-.if defined(WITH_SVGALIB) || exists(${LOCALBASE}/include/vga.h)
>-LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
>+.include <bsd.port.options.mk>
>+
>+.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>
>Index: graphics/libggiwmh/Makefile
>===================================================================
>--- graphics/libggiwmh/Makefile	(revision 315084)
>+++ graphics/libggiwmh/Makefile	(working copy)
>@@ -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
> 
>-LIB_DEPENDS=	ggi.2:${PORTSDIR}/graphics/libggi
>+LICENSE=	MIT
> 
>+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 @@
> 		- 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

Actions: View | Diff

Attachments on bug 177332: 132963