Index: head/sysutils/gcombust/Makefile
===================================================================
--- head/sysutils/gcombust/Makefile	(revision 431724)
+++ head/sysutils/gcombust/Makefile	(revision 431725)
@@ -1,42 +1,42 @@
 # Created by: Juergen Lock <nox@jelal.kn-bremen.de>
 # $FreeBSD$
 
 PORTNAME=	gcombust
 PORTVERSION=	0.1.55
 PORTREVISION=	8
 CATEGORIES=	sysutils
 MASTER_SITES=	http://mirror.symnds.com/software/misc/ \
 		http://www.egr.msu.edu/~mcdouga9/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+ frontend for mkisofs and cdrecord
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	cdlabelgen:print/cdlabelgen \
 		cdrecord:sysutils/cdrtools
 
-USES=		gettext perl5
+USES=		gettext localbase perl5
 USE_PERL5=	build
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--without-included-gettext --datadir=${PREFIX}/share
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--without-included-gettext \
+		--datadir=${PREFIX}/share
 
 OPTIONS_DEFINE=	DOCS
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \
-	    ${WRKSRC}/configure
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|==|=|g' ${WRKSRC}/po/Makefile.in.in
 
 post-configure:
 	cd ${WRKSRC}/po && ${MAKE} update-po
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/sysutils/gcombust/files/patch-src-optimize_usage.h
===================================================================
--- head/sysutils/gcombust/files/patch-src-optimize_usage.h	(revision 431724)
+++ head/sysutils/gcombust/files/patch-src-optimize_usage.h	(revision 431725)
@@ -1,10 +1,10 @@
---- src/optimize_usage.h	1999-12-20 15:23:18.000000000 -0500
-+++ src/optimize_usage.h	2007-08-05 15:47:54.000000000 -0400
+--- src/optimize_usage.h.orig	1999-12-20 20:23:18 UTC
++++ src/optimize_usage.h
 @@ -16,7 +16,6 @@
  ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
  
 -extern GtkWidget *opt_try_harder;
  extern long int opt_cdsize;
  
  void open_optimize_size_win(GtkWidget *, gpointer);
Index: head/sysutils/gcombust/files/patch-src-rip_audio.h
===================================================================
--- head/sysutils/gcombust/files/patch-src-rip_audio.h	(revision 431724)
+++ head/sysutils/gcombust/files/patch-src-rip_audio.h	(revision 431725)
@@ -1,7 +1,7 @@
---- src/rip_audio.h	2000-12-11 13:26:41.000000000 -0500
-+++ src/rip_audio.h	2007-08-05 15:48:02.000000000 -0400
-@@ -20,4 +20,3 @@
+--- src/rip_audio.h.orig	2000-12-11 18:26:41 UTC
++++ src/rip_audio.h
+@@ -20,4 +20,3 @@ void open_rip_audio_req(void);
  
  extern char *cdda2wav_path, *cdda_device_path, *cdparanoia_path;
  extern char *def_rip_path;
 -extern GtkWidget *rip_path_entry;