Date: 6 Jun 2004 21:17:57 -0000 From: Nicolas Souchu <nsouch@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/67635: [patch] Upgrade for libgii 0.8.5 and libggi 2.0.5 Message-ID: <20040606211757.89646.qmail@smtp.freesurf.fr> Resent-Message-ID: <200406062120.i56LKI3B023808@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 67635 >Category: ports >Synopsis: [patch] Upgrade for libgii 0.8.5 and libggi 2.0.5 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Jun 06 14:20:17 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Nicolas Souchu >Release: FreeBSD 5.1-CURRENT i386 >Organization: Home Sweet Home >Environment: System: FreeBSD armor 5.1-CURRENT FreeBSD 5.1-CURRENT #1: Sun May 9 15:18:48 GMT 2004 toor@armor:/build/freebsd/october_5_1/src/sys/i386/compile/ARMOR2 i386 >Description: Port upgrade for libggi 2.0.5 and libgii 0.8.5 >How-To-Repeat: N/A >Fix: apply the patch! It includes a fix for the --with-uninst-gii option --- libgii.diffs begins here --- diff -Nur devel/libgii/Makefile devel/libgii.upgraded/Makefile --- devel/libgii/Makefile Fri Mar 5 14:02:16 2004 +++ devel/libgii.upgraded/Makefile Sun Jun 6 15:04:42 2004 @@ -6,7 +6,7 @@ # PORTNAME= libgii -PORTVERSION= 0.8.4 +PORTVERSION= 0.8.5 PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://ftp.ggi-project.org/pub/packages/ggi/ggi/v2.0/ \ @@ -24,36 +24,42 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -.if exists(/usr/include/kii/kii.h) -CONFIGURE_ARGS+= --enable-kii +.if exists(/usr/include/dev/kii/kii.h) +CONFIGURE_ARGS+= --enable-kii --with-extra-includes=/usr/include/dev PLIST_SUB+= KII="" .else PLIST_SUB+= KII="@comment " .endif MAN1= mhub.1 -MAN3= giiEventPoll.3 giiEventSend.3 giiInit.3 \ - giiOpen.3 giiPanic.3 giiSetEventMask.3 \ - giiMTInit.3 giiQueryDeviceInfo.3 \ - giiQueryDeviceInfoByNumber.3 giiQueryValInfo.3 \ - giiSplitInputs.3 gii_any_event.3 gii_cmd_event.3 \ - gii_cmd_nodata_event.3 gii_cmddata_getdevinfo.3 \ - gii_cmddata_getvalinfo.3 gii_event.3 gii_event_mask.3 \ - gii_event_type.3 gii_expose_event.3 gii_key_event.3 \ - gii_pbutton_event.3 gii_phystype.3 gii_pmove_event.3 \ - gii_val_event.3 gii_valrange.3 -MAN7= libgii.7 \ - filter-key.7 filter-keytrans.7 filter-mouse.7 \ - filter-save.7 filter-tcp.7 input-directx.7 \ - input-file.7 input-linux-evdev.7 input-linux-kbd.7 \ - input-linux-mouse.7 input-lk201.7 input-mouse.7 \ - input-tcp.7 -MLINKS= giiEventPoll.3 giiEventRead.3 \ - - giiEventSelect.3 - giiEventsQueued.3 \ - giiInit.3 giiExit.3 \ - giiOpen.3 giiClose.3 - giiJoinInputs.3 \ - giiSetEventMask.3 giiAddEventMask.3 \ - - giiGetEventMask.3 - giiRemoveEventMask.3 +MAN3= ggGetSwarType.3 ggGetUserDir.3 ggInit.3 \ + ggLockCreate.3 ggRegisterCleanup.3 giiEventPoll.3 \ + giiEventSend.3 giiInit.3 giiMTInit.3 \ + giiOpen.3 giiPanic.3 giiQueryDeviceInfo.3 \ + giiQueryValInfo.3 giiSetEventMask.3 gii_cmd_event.3 \ + gii_cmddata_getdevinfo.3 gii_cmddata_getvalinfo.3 \ + gii_event.3 gii_expose_event.3 \ + gii_key_event.3 gii_pbutton_event.3 gii_pmove_event.3 \ + gii_val_event.3 +MAN7= filter-key.7 filter-mouse.7 filter-save.7 filter-tcp.7 \ + input-directx.7 input-file.7 input-linux-evdev.7 \ + input-linux-kbd.7 input-linux-mouse.7 input-lk201.7 \ + input-mouse.7 input-tcp.7 libgg.7 libgii.7 +MLINKS= ggRegisterCleanup.3 ggCleanupForceExit.3 \ + - ggUnregisterCleanup.3 ggInit.3 ggExit.3 \ + ggLockCreate.3 ggLock.3 - ggLockDestroy.3 \ + - ggTryLock.3 - ggUnlock.3 \ + giiSetEventMask.3 giiAddEventMask.3 - giiGetEventMask.3 \ + giiOpen.3 giiClose.3 - giiJoinInputs.3 - giiSplitInputs.3 \ + giiEventPoll.3 giiEventRead.3 - giiEventSelect.3 \ + - giiEventsQueued.3 giiInit.3 giiExit.3 \ + giiQueryDeviceInfo.3 giiQueryDeviceInfoByNumber.3 \ + giiSetEventMask.3 giiRemoveEventMask.3 \ + gii_cmd_event.3 gii_cmd_nodata_event.3 \ + gii_event.3 gii_any_event.3 - gii_event_mask.3 \ + - gii_event_type.3 \ + gii_cmddata_getvalinfo.3 gii_phystype.3 - gii_valrange.3 \ + filter-key.7 filter-keytrans.7 DOCSDIR= share/doc/libgii DOCS= ChangeLog NEWS README \ doc/env.txt doc/inputs.txt diff -Nur devel/libgii/distinfo devel/libgii.upgraded/distinfo --- devel/libgii/distinfo Fri Jun 4 22:30:11 2004 +++ devel/libgii.upgraded/distinfo Sat Jun 5 22:19:11 2004 @@ -1,2 +1,2 @@ -MD5 (libgii-0.8.4.src.tar.bz2) = 2c0472a01d267b7a30a1f147512c535a -SIZE (libgii-0.8.4.src.tar.bz2) = 415444 +MD5 (libgii-0.8.5.src.tar.bz2) = 1584ff2417198d413252a13ce4b6c80f +SIZE (libgii-0.8.5.src.tar.bz2) = 436619 --- libgii.diffs ends here --- --- libggi.diffs begins here --- diff -Nur graphics/libggi/Makefile graphics/libggi.upgraded/Makefile --- graphics/libggi/Makefile Fri Mar 5 14:08:09 2004 +++ graphics/libggi.upgraded/Makefile Sun Jun 6 15:41:36 2004 @@ -6,7 +6,7 @@ # PORTNAME= libggi -PORTVERSION= 2.0.4 +PORTVERSION= 2.0.5 PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics devel @@ -25,7 +25,7 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-internal-dga #This is broken for now +CONFIGURE_ARGS= WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .ifdef USE_THREADS @@ -33,72 +33,71 @@ CONFIGURE_ARGS+= --enable-threads .endif -.if exists(/usr/include/kgi/kgi.h) -CONFIGURE_ARGS+= --enable-kgi +.if exists(/usr/include/dev/kgi/kgi.h) +CONFIGURE_ARGS+= --enable-kgi --with-extra-includes=/usr/include/dev .endif MAN1= cube3d.1 ggiteleserver.1 monitest.1 -MAN3= ggiCopyBox.3 ggiCrossBlit.3 ggiDBGetBuffer.3 \ - ggiDrawBox.3 ggiDrawHLine.3 ggiDrawLine.3 \ - ggiDrawPixel.3 ggiDrawVLine.3 ggiEventPoll.3 \ - ggiFillscreen.3 ggiFlush.3 ggiGetPixelFormat.3 \ - ggiGetc.3 ggiInit.3 ggiMapColor.3 ggiOpen.3 \ - ggiPanic.3 ggiParseMode.3 \ - ggiPutc.3 ggiResourceAcquire.3 \ - ggiSetColorfulPalette.3 ggiSetDisplayFrame.3 \ - ggiSetFlags.3 ggiSetGCClipping.3 \ - ggiSetGCForeground.3 ggiSetGamma.3 \ - ggiSetGraphMode.3 ggiSetMode.3 ggiSetOrigin.3 \ - ggiSetPalette.3 \ - ggiDetachInput.3 ggiEventSelect.3 \ - ggiGammaMax.3 ggiGetCharSize.3 ggiGetInput.3 \ - ggi_color.3 ggi_coord.3 ggi_directbuffer.3 \ - ggi_graphtype.3 ggi_mode.3 ggi_pixel.3 \ - ggi_pixelformat.3 ggi_pixellinearbuffer.3 \ - ggi_pixelplanarbuffer.3 ggi_samplelinearbuffer.3 \ - ggi_sampleplanarbuffer.3 -MAN7= libggi.7 \ - display-aa.7 display-dga.7 display-directx.7 \ - display-directxnt.7 display-fbdev.7 display-file.7 \ - display-glide.7 display-memory.7 display-monotext.7 \ - display-multi.7 display-palemu.7 display-sub.7 \ - display-svgalib.7 display-tele.7 display-tile.7 \ - display-trueemu.7 display-vcsa.7 display-vgl.7 \ - display-x.7 -MLINKS= ggiDBGetBuffer.3 ggiDBGetNumBuffers.3 \ +MAN3= ggiCheckMode.3 ggiCopyBox.3 ggiCrossBlit.3 \ + ggiDBGetNumBuffers.3 ggiDrawBox.3 ggiDrawHLine.3 \ + ggiDrawLine.3 ggiDrawPixel.3 ggiDrawVLine.3 \ + ggiEventSend.3 ggiFillscreen.3 ggiFlush.3 \ + ggiGetGamma.3 ggiGetInput.3 ggiGetPixelFormat.3 \ + ggiGetc.3 ggiInit.3 ggiJoinInputs.3 \ + ggiMapColor.3 \ + ggiOpen.3 ggiPanic.3 ggiParseMode.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_directbuffer.3 \ + ggi_mode.3 ggi_pixelformat.3 +MAN7= libggi.7 display-aa.7 display-dga.7 display-directx.7 \ + display-fbdev.7 display-file.7 display-glide.7 \ + display-memory.7 display-monotext.7 display-multi.7 \ + display-palemu.7 display-sub.7 display-svgalib.7 \ + display-tele.7 display-tile.7 display-trueemu.7 \ + display-vcsa.7 display-vgl.7 display-x.7 +MLINKS= display-directx.7 display-directxnt.7 \ + ggiCheckMode.3 ggiCheckGraphMode.3 - ggiCheckSimpleMode.3 \ + - ggiCheckTextMode.3 ggiDBGetNumBuffers.3 ggiDBGetBuffer.3 \ ggiDrawBox.3 ggiGetBox.3 - ggiPutBox.3 \ ggiDrawHLine.3 ggiGetHLine.3 - ggiPutHLine.3 \ ggiDrawPixel.3 ggiGetPixel.3 - ggiPutPixel.3 \ ggiDrawVLine.3 ggiGetVLine.3 - ggiPutVLine.3 \ - ggiEventPoll.3 ggiAddEventMask.3 - ggiEventRead.3 \ - - ggiEventSend.3 - ggiEventsQueued.3 \ - - ggiGetEventMask.3 - ggiJoinInputs.3 \ - - ggiRemoveEventMask.3 - ggiSetEventMask.3 \ - ggiFlush.3 ggiFlushRegion.3 ggiGetc.3 ggiKbhit.3 \ + ggiFlush.3 ggiFlushRegion.3 \ + ggiGetGamma.3 ggiGammaMax.3 - ggiGetGammaMap.3 \ + - ggiSetGamma.3 - ggiSetGammaMap.3 \ + ggiGetInput.3 ggiDetachInput.3 \ + ggiGetc.3 ggiKbhit.3 \ ggiInit.3 ggiExit.3 \ + ggiJoinInputs.3 ggiAddEventMask.3 - ggiEventPoll.3 \ + - ggiEventRead.3 \ + ggiJoinInputs.3 ggiEventSelect.3 - ggiEventsQueued.3 \ + - ggiGetEventMask.3 - ggiRemoveEventMask.3 \ + - ggiSetEventMask.3 \ ggiMapColor.3 ggiPackColors.3 - ggiUnmapPixel.3 \ - - ggiUnpackPixels.3 \ - ggiOpen.3 ggiClose.3 \ + - ggiUnpackPixels.3 ggiOpen.3 ggiClose.3 \ ggiParseMode.3 ggiFPrintMode.3 - ggiPrintMode.3 \ - - ggiSPrintMode.3 ggiPutc.3 ggiPuts.3 \ - ggiResourceAcquire.3 ggiResourceMustAcquire.3 \ + - ggiSPrintMode.3 ggiPutc.3 ggiGetCharSize.3 \ + - ggiPuts.3 ggiResourceAcquire.3 ggiResourceMustAcquire.3 \ - ggiResourceRelease.3 \ - ggiSetDisplayFrame.3 ggiGetDisplayFrame.3 \ - - ggiGetReadFrame.3 - ggiGetWriteFrame.3 \ - - ggiSetReadFrame.3 - ggiSetWriteFrame.3 \ + ggiSetDisplayFrame.3 ggiGetDisplayFrame.3 - ggiGetReadFrame.3 \ + ggiSetDisplayFrame.3 ggiGetWriteFrame.3 - ggiSetReadFrame.3 \ + - ggiSetWriteFrame.3 \ ggiSetFlags.3 ggiAddFlags.3 - ggiGetFlags.3 \ - ggiRemoveFlags.3 \ ggiSetGCClipping.3 ggiGetGCClipping.3 \ ggiSetGCForeground.3 ggiGetGCBackground.3 \ - ggiGetGCForeground.3 - ggiSetGCBackground.3 \ - ggiSetGamma.3 ggiGetGamma.3 - ggiGetGammaMap.3 \ - - ggiSetGammaMap.3 \ - ggiSetGraphMode.3 ggiCheckGraphMode.3 \ - - ggiCheckSimpleMode.3 - ggiCheckTextMode.3 \ + ggiSetMode.3 ggiGetMode.3 - ggiSetGraphMode.3 \ - ggiSetSimpleMode.3 - ggiSetTextMode.3 \ - ggiSetMode.3 ggiCheckMode.3 - ggiGetMode.3 \ ggiSetOrigin.3 ggiGetOrigin.3 \ - ggiSetPalette.3 ggiGetPalette.3 + ggiSetPalette.3 ggiGetPalette.3 \ + ggi_color.3 ggi_pixel.3 \ + ggi_directbuffer.3 ggi_pixellinearbuffer.3 \ + - ggi_pixelplanarbuffer.3 - ggi_samplelinearbuffer.3 \ + - ggi_sampleplanarbuffer.3 \ + ggi_mode.3 ggi_coord.3 - ggi_graphtype.3 .include <bsd.port.pre.mk> diff -Nur graphics/libggi/distinfo graphics/libggi.upgraded/distinfo --- graphics/libggi/distinfo Wed Mar 17 19:29:23 2004 +++ graphics/libggi.upgraded/distinfo Sat Jun 5 22:03:04 2004 @@ -1,2 +1,2 @@ -MD5 (libggi-2.0.4.src.tar.bz2) = b1a68aba26e12cd164ea032ad3ad5556 -SIZE (libggi-2.0.4.src.tar.bz2) = 811176 +MD5 (libggi-2.0.5.src.tar.bz2) = 1d58f28a7718bf2840fac39cd3a0d6db +SIZE (libggi-2.0.5.src.tar.bz2) = 826857 diff -Nur graphics/libggi/files/patch-aa graphics/libggi.upgraded/files/patch-aa --- graphics/libggi/files/patch-aa Thu Jan 1 01:00:00 1970 +++ graphics/libggi.upgraded/files/patch-aa Sun Jun 6 00:01:13 2004 @@ -0,0 +1,21 @@ +--- m4/gii_paths.m4.orig Wed Nov 27 10:02:19 2002 ++++ m4/gii_paths.m4 Sat Jun 5 22:00:41 2004 +@@ -31,13 +31,13 @@ + fi + if test -d "$gii_top_builddir" -a -d "$gii_top_srcdir" ; then + if test "$gii_top_builddir" = "$gii_top_srcdir" ; then +- CFLAGS="$CFLAGS -I$gii_top_builddir/include" +- CPPFLAGS="$CPPFLAGS -I$gii_top_builddir/include" ++ CFLAGS="-I$gii_top_builddir/include $CFLAGS" ++ CPPFLAGS="-I$gii_top_builddir/include $CPPFLAGS" + else +- CFLAGS="$CFLAGS -I$gii_top_srcdir/include -I$gii_top_builddir/include" +- CPPFLAGS="$CPPFLAGS -I$gii_top_srcdir/include -I$gii_top_builddir/include" ++ CFLAGS="-I$gii_top_srcdir/include -I$gii_top_builddir/include $CFLAGS" ++ CPPFLAGS="-I$gii_top_srcdir/include -I$gii_top_builddir/include $CPPFLAGS" + fi +- LDFLAGS="$LDFLAGS -L$gii_top_builddir/gg -L$gii_top_builddir/gii" ++ LDFLAGS="-L$gii_top_builddir/gg -L$gii_top_builddir/gii $LDFLAGS" + fi + ]]) + diff -Nur graphics/libggi/pkg-plist graphics/libggi.upgraded/pkg-plist --- graphics/libggi/pkg-plist Fri Mar 5 14:08:09 2004 +++ graphics/libggi.upgraded/pkg-plist Sat Jun 5 23:10:11 2004 @@ -126,7 +126,11 @@ lib/libggi.la lib/libggi.so lib/libggi.so.2 +@dirrm etc/ggi +@dirrm include/ggi @dirrm include/ggi/display +@dirrm include/ggi/internal +@dirrm lib/ggi @dirrm lib/ggi/default @dirrm lib/ggi/display @dirrm lib/ggi/helper --- libggi.diffs ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040606211757.89646.qmail>