- Update to 2.1.1

- Give maintainership to antoine.brodin@laposte.net
- Fix build on 4.X
- Use USE_LIBTOOL_VER=15

PR:		ports/80030
Submitted by:	Antoine Brodin <antoine.brodin@laposte.net>
Approved by:	adamw (mentor)

3 files changed, 31 insertions, 70 deletions

diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index 6dcc2281d53d..908382cdaae5 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libggi
-PORTVERSION=	2.1.0
+PORTVERSION=	2.1.1
 PORTEPOCH=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	http://www.ggi-project.org/ftp/ggi/v2.1/ \
@@ -14,24 +14,18 @@ MASTER_SITES=	http://www.ggi-project.org/ftp/ggi/v2.1/ \
 MASTER_SITE_SUBDIR=	ggi
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	antoine.brodin@laposte.net
 COMMENT=	A flexible drawing library
 
 LIB_DEPENDS=	gii.0:${PORTSDIR}/devel/libgii
 
 USE_BZIP2=	yes
-USE_XLIB=	yes
 INSTALLS_SHLIB=	yes
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=
+USE_LIBTOOL_VER=	15
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-CFLAGS+=	${PTHREAD_CFLAGS}
-
-.if exists(/usr/include/dev/kgi/kgi.h)
-CONFIGURE_ARGS+=	--enable-kgi --with-extra-includes=/usr/include/dev
-.endif
+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
 
 MAN1=		cube3d.1 ggi-demo.1 ggiteleserver.1 monitest.1
 MAN3=		ggiCheckMode.3 ggiCopyBox.3 ggiCrossBlit.3 \
@@ -45,7 +39,8 @@ MAN3=		ggiCheckMode.3 ggiCopyBox.3 ggiCrossBlit.3 \
 		ggiPutc.3 ggiResourceAcquire.3 ggiSetColorfulPalette.3 \
 		ggiSetDisplayFrame.3 ggiSetFlags.3 ggiSetGCClipping.3 \
 		ggiSetGCForeground.3 ggiSetMode.3 ggiSetOrigin.3 \
-		ggiSetPalette.3 ggi_color.3 ggi_colormap.3 \
+		ggiSetPalette.3 ggiSetTextMode.3 \
+		ggi_color.3 ggi_colormap.3 \
 		ggi_directbuffer.3 ggi_mode.3 ggi_pixelformat.3
 MAN7=		libggi.7 display-aa.7 display-auto.7 \
 		display-dga.7 display-directx.7 \
@@ -88,10 +83,10 @@ MLINKS=		ggi-demo.1 demo.1 \
 		ggiSetGCClipping.3 ggiGetGCClipping.3 \
 		ggiSetGCForeground.3 ggiGetGCBackground.3 \
 		- ggiGetGCForeground.3 - ggiSetGCBackground.3 \
-		ggiSetMode.3 ggiGetMode.3 - ggiSetGraphMode.3 \
-		- ggiSetSimpleMode.3 - ggiSetTextMode.3 \
+		ggiSetMode.3 ggiGetMode.3 \
 		ggiSetOrigin.3 ggiGetOrigin.3 \
 		ggiSetPalette.3 ggiGetPalette.3 \
+		ggiSetTextMode.3 ggiSetGraphMode.3 - ggiSetSimpleMode.3 \
 		ggi_color.3 ggi_pixel.3 \
 		ggi_colormap.3 ggi_colormap_region.3 \
 		ggi_directbuffer.3 ggi_pixellinearbuffer.3 \
@@ -99,6 +94,18 @@ MLINKS=		ggi-demo.1 demo.1 \
 		- ggi_sampleplanarbuffer.3 \
 		ggi_mode.3 ggi_coord.3 - ggi_graphtype.3
 
+.if exists(/usr/include/dev/kgi/kgi.h)
+CONFIGURE_ARGS+=	--enable-kgi --with-extra-includes=/usr/include/dev
+.endif
+
+.if !defined(WITHOUT_X11)
+USE_XLIB=	yes
+PLIST_SUB+=	WITH_X=""
+.else
+CONFIGURE_ARGS+=	--disable-x --disable-dga
+PLIST_SUB+=	WITH_X="@comment "
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if !exists(/usr/include/vgl.h) || ${ARCH} != "i386"
diff --git a/graphics/libggi/distinfo b/graphics/libggi/distinfo
index ea610ee1c49c..a6b63d0db13c 100644
--- a/graphics/libggi/distinfo
+++ b/graphics/libggi/distinfo
@@ -1,2 +1,2 @@
-MD5 (libggi-2.1.0.src.tar.bz2) = 08321e01148f7a3f96865e9939733d47
-SIZE (libggi-2.1.0.src.tar.bz2) = 878959
+MD5 (libggi-2.1.1.src.tar.bz2) = 6bbaf5c2661be1cd7c1268079b1959c7
+SIZE (libggi-2.1.1.src.tar.bz2) = 927060
diff --git a/graphics/libggi/pkg-plist b/graphics/libggi/pkg-plist
index f0e82f00b774..e01886aeae17 100644
--- a/graphics/libggi/pkg-plist
+++ b/graphics/libggi/pkg-plist
@@ -21,7 +21,6 @@ include/ggi/display/modelist.h
 include/ggi/display/monotext.h
 include/ggi/display/multi.h
 include/ggi/display/palemu.h
-include/ggi/display/quartz.h
 include/ggi/display/sub.h
 include/ggi/display/svgalib.h
 include/ggi/display/tele.h
@@ -50,96 +49,51 @@ include/ggi/internal/triple-int.h
 include/ggi/internal/unit.h
 include/ggi/ll.h
 include/ggi/types.h
-lib/ggi/default/color.la
 lib/ggi/default/color.so
-lib/ggi/default/ilbm.la
 lib/ggi/default/ilbm.so
-lib/ggi/default/iplanar_2p.la
 lib/ggi/default/iplanar_2p.so
-lib/ggi/default/linear_1.la
 lib/ggi/default/linear_1.so
-lib/ggi/default/linear_16.la
 lib/ggi/default/linear_16.so
-lib/ggi/default/linear_1_r.la
 lib/ggi/default/linear_1_r.so
-lib/ggi/default/linear_2.la
 lib/ggi/default/linear_2.so
-lib/ggi/default/linear_24.la
 lib/ggi/default/linear_24.so
-lib/ggi/default/linear_32.la
 lib/ggi/default/linear_32.so
-lib/ggi/default/linear_4.la
 lib/ggi/default/linear_4.so
-lib/ggi/default/linear_4_r.la
 lib/ggi/default/linear_4_r.so
-lib/ggi/default/linear_8.la
 lib/ggi/default/linear_8.so
-lib/ggi/default/planar.la
 lib/ggi/default/planar.so
-lib/ggi/default/pseudo_stubs.la
 lib/ggi/default/pseudo_stubs.so
-lib/ggi/default/stubs.la
 lib/ggi/default/stubs.so
-lib/ggi/default/text_16.la
 lib/ggi/default/text_16.so
-lib/ggi/default/text_32.la
 lib/ggi/default/text_32.so
-lib/ggi/display/X.la
-lib/ggi/display/X.so
-%%WITH_AALIB%%lib/ggi/display/aa.la
+%%WITH_X%%lib/ggi/display/X.so
 %%WITH_AALIB%%lib/ggi/display/aa.so
-lib/ggi/display/auto.la
 lib/ggi/display/auto.so
-lib/ggi/display/file.la
 lib/ggi/display/file.so
-lib/ggi/display/ipc.la
 lib/ggi/display/ipc.so
-lib/ggi/display/mansync.la
 lib/ggi/display/mansync.so
-lib/ggi/display/memory.la
 lib/ggi/display/memory.so
-lib/ggi/display/monotext.la
 lib/ggi/display/monotext.so
-lib/ggi/display/multi.la
 lib/ggi/display/multi.so
-lib/ggi/display/palemu.la
 lib/ggi/display/palemu.so
-lib/ggi/display/sub.la
 lib/ggi/display/sub.so
-%%WITH_SVGALIB%%lib/ggi/display/svgalib.la
 %%WITH_SVGALIB%%lib/ggi/display/svgalib.so
-lib/ggi/display/tele.la
 lib/ggi/display/tele.so
-lib/ggi/display/terminfo.la
 lib/ggi/display/terminfo.so
-lib/ggi/display/tile.la
 lib/ggi/display/tile.so
-lib/ggi/display/trueemu.la
 lib/ggi/display/trueemu.so
-%%WITH_SVGALIB%%lib/ggi/display/vgagl.la
 %%WITH_SVGALIB%%lib/ggi/display/vgagl.so
-%%WITH_VGL%%lib/ggi/display/vgl.la
 %%WITH_VGL%%lib/ggi/display/vgl.so
-lib/ggi/display/xf86dga.la
-lib/ggi/display/xf86dga.so
-lib/ggi/helper/helper_x_dbe.la
-lib/ggi/helper/helper_x_dbe.so
-lib/ggi/helper/helper_x_dga.la
-lib/ggi/helper/helper_x_dga.so
-lib/ggi/helper/helper_x_evi.la
-lib/ggi/helper/helper_x_evi.so
-lib/ggi/helper/helper_x_shm.la
-lib/ggi/helper/helper_x_shm.so
-lib/ggi/helper/helper_x_vidmode.la
-lib/ggi/helper/helper_x_vidmode.so
-lib/libggi.la
+%%WITH_X%%lib/ggi/display/xf86dga.so
+%%WITH_X%%lib/ggi/helper/helper_x_dbe.so
+%%WITH_X%%lib/ggi/helper/helper_x_dga.so
+%%WITH_X%%lib/ggi/helper/helper_x_evi.so
+%%WITH_X%%lib/ggi/helper/helper_x_shm.so
+%%WITH_X%%lib/ggi/helper/helper_x_vidmode.so
+lib/libggi.a
 lib/libggi.so
 lib/libggi.so.2
-@dirrm etc/ggi
 @dirrm include/ggi/display
-@dirrm include/ggi/internal
-@dirrm include/ggi
 @dirrm lib/ggi/default
 @dirrm lib/ggi/display
-@dirrm lib/ggi/helper
-@dirrm lib/ggi
+%%WITH_X%%@dirrm lib/ggi/helper