diff --git a/devel/sdl-image/Makefile b/devel/sdl-image/Makefile index 23874243fa7..77a8fa5ac8c 100644 --- a/devel/sdl-image/Makefile +++ b/devel/sdl-image/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.2 2001/05/24 02:27:10 kevlo Exp $ +# $OpenBSD: Makefile,v 1.3 2001/10/05 17:35:26 obecian Exp $ COMMENT= "SDL image library" -VER= 1.2.0 -PROJ= SDL_image +VER= 1.2.0 +PROJ= SDL_image DISTNAME= ${PROJ}-${VER} PKGNAME= sdl-image-${VER} CATEGORIES= devel graphics @@ -20,9 +20,9 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes LIB_DEPENDS= SDL.:sdl-*-!no_x11:devel/sdl \ - png.2::graphics/png \ - tiff.35::graphics/tiff \ - jpeg.62.::graphics/jpeg + png.2::graphics/png \ + tiff.35::graphics/tiff \ + jpeg.62.::graphics/jpeg USE_X11= Yes @@ -31,4 +31,7 @@ CONFIGURE_STYLE= gnu CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" CONFIGURE_ARGS+= ${CONFIGURE_SHARED} +PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig \ + ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh + .include diff --git a/devel/sdl-image/patches/patch-ltconfig b/devel/sdl-image/patches/patch-ltconfig deleted file mode 100644 index fcc2fbd0382..00000000000 --- a/devel/sdl-image/patches/patch-ltconfig +++ /dev/null @@ -1,51 +0,0 @@ ---- ltconfig.orig Sun May 6 15:23:46 2001 -+++ ltconfig Sun May 6 15:30:32 2001 -@@ -1105,6 +1105,9 @@ cygwin* | mingw*) - with_gnu_ld=no - fi - ;; -+openbsd*) -+ with_gnu_ld=no -+ ;; - - esac - -@@ -1403,10 +1406,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].*) -+ 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}-rpath,$libdir' -+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then -+ export_dynamic_flag_spec='${wl}-E' -+ fi -+ ;; -+ esac - ;; - - os2*) -@@ -2029,13 +2043,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*) diff --git a/devel/sdl-image/patches/patch-ltmain_sh b/devel/sdl-image/patches/patch-ltmain_sh deleted file mode 100644 index 129f3f9c1db..00000000000 --- a/devel/sdl-image/patches/patch-ltmain_sh +++ /dev/null @@ -1,53 +0,0 @@ ---- ltmain.sh.orig Sun May 6 15:23:53 2001 -+++ ltmain.sh Sun May 6 15:31:58 2001 -@@ -1799,6 +1799,9 @@ compiler." - # rhapsody is a little odd... - deplibs="$deplibs -framework System" - ;; -+ *-*-openbsd*) -+ # do not include libc due to us having libc/libc_r. -+ ;; - *) - # Add libc to deplibs on all other systems. - deplibs="$deplibs -lc" -@@ -3567,40 +3570,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 - ;; - diff --git a/devel/sdl-mixer/Makefile b/devel/sdl-mixer/Makefile index 973822060d6..070d1903c78 100644 --- a/devel/sdl-mixer/Makefile +++ b/devel/sdl-mixer/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2001/05/07 04:07:03 obecian Exp $ +# $OpenBSD: Makefile,v 1.2 2001/10/05 17:37:26 obecian Exp $ COMMENT= "SDL multi-channel audio mixer library" -VER= 1.2.0 -PROJ= SDL_mixer +VER= 1.2.0 +PROJ= SDL_mixer DISTNAME= ${PROJ}-${VER} PKGNAME= sdl-mixer-${VER} CATEGORIES= devel audio @@ -26,13 +26,16 @@ LIB_DEPENDS+= vorbis.0::audio/libvorbis .endif LIB_DEPENDS= SDL.:sdl-*-!no_x11:devel/sdl \ - smpeg.1::devel/smpeg + smpeg.1::devel/smpeg USE_X11= Yes -SEPARATE_BUILD= concurrent +SEPARATE_BUILD= concurrent CONFIGURE_STYLE= gnu -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" CONFIGURE_ARGS+= ${CONFIGURE_SHARED} +PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig \ + ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh + .include diff --git a/devel/sdl-mixer/patches/patch-ltconfig b/devel/sdl-mixer/patches/patch-ltconfig deleted file mode 100644 index 88a72352525..00000000000 --- a/devel/sdl-mixer/patches/patch-ltconfig +++ /dev/null @@ -1,51 +0,0 @@ ---- ltconfig.orig Sat May 5 15:27:02 2001 -+++ ltconfig Sat May 5 15:30:43 2001 -@@ -1105,6 +1105,9 @@ cygwin* | mingw*) - with_gnu_ld=no - fi - ;; -+openbsd*) -+ with_gnu_ld=no -+ ;; - - esac - -@@ -1403,10 +1406,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].*) -+ 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}-rpath,$libdir' -+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then -+ export_dynamic_flag_spec='${wl}-E' -+ fi -+ ;; -+ esac - ;; - - os2*) -@@ -2029,13 +2043,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*) diff --git a/devel/sdl-mixer/patches/patch-ltmain_sh b/devel/sdl-mixer/patches/patch-ltmain_sh deleted file mode 100644 index 9d07476dd32..00000000000 --- a/devel/sdl-mixer/patches/patch-ltmain_sh +++ /dev/null @@ -1,53 +0,0 @@ ---- ltmain.sh.orig Sat May 5 15:31:38 2001 -+++ ltmain.sh Sat May 5 15:33:01 2001 -@@ -1799,6 +1799,9 @@ compiler." - # rhapsody is a little odd... - deplibs="$deplibs -framework System" - ;; -+ *-*-openbsd*) -+ # do not include libc due to us having libc/libc_r. -+ ;; - *) - # Add libc to deplibs on all other systems. - deplibs="$deplibs -lc" -@@ -3567,40 +3570,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 - ;; - diff --git a/devel/sdl-net/Makefile b/devel/sdl-net/Makefile index 72dd9bcb317..e8ea5f6f308 100644 --- a/devel/sdl-net/Makefile +++ b/devel/sdl-net/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2001/08/19 07:12:46 obecian Exp $ +# $OpenBSD: Makefile,v 1.3 2001/10/05 17:38:32 obecian Exp $ COMMENT= "SDL cross-platform networking library" @@ -29,4 +29,7 @@ CONFIGURE_STYLE= gnu CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" CONFIGURE_ARGS+= ${CONFIGURE_SHARED} +PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig \ + ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh + .include diff --git a/devel/sdl-net/patches/patch-ltconfig b/devel/sdl-net/patches/patch-ltconfig deleted file mode 100644 index 0b2daedb416..00000000000 --- a/devel/sdl-net/patches/patch-ltconfig +++ /dev/null @@ -1,51 +0,0 @@ ---- ltconfig.orig Sun May 6 16:10:56 2001 -+++ ltconfig Sun May 6 16:14:02 2001 -@@ -1105,6 +1105,9 @@ cygwin* | mingw*) - with_gnu_ld=no - fi - ;; -+openbsd*) -+ with_gnu_ld=no -+ ;; - - esac - -@@ -1403,10 +1406,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].*) -+ 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}-rpath,$libdir' -+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then -+ export_dynamic_flag_spec='${wl}-E' -+ fi -+ ;; -+ esac - ;; - - os2*) -@@ -2029,13 +2043,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*) diff --git a/devel/sdl-net/patches/patch-ltmain_sh b/devel/sdl-net/patches/patch-ltmain_sh deleted file mode 100644 index c6d59a928eb..00000000000 --- a/devel/sdl-net/patches/patch-ltmain_sh +++ /dev/null @@ -1,53 +0,0 @@ ---- ltmain.sh.orig Sun May 6 16:11:01 2001 -+++ ltmain.sh Sun May 6 16:15:05 2001 -@@ -1799,6 +1799,9 @@ compiler." - # rhapsody is a little odd... - deplibs="$deplibs -framework System" - ;; -+ *-*-openbsd*) -+ # do not include libc due to us having libc/libc_r. -+ ;; - *) - # Add libc to deplibs on all other systems. - deplibs="$deplibs -lc" -@@ -3567,40 +3570,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 - ;; -