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

o update to newer versions

Browse Source 
o bring COMMENT into makefiles
o patch libtool for shared lib support
This commit is contained in:
todd 2001-03-26 16:03:53 +00:00
parent 0421c85fc6
commit e69fc00bb2
12 changed files with 337 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
graphics/ggi/Makefile
View File

@ -1,11 +1,12 @@
# $OpenBSD: Makefile,v 1.17 2000/10/22 14:03:18 espie Exp $
# $OpenBSD: Makefile,v 1.18 2001/03/26 16:03:53 todd Exp $
DISTNAME= libggi-2.0b2.1
COMMENT= "Generic Graphics Library"
DISTNAME= libggi-2.0b3
CATEGORIES= graphics
NEED_VERSION= 1.330
MASTER_SITES= ftp://ftp.ggi-project.org/pub/ggi/ggi/2_0_beta_2.1/
NEED_VERSION= 1.364
MASTER_SITES= ftp://ftp.ggi-project.org/pub/ggi/ggi/2_0_beta_3/
LIB_DEPENDS= gii.0.::graphics/gii
LIB_DEPENDS= gii.0.7::graphics/gii
MAINTAINER= Todd T. Fries <todd@openbsd.org>
@ -14,9 +15,11 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
EXTRACT_SUFX= .tar.bz2
USE_X11= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= CFLAGS=-pthread
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static --disable-aa \
--with-gii="${PREFIX}"

6
graphics/ggi/files/md5
View File

@ -1,3 +1,3 @@
MD5 (libggi-2.0b2.1.tar.gz) = 6c38ea789c283a5c5cde69c636d3273d
RMD160 (libggi-2.0b2.1.tar.gz) = 8a45f26196e578233c7a5b6657033e7d85456e6e
SHA1 (libggi-2.0b2.1.tar.gz) = 698de63108a58fa1fc08942266118dc2fccf482c
MD5 (libggi-2.0b3.tar.bz2) = f13740d79f63b46acf820c0d5a26d7d2
RMD160 (libggi-2.0b3.tar.bz2) = 7b4e236eef1608cd68cbfc0cc1a5bcc957e8c05a
SHA1 (libggi-2.0b3.tar.bz2) = 2a2dd0a65f65a7902f0fecfe8417c43f8e9e30a2

52
graphics/ggi/patches/patch-ltconfig Normal file
View File

@ -0,0 +1,52 @@
$OpenBSD: patch-ltconfig,v 1.1 2001/03/26 16:03:55 todd Exp $
--- ltconfig.orig Fri Jun 23 15:04:53 2000
+++ ltconfig Wed Feb 28 14:25:41 2001
@@ -1108,6 +1108,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
;;
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -1405,10 +1408,21 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archve_cmds='$LD -Bsharable -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}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)
@@ -2030,13 +2044,10 @@ netbsd*)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
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*)

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

@ -0,0 +1,83 @@
$OpenBSD: patch-ltmain_sh,v 1.1 2001/03/26 16:03:55 todd Exp $
--- ltmain.sh.orig Thu Jun 1 11:22:40 2000
+++ ltmain.sh Wed Feb 28 14:26:13 2001
@@ -1079,6 +1079,17 @@ compiler."
# These systems don't actually have c library (as such)
continue
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ continue
+ ;;
+ esac
+ elif test "$arg" = "-lc_r"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
esac
elif test "$arg" = "-lm"; then
case "$host" in
@@ -1091,6 +1102,10 @@ compiler."
deplibs="$deplibs $arg"
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
+
-module)
module=yes
continue
@@ -2690,6 +2705,9 @@ static const void *lt_preloaded_setup()
# Absolute path.
rpath="$rpath$dir:"
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
*)
# Relative path: add a thisdir entry.
rpath="$rpath\$thisdir/$dir:"
@@ -3567,40 +3585,6 @@ libdir='$install_libdir'\
# 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 \`-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
;;

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2000/09/24 00:01:04 brad Exp $
@comment $OpenBSD: PFRAG.shared,v 1.2 2001/03/26 16:03:56 todd Exp $
lib/ggi/default/color.so
lib/ggi/default/ilbm.so
lib/ggi/default/iplanar_2p.so
@ -9,13 +9,14 @@ lib/ggi/default/linear_2.so
lib/ggi/default/linear_24.so
lib/ggi/default/linear_32.so
lib/ggi/default/linear_4.so
lib/ggi/default/linear_4_r.so
lib/ggi/default/linear_8.so
lib/ggi/default/planar.so
lib/ggi/default/stubs.so
lib/ggi/default/text_16.so
lib/ggi/default/text_32.so
lib/ggi/display/X-misc.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/mansync.so
@ -29,4 +30,4 @@ lib/ggi/display/tile.so
lib/ggi/display/trueemu.so
lib/libggi.so.2.0
lib/libggimisc.so.2.0
DYNLIBDIR(%B)
DYNLIBDIR(%D/lib)

29
graphics/ggi/pkg/PLIST
View File

@ -1,10 +1,14 @@
@comment $OpenBSD: PLIST,v 1.6 2000/09/24 00:01:04 brad Exp $
@comment $OpenBSD: PLIST,v 1.7 2001/03/26 16:03:56 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/lcd823.h
include/ggi/display/linvtsw.h
include/ggi/display/mansync.h
include/ggi/display/memory.h
@ -18,6 +22,7 @@ include/ggi/display/tele.h
include/ggi/display/tile.h
include/ggi/display/trueemu.h
include/ggi/display/vcsa.h
include/ggi/display/vgl.h
include/ggi/display/x.h
include/ggi/display/xcommon.h
include/ggi/display/xf86dga.h
@ -56,6 +61,8 @@ lib/ggi/default/linear_32.a
lib/ggi/default/linear_32.la
lib/ggi/default/linear_4.a
lib/ggi/default/linear_4.la
lib/ggi/default/linear_4_r.a
lib/ggi/default/linear_4_r.la
lib/ggi/default/linear_8.a
lib/ggi/default/linear_8.la
lib/ggi/default/planar.a
@ -66,10 +73,10 @@ lib/ggi/default/text_16.a
lib/ggi/default/text_16.la
lib/ggi/default/text_32.a
lib/ggi/default/text_32.la
lib/ggi/display/X-misc.a
lib/ggi/display/X-misc.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
@ -96,7 +103,7 @@ lib/libggi.a
lib/libggi.la
lib/libggimisc.a
lib/libggimisc.la
%%SHARED%%
man/man3/ggiAddEventMask.3ggi
man/man3/ggiAddFlags.3ggi
man/man3/ggiCheckGraphMode.3ggi
man/man3/ggiCheckMode.3ggi
@ -112,6 +119,10 @@ 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
@ -119,6 +130,7 @@ 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
@ -134,7 +146,10 @@ 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
@ -147,6 +162,7 @@ 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
@ -154,6 +170,7 @@ 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
@ -175,11 +192,13 @@ man/man7/libggi.7ggi
share/doc/ggi/README
share/examples/ggi/libggi.conf.example
share/examples/ggi/libggimisc.conf.example
@dirrm share/doc/ggi
%%SHARED%%
@dirrm share/examples/ggi
@dirrm share/doc/ggi
@dirrm lib/ggi/display
@dirrm lib/ggi/default
@dirrm lib/ggi
@dirrm include/ggi/internal
@dirrm include/ggi/display
@dirrm include/ggi/default
@dirrm include/ggi

10
graphics/gii/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.15 2000/10/31 15:06:42 espie Exp $
# $OpenBSD: Makefile,v 1.16 2001/03/26 16:03:57 todd Exp $
DISTNAME= libgii-0.6
COMMENT= "General Input Library (used by libggi)"
DISTNAME= libgii-0.7
CATEGORIES= graphics
NEED_VERSION= 1.330
MASTER_SITES= ftp://ftp.ggi-project.org/pub/ggi/ggi/2_0_beta_2.1/
NEED_VERSION= 1.364
MASTER_SITES= ftp://ftp.ggi-project.org/pub/ggi/ggi/2_0_beta_3/
MAINTAINER= Todd T. Fries <todd@openbsd.org>
@ -14,6 +15,7 @@ PERMIT_DISTFILES_FTP= Yes
USE_X11= Yes
USE_GMAKE= Yes
EXTRACT_SUFX= .tar.bz2
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static --enable-mutexes="int"

6
graphics/gii/files/md5
View File

@ -1,3 +1,3 @@
MD5 (libgii-0.6.tar.gz) = 40cc8e909e50a0a2ee274d67957f15fe
RMD160 (libgii-0.6.tar.gz) = eaee155c3dfd3c851543550c34b70bd5adda3155
SHA1 (libgii-0.6.tar.gz) = d83d7b045343b1f745e6557208532c959e9e825f
MD5 (libgii-0.7.tar.bz2) = 3b93ad12ad614165501ea4cf3b1d0f4b
RMD160 (libgii-0.7.tar.bz2) = 41ca653f799c137a96a970a0f6c6de2d62821c17
SHA1 (libgii-0.7.tar.bz2) = 21ade72abaa9defecc662ab742ee3d9754fbaba3

52
graphics/gii/patches/patch-ltconfig Normal file
View File

@ -0,0 +1,52 @@
$OpenBSD: patch-ltconfig,v 1.1 2001/03/26 16:03:58 todd Exp $
--- ltconfig.orig Fri Jun 23 15:04:53 2000
+++ ltconfig Wed Feb 28 14:25:41 2001
@@ -1108,6 +1108,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
;;
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -1405,10 +1408,21 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7.*)
+ archve_cmds='$LD -Bsharable -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}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)
@@ -2030,13 +2044,10 @@ netbsd*)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
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*)

83
graphics/gii/patches/patch-ltmain_sh Normal file
View File

@ -0,0 +1,83 @@
$OpenBSD: patch-ltmain_sh,v 1.1 2001/03/26 16:03:59 todd Exp $
--- ltmain.sh.orig Thu Jun 1 11:22:40 2000
+++ ltmain.sh Wed Feb 28 14:26:13 2001
@@ -1079,6 +1079,17 @@ compiler."
# These systems don't actually have c library (as such)
continue
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ continue
+ ;;
+ esac
+ elif test "$arg" = "-lc_r"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
esac
elif test "$arg" = "-lm"; then
case "$host" in
@@ -1091,6 +1102,10 @@ compiler."
deplibs="$deplibs $arg"
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
+
-module)
module=yes
continue
@@ -2690,6 +2705,9 @@ static const void *lt_preloaded_setup()
# Absolute path.
rpath="$rpath$dir:"
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
*)
# Relative path: add a thisdir entry.
rpath="$rpath\$thisdir/$dir:"
@@ -3567,40 +3585,6 @@ libdir='$install_libdir'\
# 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 \`-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
;;

11
graphics/gii/pkg/PFRAG.shared
View File

@ -1,14 +1,17 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2000/09/23 23:55:53 brad Exp $
@comment $OpenBSD: PFRAG.shared,v 1.2 2001/03/26 16:03:59 todd Exp $
lib/ggi/filter/keytrans.so
lib/ggi/filter/mouse.so
lib/ggi/filter/save.so
lib/ggi/filter/tcp.so
lib/ggi/input/file.so
lib/ggi/input/linux_mouse.so
lib/ggi/input/mouse.so
lib/ggi/input/null.so
lib/ggi/input/spaceorb.so
lib/ggi/input/stdin.so
lib/ggi/input/tcp.so
lib/ggi/input/x.so
lib/ggi/input/xwin.so
lib/libgg.so.0.6
lib/libgii.so.0.6
DYNLIBDIR(%B)
lib/libgg.so.0.7
lib/libgii.so.0.7
DYNLIBDIR(%D/lib)

15
graphics/gii/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2000/09/23 23:55:53 brad Exp $
@comment $OpenBSD: PLIST,v 1.8 2001/03/26 16:04:00 todd Exp $
bin/mhub
bin/xsendbut
include/ggi/errors.h
@ -13,10 +13,14 @@ include/ggi/internal/gii.h
include/ggi/internal/gii_debug.h
include/ggi/keyboard.h
include/ggi/system.h
lib/ggi/filter/keytrans.a
lib/ggi/filter/keytrans.la
lib/ggi/filter/mouse.a
lib/ggi/filter/mouse.la
lib/ggi/filter/save.a
lib/ggi/filter/save.la
lib/ggi/filter/tcp.a
lib/ggi/filter/tcp.la
lib/ggi/input/file.a
lib/ggi/input/file.la
lib/ggi/input/linux_mouse.a
@ -29,6 +33,8 @@ lib/ggi/input/spaceorb.a
lib/ggi/input/spaceorb.la
lib/ggi/input/stdin.a
lib/ggi/input/stdin.la
lib/ggi/input/tcp.a
lib/ggi/input/tcp.la
lib/ggi/input/x.a
lib/ggi/input/x.la
lib/ggi/input/xwin.a
@ -37,13 +43,14 @@ lib/libgg.a
lib/libgg.la
lib/libgii.a
lib/libgii.la
%%SHARED%%
man/man1/mhub.1
man/man3/giiAddEventMask.3gii
man/man3/giiClose.3gii
man/man3/giiEventPoll.3gii
man/man3/giiEventRead.3gii
man/man3/giiEventSelect.3gii
man/man3/giiEventSend.3gii
man/man3/giiEventsQueued.3gii
man/man3/giiExit.3gii
man/man3/giiGetEventMask.3gii
man/man3/giiInit.3gii
@ -52,10 +59,12 @@ man/man3/giiOpen.3gii
man/man3/giiPanic.3gii
man/man3/giiRemoveEventMask.3gii
man/man3/giiSetEventMask.3gii
man/man7/libgii.7gii
share/doc/gii/README
share/examples/gii/libgii.conf.example
@dirrm share/doc/gii
%%SHARED%%
@dirrm share/examples/gii
@dirrm share/doc/gii
@dirrm lib/ggi/input
@dirrm lib/ggi/filter
@dirrm lib/ggi