From 93735b63245a46da8517538e0a9fa8407dfd9c21 Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Tue, 17 Jan 2017 09:03:56 +0000
Subject: - Fix LICENSE - Add LICENSE_FILE - Switch to USES=localbase - Switch
 to options helpers - Regenerate patches

---
 sysutils/gcombust/Makefile                         | 14 +++++++-------
 sysutils/gcombust/files/patch-src-optimize_usage.h |  4 ++--
 sysutils/gcombust/files/patch-src-rip_audio.h      |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'sysutils')

diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index 8a6e4c198835..d9637b49224a 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -11,30 +11,30 @@ MASTER_SITES=	http://mirror.symnds.com/software/misc/ \
 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}
diff --git a/sysutils/gcombust/files/patch-src-optimize_usage.h b/sysutils/gcombust/files/patch-src-optimize_usage.h
index 38c1f403e1aa..0e73a6fc62b7 100644
--- a/sysutils/gcombust/files/patch-src-optimize_usage.h
+++ b/sysutils/gcombust/files/patch-src-optimize_usage.h
@@ -1,5 +1,5 @@
---- 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.
  */
diff --git a/sysutils/gcombust/files/patch-src-rip_audio.h b/sysutils/gcombust/files/patch-src-rip_audio.h
index efdf4853e8b6..d255e8b7e950 100644
--- a/sysutils/gcombust/files/patch-src-rip_audio.h
+++ b/sysutils/gcombust/files/patch-src-rip_audio.h
@@ -1,6 +1,6 @@
---- 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;
-- 
cgit v1.2.3