1. Updated to 3.0.1.

2. Fixed pthread/libc_r handling to be done the right way.
3. Do not look for statvfs.h until that gets straightened out.
4. Put in some "destined for author's tree" fixes related to FreeBSD
   and polling.
5. Put the generic scsi device string in the config file (hopefully will
   go into main tree).

8 files changed, 91 insertions, 117 deletions

diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index 25ca2e640e3d..facf86ee73e4 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	grip
-PORTVERSION=	3.0.0
-PORTREVISION=	2
+PORTVERSION=	3.0.1
+# PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=grip
@@ -17,6 +17,9 @@ MAINTAINER=	ports@geeksrus.net
 LIB_DEPENDS=	id3-3.7.13:${PORTSDIR}/audio/id3lib \
 		ghttp.1:${PORTSDIR}/www/libghttp
 
+USE_AUTOMAKE_VER=	14
+USE_AUTOCONF_VER=	213
+
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GTK=	yes
@@ -25,25 +28,21 @@ GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
+CFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib 
 
 .if defined(WITH_DEBUG)
-CONFIGURE_ENV+=	CFLAGS="-g" \
-		LDFLAGS="-g -L${LOCALBASE}/lib"
-.else
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
-.endif
-
-INSTALL_SUBDIRS=	contrib intl pixmaps po src
-.if !defined(NOPORTDOCS)
-INSTALL_SUBDIRS+=	doc
+CFLAGS+=	-g
+LDFLAGS+=	-g
 .endif
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" 
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS}"
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+= LIBS=${PTHREAD_LIBS}
 
-do-install:
-	@cd ${WRKSRC}; ${MAKE} install-am
-.for dir in ${INSTALL_SUBDIRS}
-	@cd ${WRKSRC}/${dir}; ${MAKE} ${INSTALL_TARGET}
-.endfor
+pre-configure:
+	cd ${WRKSRC}; ${AUTOHEADER}; ${AUTOMAKE}; ${AUTOCONF}
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/audio/grip/distinfo b/audio/grip/distinfo
index 43543c2d6365..7adf2e8c2b26 100644
--- a/audio/grip/distinfo
+++ b/audio/grip/distinfo
@@ -1 +1 @@
-MD5 (grip-3.0.0.tar.gz) = a3d0fa657fd7c70656fe6d8b63a75527
+MD5 (grip-3.0.1.tar.gz) = 3fe1d7e1b4f9a52d4ca759a477c785b1
diff --git a/audio/grip/files/patch-configure.in b/audio/grip/files/patch-configure.in
new file mode 100644
index 000000000000..b76f8a5fe612
--- /dev/null
+++ b/audio/grip/files/patch-configure.in
@@ -0,0 +1,18 @@
+--- configure.in.orig	Mon Jun 17 22:45:51 2002
++++ configure.in	Wed Jul 24 20:17:34 2002
+@@ -30,13 +30,13 @@
+ AC_PROG_CXX
+ AC_ISC_POSIX
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS(sys/vfs.h sys/statvfs.h)
++dnl AC_CHECK_HEADERS(sys/vfs.h sys/statvfs.h)
+ AC_CHECK_HEADERS(linux/cdrom.h linux/ucdrom.h sys/cdio.h io/cam/cdrom.h sys/mntent.h)
+ AC_CHECK_HEADERS(linux/soundcard.h machine/soundcard.h sys/soundcard.h sys/audioio.h sys/audio.io.h sun/audioio.h)
+ 
+ AC_ARG_PROGRAM
+ AM_PROG_LIBTOOL
+-GNOME_PTHREAD_CHECK
++dnl GNOME_PTHREAD_CHECK
+ 
+ GNOME_GHTTP_CHECK
+ if test "$GHTTP_LIB" = ""; then
diff --git a/audio/grip/files/patch-doc-C-Makefile.am b/audio/grip/files/patch-doc-C-Makefile.am
deleted file mode 100644
index 27983c3ea996..000000000000
--- a/audio/grip/files/patch-doc-C-Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
---- doc/C/Makefile.am.orig	Mon Feb 25 23:09:25 2002
-+++ doc/C/Makefile.am	Fri Apr 19 20:45:01 2002
-@@ -1,4 +1,4 @@
--grip_helpdir = $(DESTDIR)$(datadir)/gnome/help/grip/C
-+grip_helpdir = $(datadir)/gnome/help/grip/C
- 
- grip_help_DATA =         \
-         grip.html        \
-@@ -35,10 +35,10 @@
- 	-cp grip.html $(distdir)
- 
- install-data-local: grip.html
--	$(mkinstalldirs) $(grip_helpdir)/images
-+	$(mkinstalldirs) $(DESTDIR)$(grip_helpdir)/images
- 	-for file in $(srcdir)/grip/*.html $(srcdir)/grip/*.css $(srcdir)/grip/*.png; do \
- 	basefile=`basename $$file`; \
--	$(INSTALL_DATA) $(srcdir)/$$file $(grip_helpdir)/$$basefile; \
-+	$(INSTALL_DATA) $(srcdir)/$$file  $(DESTDIR)$(grip_helpdir)/$$basefile; \
- 	done
- 
- grip.ps: grip.sgml
-@@ -46,4 +46,3 @@
- 
- grip.rtf: grip.sgml       
- 	-db2rtf $<
--
diff --git a/audio/grip/files/patch-doc-C-Makefile.in b/audio/grip/files/patch-doc-C-Makefile.in
deleted file mode 100644
index c792106ee3f7..000000000000
--- a/audio/grip/files/patch-doc-C-Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- doc/C/Makefile.in.orig	Sat Apr 13 14:38:37 2002
-+++ doc/C/Makefile.in	Fri Apr 19 20:47:21 2002
-@@ -121,7 +121,7 @@
- cflags_set = @cflags_set@
- cxxflags_set = @cxxflags_set@
- 
--grip_helpdir = $(DESTDIR)$(datadir)/gnome/help/grip/C
-+grip_helpdir = $(datadir)/gnome/help/grip/C
- 
- grip_help_DATA = \
-         grip.html        \
-@@ -278,10 +278,10 @@
- 	-cp grip.html $(distdir)
- 
- install-data-local: grip.html
--	$(mkinstalldirs) $(grip_helpdir)/images
-+	$(mkinstalldirs) $(DESTDIR)$(grip_helpdir)/images
- 	-for file in $(srcdir)/grip/*.html $(srcdir)/grip/*.css $(srcdir)/grip/*.png; do \
- 	basefile=`basename $$file`; \
--	$(INSTALL_DATA) $(srcdir)/$$file $(grip_helpdir)/$$basefile; \
-+	$(INSTALL_DATA) $(srcdir)/$$file  $(DESTDIR)$(grip_helpdir)/$$basefile; \
- 	done
- 
- grip.ps: grip.sgml
diff --git a/audio/grip/files/patch-src-Makefile.am b/audio/grip/files/patch-src-Makefile.am
new file mode 100644
index 000000000000..f2af2da8d802
--- /dev/null
+++ b/audio/grip/files/patch-src-Makefile.am
@@ -0,0 +1,9 @@
+--- src/Makefile.am~	Wed Feb 27 12:00:42 2002
++++ src/Makefile.am	Wed Jul 24 20:27:20 2002
+@@ -37,5 +37,5 @@
+ 	gain_analysis.c \
+ 	gain_analysis.h
+ 
+-grip_LDADD = $(GNOMEUI_LIBS) $(GNOME_LIBDIR) $(INTLLIBS) $(PTHREAD_LIB) \
++grip_LDADD = $(GNOMEUI_LIBS) $(GNOME_LIBDIR) $(INTLLIBS) \
+ 	$(GHTTP_LIB) $(CDPAR_LIBS) $(ID3_LIBS)
diff --git a/audio/grip/files/patch-src-grip.c b/audio/grip/files/patch-src-grip.c
index 352d21153f34..a2bdac2c3697 100644
--- a/audio/grip/files/patch-src-grip.c
+++ b/audio/grip/files/patch-src-grip.c
@@ -1,51 +1,43 @@
---- src/grip.c.orig	Sun Mar 10 21:59:44 2002
-+++ src/grip.c	Wed Jul 24 01:32:08 2002
-@@ -40,6 +40,12 @@
- #include "xpm.h"
- #include "parsecfg.h"
- 
-+#ifdef __FreeBSD__
-+#define CD_POLL_SECS 15
-+#else
-+#define CD_POLL_SECS 1
+--- src/grip.c.orig	Mon Jun 17 22:13:35 2002
++++ src/grip.c	Wed Jul 24 21:24:57 2002
+@@ -61,6 +61,7 @@
+ 
+ #define BASE_CFG_ENTRIES \
+ {"cd_device",CFG_ENTRY_STRING,256,ginfo->cd_device},\
++{"force_scsi",CFG_ENTRY_STRING,256,ginfo->force_scsi},\
+ {"ripexename",CFG_ENTRY_STRING,256,ginfo->ripexename},\
+ {"ripcmdline",CFG_ENTRY_STRING,256,ginfo->ripcmdline},\
+ {"wav_filter_cmd",CFG_ENTRY_STRING,256,ginfo->wav_filter_cmd},\
+@@ -126,8 +127,7 @@
+ {"disable_extra_paranoia",CFG_ENTRY_BOOL,0,&ginfo->disable_extra_paranoia},\
+ {"disable_scratch_detect",CFG_ENTRY_BOOL,0,&ginfo->disable_scratch_detect},\
+ {"disable_scratch_repair",CFG_ENTRY_BOOL,0,&ginfo->disable_scratch_repair},\
+-{"calc_gain",CFG_ENTRY_BOOL,0,&ginfo->calc_gain},\
+-{"force_scsi",CFG_ENTRY_STRING,256,ginfo->force_scsi},
++{"calc_gain",CFG_ENTRY_BOOL,0,&ginfo->calc_gain},
+ 
+ #ifdef CDPAR
+ #define CFG_ENTRIES BASE_CFG_ENTRIES CDPAR_CFG_ENTRIES
+@@ -607,10 +607,11 @@
+   ginfo->volume=255;
+ #if defined(__FreeBSD__)
+   ginfo->poll_drive=FALSE;
++  ginfo->poll_interval=15;
+ #else
+   ginfo->poll_drive=TRUE;
+-#endif
+   ginfo->poll_interval=1;
 +#endif
-+
- static void ReallyDie(gint reply,gpointer data);
- static void DoHelp(GtkWidget *widget,gpointer data);
- static void MakeHelpPage(GripInfo *ginfo);
-@@ -144,7 +150,7 @@
- 
-   app=gnome_app_new(PACKAGE,_("Grip"));
- 
--  ginfo=g_new(GripInfo,1);
-+  ginfo=g_new0(GripInfo,1);
- 
-   gtk_object_set_user_data(GTK_OBJECT(app),(gpointer)ginfo);
  
-@@ -511,8 +517,10 @@
-   if(ginfo->rewinding) Rewind(ginfo);
+   ginfo->changer_slots=0;
+   ginfo->current_disc=0;
+@@ -737,6 +738,9 @@
+       rename(filename,renamefile);
+     }
  
- #ifdef GRIPCD
--  if(!ginfo->have_disc)
--    CheckNewDisc(ginfo);
-+  if (!(time(0) % CD_POLL_SECS)) {
-+    if(!ginfo->have_disc)
-+      CheckNewDisc(ginfo);
-+  }
- 
-   if(ginfo->auto_eject_countdown && !(--ginfo->auto_eject_countdown))
-     EjectDisc(&(ginfo->disc));
-@@ -522,9 +530,10 @@
-   if(ginfo->ripping|ginfo->encoding) UpdateRipProgress(ginfo);
- 
-   if(!ginfo->ripping) {
--    if(!ginfo->have_disc)
--      CheckNewDisc(ginfo);
--    
-+    if (!(time(0) % CD_POLL_SECS)) {
-+      if(!ginfo->have_disc)
-+	CheckNewDisc(ginfo);
-+    }
-     UpdateDisplay(ginfo);
++#if defined(__FreeBSD__)
++    ginfo->poll_drive=FALSE;
++#endif /* defined __FreeBSD__ */
+     DoSaveConfig(ginfo);
    }
- #endif
+ 
diff --git a/audio/grip/pkg-plist b/audio/grip/pkg-plist
index 80549a621e7d..b11f93ff5d71 100644
--- a/audio/grip/pkg-plist
+++ b/audio/grip/pkg-plist
@@ -7,6 +7,7 @@ share/gnome/apps/Multimedia/grip.desktop
 %%PORTDOCS%%share/gnome/help/grip/C/cdplayer.html
 %%PORTDOCS%%share/gnome/help/grip/C/cdplayer.png
 %%PORTDOCS%%share/gnome/help/grip/C/cdplayersmall.png
+%%PORTDOCS%%share/gnome/help/grip/C/cdscan.png
 %%PORTDOCS%%share/gnome/help/grip/C/configure.html
 %%PORTDOCS%%share/gnome/help/grip/C/discdb.png
 %%PORTDOCS%%share/gnome/help/grip/C/discdbconfig.html
@@ -67,14 +68,19 @@ share/gnome/apps/Multimedia/grip.desktop
 %%PORTDOCS%%share/gnome/help/grip/C/topic.dat
 %%PORTDOCS%%share/gnome/help/grip/C/trkedit.png
 %%PORTDOCS%%share/gnome/help/grip/C/volume.png
-%%PORTDOCS%%share/gnome/help/grip/C/x131.html
+%%PORTDOCS%%share/gnome/help/grip/C/x135.html
 share/locale/de/LC_MESSAGES/grip.mo
+share/locale/es/LC_MESSAGES/grip.mo
 share/locale/fr/LC_MESSAGES/grip.mo
 share/locale/ja/LC_MESSAGES/grip.mo
+share/locale/pt_BR/LC_MESSAGES/grip.mo
+share/locale/ru/LC_MESSAGES/grip.mo
 share/locale/zh_CN/LC_MESSAGES/grip.mo
+share/locale/zh_HK/LC_MESSAGES/grip.mo
+share/locale/zh_TW/LC_MESSAGES/grip.mo
 share/pixmaps/gripicon.png
 @comment empty dirs
-@exec /bin/mkdir -p %D/share/gnome/help/grip/C/images
+%%PORTDOCS%%@exec /bin/mkdir -p %D/share/gnome/help/grip/C/images
 @comment directories
 %%PORTDOCS%%@dirrm share/gnome/help/grip/C/images
 %%PORTDOCS%%@dirrm share/gnome/help/grip/C