Updated grip to 3.0.2.

Mike incorporated my last set of source patches into the trunk like he
always does so they're gone from here.
Able to remove some extra work from Makefile cause Mike did those over, too.
Have fun, kids, and remember, Do not taunt Happy Fun Grip!

6 files changed, 10 insertions, 70 deletions

diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index 7fb9387ac898..3429d8553ed1 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	grip
-PORTVERSION=	3.0.1
+PORTVERSION=	3.0.2
 # PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -17,14 +17,12 @@ MAINTAINER=	alane@FreeBSD.org
 LIB_DEPENDS=	id3-3.7.13:${PORTSDIR}/audio/id3lib \
 		ghttp.1:${PORTSDIR}/www/libghttp
 
-USE_AUTOMAKE_VER=	14
-USE_AUTOCONF_VER=	213
+USE_X_PREFIX=	yes
 
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomelibs
-GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
 
@@ -41,10 +39,7 @@ CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS}"
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ENV+= LIBS=${PTHREAD_LIBS}
 
-pre-configure:
-	cd ${WRKSRC}; ${AUTOHEADER}; ${AUTOMAKE}; ${AUTOCONF}
-
-post-install:
+post-install::
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/audio/grip/distinfo b/audio/grip/distinfo
index 7adf2e8c2b26..d38f50e32f40 100644
--- a/audio/grip/distinfo
+++ b/audio/grip/distinfo
@@ -1 +1 @@
-MD5 (grip-3.0.1.tar.gz) = 3fe1d7e1b4f9a52d4ca759a477c785b1
+MD5 (grip-3.0.2.tar.gz) = c8c193e599304c1d048b0a691e8a2e59
diff --git a/audio/grip/files/patch-src-Makefile.am b/audio/grip/files/patch-src-Makefile.am
deleted file mode 100644
index f2af2da8d802..000000000000
--- a/audio/grip/files/patch-src-Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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
deleted file mode 100644
index caada2288f4e..000000000000
--- a/audio/grip/files/patch-src-grip.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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
- 
-   ginfo->changer_slots=0;
-   ginfo->current_disc=0;
diff --git a/audio/grip/files/patch-src-rip.c b/audio/grip/files/patch-src-rip.c
deleted file mode 100644
index 0b8ad78e026a..000000000000
--- a/audio/grip/files/patch-src-rip.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/rip.c.orig	Fri Apr 12 11:53:29 2002
-+++ src/rip.c	Wed Jul 24 01:49:30 2002
-@@ -980,7 +980,7 @@
-     else strncpy(res,_("NoTitle"),PATH_MAX);
-     break;
-   case 'i':
--    g_snprintf(res,PATH_MAX,"%02x",enc_track->discid);
-+    g_snprintf(res,PATH_MAX,"%08x",enc_track->discid);
-     *munge=FALSE;
-     break;
-   case 'y':
diff --git a/audio/grip/pkg-plist b/audio/grip/pkg-plist
index b11f93ff5d71..62682f69dc3f 100644
--- a/audio/grip/pkg-plist
+++ b/audio/grip/pkg-plist
@@ -79,12 +79,10 @@ 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
-%%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
-%%PORTDOCS%%@dirrm share/gnome/help/grip
-%%PORTDOCS%%@dirrm share/gnome/help
+%%PORTDOCS%%@exec /bin/mkdir -p %D/share/gnome/help/grip/C/images || true
+%%PORTDOCS%%@unexec /bin/rmdir share/gnome/help/grip/C/images || true
+%%PORTDOCS%%@unexec /bin/rmdir share/gnome/help/grip/C || true
+%%PORTDOCS%%@unexec /bin/rmdir share/gnome/help/grip || true
+%%PORTDOCS%%@unexec /bin/rmdir share/gnome/help || true
 @dirrm share/gnome/apps/Multimedia
 @dirrm share/gnome/apps