diff -urN /usr/ports/audio/glame/Makefile audio/glame/Makefile --- /usr/ports/audio/glame/Makefile Sun Mar 14 18:07:17 2004 +++ audio/glame/Makefile Tue Mar 16 21:31:07 2004 @@ -6,8 +6,7 @@ # PORTNAME= glame -PORTVERSION= 1.0.1 -PORTREVISION= 3 +PORTVERSION= 1.0.2 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -19,15 +18,13 @@ LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \ ltdl.4:${PORTSDIR}/devel/libltdl -USE_REINPLACE= yes USE_X_PREFIX= yes -USE_GNOME= gnomehack gnomeprefix gnometarget libglade +USE_GNOME= gnomehack gnomeprefix gnometarget libglade lthack USE_GMAKE= yes USE_LIBTOOL_VER= 13 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib -lltdl ${PTHREAD_LIBS}" \ MAKEINFO="makeinfo --no-split" -INSTALLS_SHLIB= yes INFO= glame glame-dev @@ -41,9 +38,9 @@ @cd ${WRKSRC}/doc && ${RM} -f *.info* post-patch: - @${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|-lpthread|${PTHREAD_LIBS}|g' - @${GREP} -lR "" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ - 's|||' + @${REINPLACE_CMD} -e 's| libltdl||g ; \ + s|,$$LIBLTDL,|,,|g ; \ + s|,$$LTDLINCL,|,,|g ; \ + s|,$$LTLIBOBJS,|,,|g' ${WRKSRC}/configure .include diff -urN /usr/ports/audio/glame/distinfo audio/glame/distinfo --- /usr/ports/audio/glame/distinfo Wed Jan 28 18:44:38 2004 +++ audio/glame/distinfo Tue Mar 16 00:23:18 2004 @@ -1,2 +1,2 @@ -MD5 (glame-1.0.1.tar.gz) = 3e225128de5ab563954559205f1228df -SIZE (glame-1.0.1.tar.gz) = 1360539 +MD5 (glame-1.0.2.tar.gz) = 6d4c76891257dab0d9cee18d21a5db9a +SIZE (glame-1.0.2.tar.gz) = 1587125 diff -urN /usr/ports/audio/glame/files/patch-ab audio/glame/files/patch-ab --- /usr/ports/audio/glame/files/patch-ab Wed Sep 27 02:37:39 2000 +++ audio/glame/files/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,7 +0,0 @@ ---- config.h.in 2000/09/26 17:02:50 1.1 -+++ config.h.in 2000/09/26 17:03:16 -@@ -127,3 +127,4 @@ - /* Version number of package */ - #undef VERSION - -+#define ulong unsigned long diff -urN /usr/ports/audio/glame/files/patch-configure audio/glame/files/patch-configure --- /usr/ports/audio/glame/files/patch-configure Wed Jul 2 00:24:15 2003 +++ audio/glame/files/patch-configure Thu Jan 1 09:00:00 1970 @@ -1,42 +0,0 @@ - -$FreeBSD: ports/audio/glame/files/patch-configure,v 1.2 2003/07/01 12:34:21 sobomax Exp $ - ---- configure.orig Tue Jul 1 15:02:34 2003 -+++ configure Tue Jul 1 15:03:00 2003 -@@ -467,7 +467,7 @@ - # include - #endif" - --ac_subdirs_all="$ac_subdirs_all libltdl" -+ac_subdirs_all="$ac_subdirs_all" - ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB EGREP LIBTOOL MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON USE_NLS BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT INTLOBJS DATADIRNA ME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS BUILD_GUILE GUILE_INCS GUILE_LIBS GUILE_TRUE GUILE_FALSE GNOME_LIBS GNOMEUI_LIBS ZVT_LIBS GNOME_LIBDIR GNOME_INCLUDEDIR GNOME_CONFIG ESD_CONFIG ESD_CFLAGS ESD_LIBS IMLIB_CONFIG GNOME_APPLETS_LIBS GNOME_CAPPLET_LIBS HAVE_GNOME_TRUE HAVE_GNOME_FALSE ac_libglade_config XML_CFLAGS XML_LIBS XML2_CONFIG XML_CONFIG HAVE_FFTW_TRUE HAVE_FFTW_FALSE afconfig HAVE_OSS_TRUE HAVE_OSS_FALSE HAVE_ESD_TRUE HAVE_ESD_FALSE SGIAUDIO_LIBS HAVE_SGI_TRUE HAVE_SGI_FALSE ALSA_CFLAGS ALSA_LIBS HAVE_ALSA_TRUE HAVE_ALSA_FALSE LADSPA_CFLAGS LADSPA_TRUE LADSPA_FALSE LIBOBJS EXPERIMENTAL_TRUE EXPERIMENTAL_FALSE PKG_CONFIG MAD_CFLAGS MAD_LIBS STATICLIBS_TRUE STATICLIBS_FALSE pkgpixmapsdir pkgscriptsdir GLAME_LIBS GLAME_CFLAGS GLAME_DLIBS GLAME_DCFLAGS GLAME_AUDIO_LIBS GLAME_AUDIO_CFLAGS GLAME_FFT_LIBS LIBLTDL LTDLINCL subdirs LTLIBOBJS' - ac_subst_files='' - -@@ -8138,6 +8138,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -21263,7 +21264,7 @@ - - - --subdirs="$subdirs libltdl" -+subdirs="$subdirs" - - - ac_config_files="$ac_config_files Makefile macros/Makefile doc/Makefile doc/pix/Makefile data/Makefile data/pixmaps/Makefile src/Makefile src/filter/Makefile src/swapfile/Makefile src/hash/Makefile src/plugins/Makefile src/include/Makefile src/gui/Makefile src/glmid/Makefile intl/Makefile po/Makefile.in" -@@ -22129,8 +22130,8 @@ - s,@GLAME_AUDIO_LIBS@,$GLAME_AUDIO_LIBS,;t t - s,@GLAME_AUDIO_CFLAGS@,$GLAME_AUDIO_CFLAGS,;t t - s,@GLAME_FFT_LIBS@,$GLAME_FFT_LIBS,;t t --s,@LIBLTDL@,$LIBLTDL,;t t --s,@LTDLINCL@,$LTDLINCL,;t t -+s,@LIBLTDL@,,;t t -+s,@LTDLINCL@,,;t t - s,@subdirs@,$subdirs,;t t - s,@LTLIBOBJS@,$LTLIBOBJS,;t t - CEOF