cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 2.0.2; based on a patch to 2.0.1 from Jim Geovedi <jim@corebsd.or.id>

Browse Source 
and prompting from Christoph_Egger@t-online.de (Christoph Egger)
This commit is contained in:
todd 2002-12-28 19:34:51 +00:00
parent 60be1490bc
commit 788777cd53
8 changed files with 262 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
graphics/ggi/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.24 2001/12/23 18:36:27 naddy Exp $
# $OpenBSD: Makefile,v 1.25 2002/12/28 19:34:51 todd Exp $
# Uses pthreads
COMMENT= "Generic Graphics Library"
DISTNAME= libggi-2.0b3
DISTNAME= libggi-2.0.2
CATEGORIES= graphics
NEED_VERSION= 1.475
HOMEPAGE= http://www.ggi-project.org/
HOMEPAGE= http://www.ggi-project.org/
MAINTAINER= Todd T. Fries <todd@openbsd.org>
PERMIT_PACKAGE_CDROM= Yes
@ -14,13 +13,10 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ftp://metalab.unc.edu/pub/ggi/ggi/2_0_beta_3/
EXTRACT_SUFX= .tar.bz2
MASTER_SITES= ftp://ftp.ggi-project.org/pub/ggi/ggi/v2.0/
EXTRACT_SUFX= .src.tar.bz2
PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh \
patch-*
LIB_DEPENDS= gii.0.7,gg.0.7::graphics/gii
LIB_DEPENDS= gii.0.8::graphics/gii
USE_X11= Yes
CFLAGS+= -pthread
@ -37,7 +33,5 @@ post-install:
cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/ggi
${INSTALL_DATA} ${WRKSRC}/libggi.conf \
${PREFIX}/share/examples/ggi/libggi.conf.example
${INSTALL_DATA} ${WRKSRC}/extensions/misc/libggimisc.conf \
${PREFIX}/share/examples/ggi/libggimisc.conf.example
.include <bsd.port.mk>

6
graphics/ggi/distinfo
View File

@ -1,3 +1,3 @@
MD5 (libggi-2.0b3.tar.bz2) = f13740d79f63b46acf820c0d5a26d7d2
RMD160 (libggi-2.0b3.tar.bz2) = 7b4e236eef1608cd68cbfc0cc1a5bcc957e8c05a
SHA1 (libggi-2.0b3.tar.bz2) = 2a2dd0a65f65a7902f0fecfe8417c43f8e9e30a2
MD5 (libggi-2.0.2.src.tar.bz2) = 07ada325a17b5bbe66ef79a1a7f8fc10
RMD160 (libggi-2.0.2.src.tar.bz2) = 6f011f0b76831c2aa13be9b3a74791dfd2f0e9f9
SHA1 (libggi-2.0.2.src.tar.bz2) = b54d1957e16de91c7d771cc7a9843ae3f7015961

14
graphics/ggi/patches/patch-display_xf86dga_XF86VMode_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-display_xf86dga_XF86VMode_c,v 1.1 2002/12/28 19:34:51 todd Exp $
--- display/xf86dga/XF86VMode.c.orig Sat Dec 28 02:04:05 2002
+++ display/xf86dga/XF86VMode.c Sat Dec 28 02:11:46 2002
@@ -37,8 +37,10 @@ from Kaleb S. KEITHLEY.
/* THIS IS NOT AN X CONSORTIUM STANDARD */
#define _POSIX_C_SOURCE 199309L
+#if !defined(__OpenBSD__)
#define _POSIX_SOURCE
#define _XOPEN_SOURCE 500L
+#endif
#define _BSD_SOURCE
#define _SVID_SOURCE
#define FUNCPROTO 15

74
graphics/ggi/patches/patch-ltconfig
View File

@ -1,74 +0,0 @@
$OpenBSD: patch-ltconfig,v 1.3 2001/12/23 18:36:27 naddy Exp $
--- ltconfig.orig Fri Jun 23 22:04:53 2000
+++ ltconfig Sun Dec 23 19:04:23 2001
@@ -504,7 +504,14 @@ fi
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ case "$host_os" in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
fi
# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
@@ -1108,7 +1115,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
ld_shlibs=yes
@@ -1405,10 +1414,24 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;;
+ esac
+ fi
;;
os2*)
@@ -2030,13 +2053,12 @@ netbsd*)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
+ need_lib_prefix=no
+ need_version=no
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
+ deplibs_check_method='pass_all'
;;
os2*)

84
graphics/ggi/patches/patch-ltmain_sh Normal file
View File

@ -0,0 +1,84 @@
$OpenBSD: patch-ltmain_sh,v 1.3 2002/12/28 19:34:51 todd Exp $
--- ltmain.sh.orig Sun Dec 8 15:36:07 2002
+++ ltmain.sh Sat Dec 28 01:57:11 2002
@@ -1082,6 +1082,17 @@ compiler."
continue
;;
+ -pthread)
+ case $host in
+ *-*-openbsd*)
+ deplibs="$deplibs $arg"
+ ;;
+ *)
+ continue
+ ;;
+ esac
+ ;;
+
-module)
module=yes
continue
@@ -1522,6 +1533,9 @@ compiler."
fi
continue
;;
+ -pthread)
+ continue
+ ;;
%DEPLIBS%)
alldeplibs=yes
continue
@@ -1767,11 +1781,6 @@ compiler."
continue
fi
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
- fi
-
if test -n "$old_archive_from_expsyms_cmds"; then
# figure out the soname
set dummy $library_names
@@ -4569,40 +4578,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = ":" && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- echo " $libdir"
- done
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
- echo "See any operating system documentation about shared libraries for"
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "----------------------------------------------------------------------"
exit 0
;;

3
graphics/ggi/pkg/INSTALL
View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: INSTALL,v 1.1 2000/09/24 00:01:04 brad Exp $
# $OpenBSD: INSTALL,v 1.2 2002/12/28 19:34:51 todd Exp $
#
# Pre/post-installation setup of ggi
@ -27,7 +27,6 @@ do_install()
{
install -d -o root -g wheel -m 755 $CONFIG_DIR
install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/libggi.conf.example $CONFIG_DIR/libggi.conf
install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/libggimisc.conf.example $CONFIG_DIR/libggimisc.conf
echo
echo "+---------------"
echo "| The $1 configuration files have been installed into"

17
graphics/ggi/pkg/PFRAG.shared
View File

@ -1,4 +1,6 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2001/03/26 16:03:56 todd Exp $
@comment $OpenBSD: PFRAG.shared,v 1.3 2002/12/28 19:34:51 todd Exp $
lib/libggi.so.2.2
DYNLIBDIR(%D/lib)
lib/ggi/default/color.so
lib/ggi/default/ilbm.so
lib/ggi/default/iplanar_2p.so
@ -16,9 +18,8 @@ lib/ggi/default/stubs.so
lib/ggi/default/text_16.so
lib/ggi/default/text_32.so
lib/ggi/display/X.so
lib/ggi/display/X_misc.so
lib/ggi/display/Xlib.so
lib/ggi/display/file.so
lib/ggi/display/ipc.so
lib/ggi/display/mansync.so
lib/ggi/display/memory.so
lib/ggi/display/monotext.so
@ -26,8 +27,12 @@ lib/ggi/display/multi.so
lib/ggi/display/palemu.so
lib/ggi/display/sub.so
lib/ggi/display/tele.so
lib/ggi/display/terminfo.so
lib/ggi/display/tile.so
lib/ggi/display/trueemu.so
lib/libggi.so.2.0
lib/libggimisc.so.2.0
DYNLIBDIR(%D/lib)
lib/ggi/helper/helper_x_dbe.so
lib/ggi/helper/helper_x_evi.so
lib/ggi/helper/helper_x_shm.so
man/man3/ggiResourceAcquire.3
man/man3/ggiResourceMustAcquire.3
man/man3/ggiResourceRelease.3

241
graphics/ggi/pkg/PLIST
View File

@ -1,14 +1,16 @@
@comment $OpenBSD: PLIST,v 1.8 2002/03/19 23:17:49 espie Exp $
@comment $OpenBSD: PLIST,v 1.9 2002/12/28 19:34:51 todd Exp $
bin/cube3d
bin/ggiteleserver
bin/monitest
include/ggi/default/genkgi.h
include/ggi/display/aa.h
include/ggi/display/directx.h
include/ggi/display/fbdev.h
include/ggi/display/file.h
include/ggi/display/glide.h
include/ggi/display/ipc.h
include/ggi/display/kgi.h
include/ggi/display/lcd823.h
include/ggi/display/libkgi.h
include/ggi/display/linvtsw.h
include/ggi/display/mansync.h
include/ggi/display/memory.h
@ -25,6 +27,7 @@ include/ggi/display/vcsa.h
include/ggi/display/vgl.h
include/ggi/display/x.h
include/ggi/display/xcommon.h
include/ggi/display/xevi.h
include/ggi/display/xf86dga.h
include/ggi/display/xlib.h
include/ggi/ggi-unix.h
@ -36,10 +39,9 @@ include/ggi/internal/ggi-dl.h
include/ggi/internal/ggidlinit.h
include/ggi/internal/ggilibinit.h
include/ggi/internal/internal.h
include/ggi/internal/misc_int.h
include/ggi/internal/plat.h
include/ggi/internal/structs.h
include/ggi/misc.h
include/ggi/ll.h
include/ggi/types.h
lib/ggi/default/color.a
lib/ggi/default/color.la
@ -75,12 +77,10 @@ lib/ggi/default/text_32.a
lib/ggi/default/text_32.la
lib/ggi/display/X.a
lib/ggi/display/X.la
lib/ggi/display/X_misc.a
lib/ggi/display/X_misc.la
lib/ggi/display/Xlib.a
lib/ggi/display/Xlib.la
lib/ggi/display/file.a
lib/ggi/display/file.la
lib/ggi/display/ipc.a
lib/ggi/display/ipc.la
lib/ggi/display/mansync.a
lib/ggi/display/mansync.la
lib/ggi/display/memory.a
@ -95,107 +95,152 @@ lib/ggi/display/sub.a
lib/ggi/display/sub.la
lib/ggi/display/tele.a
lib/ggi/display/tele.la
lib/ggi/display/terminfo.a
lib/ggi/display/terminfo.la
lib/ggi/display/tile.a
lib/ggi/display/tile.la
lib/ggi/display/trueemu.a
lib/ggi/display/trueemu.la
lib/ggi/display/xf86dga.a
lib/ggi/display/xf86dga.la
lib/ggi/helper/helper_x_dbe.a
lib/ggi/helper/helper_x_dbe.la
lib/ggi/helper/helper_x_dga.a
lib/ggi/helper/helper_x_dga.la
lib/ggi/helper/helper_x_evi.a
lib/ggi/helper/helper_x_evi.la
lib/ggi/helper/helper_x_shm.a
lib/ggi/helper/helper_x_shm.la
lib/ggi/helper/helper_x_vidmode.a
lib/ggi/helper/helper_x_vidmode.la
lib/libggi.a
lib/libggi.la
lib/libggimisc.a
lib/libggimisc.la
man/man3/ggiAddEventMask.3ggi
man/man3/ggiAddFlags.3ggi
man/man3/ggiCheckGraphMode.3ggi
man/man3/ggiCheckMode.3ggi
man/man3/ggiCheckSimpleMode.3ggi
man/man3/ggiCheckTextMode.3ggi
man/man3/ggiClose.3ggi
man/man3/ggiCopyBox.3ggi
man/man3/ggiCrossBlit.3ggi
man/man3/ggiDBGetBuffer.3ggi
man/man3/ggiDBGetNumBuffers.3ggi
man/man3/ggiDrawBox.3ggi
man/man3/ggiDrawHLine.3ggi
man/man3/ggiDrawLine.3ggi
man/man3/ggiDrawPixel.3ggi
man/man3/ggiDrawVLine.3ggi
man/man3/ggiEventPoll.3ggi
man/man3/ggiEventRead.3ggi
man/man3/ggiEventSend.3ggi
man/man3/ggiEventsQueued.3ggi
man/man3/ggiExit.3ggi
man/man3/ggiFPrintMode.3ggi
man/man3/ggiFillscreen.3ggi
man/man3/ggiFlush.3ggi
man/man3/ggiFlushRegion.3ggi
man/man3/ggiGetBox.3ggi
man/man3/ggiGetDisplayFrame.3ggi
man/man3/ggiGetEventMask.3ggi
man/man3/ggiGetFlags.3ggi
man/man3/ggiGetGCBackground.3ggi
man/man3/ggiGetGCClipping.3ggi
man/man3/ggiGetGCForeground.3ggi
man/man3/ggiGetGamma.3ggi
man/man3/ggiGetGammaMap.3ggi
man/man3/ggiGetHLine.3ggi
man/man3/ggiGetMode.3ggi
man/man3/ggiGetOrigin.3ggi
man/man3/ggiGetPalette.3ggi
man/man3/ggiGetPixel.3ggi
man/man3/ggiGetPixelFormat.3ggi
man/man3/ggiGetReadFrame.3ggi
man/man3/ggiGetVLine.3ggi
man/man3/ggiGetWriteFrame.3ggi
man/man3/ggiGetc.3ggi
man/man3/ggiInit.3ggi
man/man3/ggiJoinInputs.3ggi
man/man3/ggiKbhit.3ggi
man/man3/ggiMapColor.3ggi
man/man3/ggiOpen.3ggi
man/man3/ggiPackColors.3ggi
man/man3/ggiPanic.3ggi
man/man3/ggiParseMode.3ggi
man/man3/ggiPrintMode.3ggi
man/man3/ggiPutBox.3ggi
man/man3/ggiPutHLine.3ggi
man/man3/ggiPutPixel.3ggi
man/man3/ggiPutVLine.3ggi
man/man3/ggiPutc.3ggi
man/man3/ggiPuts.3ggi
man/man3/ggiRemoveEventMask.3ggi
man/man3/ggiRemoveFlags.3ggi
man/man3/ggiResourceAcquire.3ggi
man/man3/ggiResourceMustAcquire.3ggi
man/man3/ggiResourceRelease.3ggi
man/man3/ggiSPrintMode.3ggi
man/man3/ggiSetColorfulPalette.3ggi
man/man3/ggiSetDisplayFrame.3ggi
man/man3/ggiSetEventMask.3ggi
man/man3/ggiSetFlags.3ggi
man/man3/ggiSetGCBackground.3ggi
man/man3/ggiSetGCClipping.3ggi
man/man3/ggiSetGCForeground.3ggi
man/man3/ggiSetGamma.3ggi
man/man3/ggiSetGammaMap.3ggi
man/man3/ggiSetGraphMode.3ggi
man/man3/ggiSetMode.3ggi
man/man3/ggiSetOrigin.3ggi
man/man3/ggiSetPalette.3ggi
man/man3/ggiSetReadFrame.3ggi
man/man3/ggiSetSimpleMode.3ggi
man/man3/ggiSetTextMode.3ggi
man/man3/ggiSetWriteFrame.3ggi
man/man3/ggiUnmapPixel.3ggi
man/man3/ggiUnpackPixels.3ggi
man/man6/cube3d.6
man/man7/libggi.7ggi
man/man1/cube3d.1
man/man1/ggiteleserver.1
man/man1/monitest.1
man/man3/ggiAddEventMask.3
man/man3/ggiAddFlags.3
man/man3/ggiCheckGraphMode.3
man/man3/ggiCheckMode.3
man/man3/ggiCheckSimpleMode.3
man/man3/ggiCheckTextMode.3
man/man3/ggiClose.3
man/man3/ggiCopyBox.3
man/man3/ggiCrossBlit.3
man/man3/ggiDBGetBuffer.3
man/man3/ggiDBGetNumBuffers.3
man/man3/ggiDetachInput.3
man/man3/ggiDrawBox.3
man/man3/ggiDrawHLine.3
man/man3/ggiDrawLine.3
man/man3/ggiDrawPixel.3
man/man3/ggiDrawVLine.3
man/man3/ggiEventPoll.3
man/man3/ggiEventRead.3
man/man3/ggiEventSelect.3
man/man3/ggiEventSend.3
man/man3/ggiEventsQueued.3
man/man3/ggiExit.3
man/man3/ggiFPrintMode.3
man/man3/ggiFillscreen.3
man/man3/ggiFlush.3
man/man3/ggiFlushRegion.3
man/man3/ggiGammaMax.3
man/man3/ggiGetBox.3
man/man3/ggiGetCharSize.3
man/man3/ggiGetDisplayFrame.3
man/man3/ggiGetEventMask.3
man/man3/ggiGetFlags.3
man/man3/ggiGetGCBackground.3
man/man3/ggiGetGCClipping.3
man/man3/ggiGetGCForeground.3
man/man3/ggiGetGamma.3
man/man3/ggiGetGammaMap.3
man/man3/ggiGetHLine.3
man/man3/ggiGetInput.3
man/man3/ggiGetMode.3
man/man3/ggiGetOrigin.3
man/man3/ggiGetPalette.3
man/man3/ggiGetPixel.3
man/man3/ggiGetPixelFormat.3
man/man3/ggiGetReadFrame.3
man/man3/ggiGetVLine.3
man/man3/ggiGetWriteFrame.3
man/man3/ggiGetc.3
man/man3/ggiInit.3
man/man3/ggiJoinInputs.3
man/man3/ggiKbhit.3
man/man3/ggiMapColor.3
man/man3/ggiOpen.3
man/man3/ggiPackColors.3
man/man3/ggiPanic.3
man/man3/ggiParseMode.3
man/man3/ggiPrintMode.3
man/man3/ggiPutBox.3
man/man3/ggiPutHLine.3
man/man3/ggiPutPixel.3
man/man3/ggiPutVLine.3
man/man3/ggiPutc.3
man/man3/ggiPuts.3
man/man3/ggiRemoveEventMask.3
man/man3/ggiRemoveFlags.3
man/man3/ggiSPrintMode.3
man/man3/ggiSetColorfulPalette.3
man/man3/ggiSetDisplayFrame.3
man/man3/ggiSetEventMask.3
man/man3/ggiSetFlags.3
man/man3/ggiSetGCBackground.3
man/man3/ggiSetGCClipping.3
man/man3/ggiSetGCForeground.3
man/man3/ggiSetGamma.3
man/man3/ggiSetGammaMap.3
man/man3/ggiSetGraphMode.3
man/man3/ggiSetMode.3
man/man3/ggiSetOrigin.3
man/man3/ggiSetPalette.3
man/man3/ggiSetReadFrame.3
man/man3/ggiSetSimpleMode.3
man/man3/ggiSetTextMode.3
man/man3/ggiSetWriteFrame.3
man/man3/ggiUnmapPixel.3
man/man3/ggiUnpackPixels.3
man/man3/ggi_color.3
man/man3/ggi_coord.3
man/man3/ggi_directbuffer.3
man/man3/ggi_graphtype.3
man/man3/ggi_mode.3
man/man3/ggi_pixel.3
man/man3/ggi_pixelformat.3
man/man3/ggi_pixellinearbuffer.3
man/man3/ggi_pixelplanarbuffer.3
man/man3/ggi_samplelinearbuffer.3
man/man3/ggi_sampleplanarbuffer.3
man/man7/display-aa.7
man/man7/display-dga.7
man/man7/display-directx.7
man/man7/display-directxnt.7
man/man7/display-fbdev.7
man/man7/display-file.7
man/man7/display-glide.7
man/man7/display-memory.7
man/man7/display-monotext.7
man/man7/display-multi.7
man/man7/display-palemu.7
man/man7/display-sub.7
man/man7/display-svgalib.7
man/man7/display-tele.7
man/man7/display-tile.7
man/man7/display-trueemu.7
man/man7/display-vcsa.7
man/man7/display-vgl.7
man/man7/display-x.7
man/man7/libggi.7
share/doc/ggi/README
share/examples/ggi/libggi.conf.example
share/examples/ggi/libggimisc.conf.example
%%SHARED%%
@dirrm share/examples/ggi
@dirrm share/doc/ggi
@dirrm lib/ggi/helper
@dirrm lib/ggi/display
@dirrm lib/ggi/default
@dirrm include/ggi/display
@dirrm include/ggi/default