I noticed a SIZE mismatch, compared the new and old distfile, found
that a small change had been made, emailed the developers, and
then he rerolled the distfile again. so the distfile was rerolled
twice without changing the distname :(
patch below for the new distinfo, some mild cleanup, and USE_LIBTOOL.
OK?
--
<[EMAIL PROTECTED]>
Index: Makefile
===================================================================
RCS file: /home/cvs/OpenBSD/ports/devel/guilib/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile 23 Nov 2004 11:22:02 -0000 1.12
+++ Makefile 20 Nov 2005 00:01:38 -0000
@@ -2,12 +2,10 @@
COMMENT= "SDL C++ GUI widget library"
-VER= 1.1.1
-PROJ= GUIlib
-DISTNAME= ${PROJ}-${VER}
-PKGNAME= guilib-${VER}
+DISTNAME= GUIlib-1.1.1
+PKGNAME= ${DISTNAME:L}p0
CATEGORIES= devel graphics
-MASTER_SITES= http://www.libsdl.org/projects/${PROJ}/src/
+MASTER_SITES= http://www.libsdl.org/projects/GUIlib/src/
HOMEPAGE= http://www.libsdl.org/projects/GUIlib/
@@ -21,10 +19,10 @@
LIB_DEPENDS= SDL.::devel/sdl
USE_X11= Yes
-
+USE_LIBTOOL= Yes
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${X11BASE}/lib"
+CONFIGURE_ENV+= LDFLAGS="-L${X11BASE}/lib"
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
.include <bsd.own.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/OpenBSD/ports/devel/guilib/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 5 Jan 2005 16:22:31 -0000 1.4
+++ distinfo 20 Nov 2005 00:01:38 -0000
@@ -1,4 +1,4 @@
-MD5 (GUIlib-1.1.1.tar.gz) = 9d5d88cdb42dd8611e31f5e3f8a3084e
-RMD160 (GUIlib-1.1.1.tar.gz) = 1b1f8891e3bac36865fbf943d8930b12de43d6ac
-SHA1 (GUIlib-1.1.1.tar.gz) = 9707fbb6cb7a1035c91f0190814d7e5ce43caeaf
-SIZE (GUIlib-1.1.1.tar.gz) = 179035
+MD5 (GUIlib-1.1.1.tar.gz) = 7ac15661310d2cde4c3ce72513b45535
+RMD160 (GUIlib-1.1.1.tar.gz) = d08ad2216926d5babd607f6c46a488d144499a1d
+SHA1 (GUIlib-1.1.1.tar.gz) = 2c5a3ae6e6f9a41cbe01149c891430ffc2266b10
+SIZE (GUIlib-1.1.1.tar.gz) = 180324
Index: patches/patch-Makefile_am
===================================================================
RCS file: patches/patch-Makefile_am
diff -N patches/patch-Makefile_am
--- patches/patch-Makefile_am 3 Sep 2002 04:29:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-Makefile_am,v 1.2 2002/09/03 04:29:10 mark Exp $
---- Makefile.am.orig Wed Apr 5 21:53:29 2000
-+++ Makefile.am Mon Sep 2 21:22:28 2002
-@@ -50,7 +50,6 @@ EXTRA_DIST = \
- scroll_dn.bmp \
- scroll_up.bmp
- libGUI_la_LDFLAGS = \
-- -release $(LT_RELEASE) \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
-
Index: patches/patch-ltconfig
===================================================================
RCS file: patches/patch-ltconfig
diff -N patches/patch-ltconfig
--- patches/patch-ltconfig 3 Sep 2002 04:29:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,52 +0,0 @@
-$OpenBSD: patch-ltconfig,v 1.2 2002/09/03 04:29:10 mark Exp $
---- ltconfig.orig Wed Apr 5 21:48:53 2000
-+++ ltconfig Mon Sep 2 21:22:28 2002
-@@ -1294,6 +1294,9 @@ cygwin* | mingw*)
- with_gnu_ld=no
- fi
- ;;
-+openbsd*)
-+ with_gnu_ld=no
-+ ;;
-
- esac
-
-@@ -1617,10 +1620,21 @@ else
- ;;
-
- openbsd*)
-- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- 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*)
-@@ -2035,13 +2049,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*)
Index: patches/patch-ltmain_sh
===================================================================
RCS file: patches/patch-ltmain_sh
diff -N patches/patch-ltmain_sh
--- patches/patch-ltmain_sh 3 Sep 2002 04:29:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,54 +0,0 @@
-$OpenBSD: patch-ltmain_sh,v 1.2 2002/09/03 04:29:10 mark Exp $
---- ltmain.sh.orig Wed Apr 5 21:48:54 2000
-+++ ltmain.sh Mon Sep 2 21:22:29 2002
-@@ -1980,6 +1980,9 @@ compiler."
- *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
- # these systems don't actually have a c library (as such)!
- ;;
-+ *-*-openbsd*)
-+ # do not include libc due to us having libc/libc_r
-+ ;;
- *)
- # Add libc to deplibs on all other systems.
- deplibs="$deplibs -lc"
-@@ -4263,40 +4266,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 \`-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
- ;;
-
