diff options
| author | Marcelo Araujo <araujo@FreeBSD.org> | 2007-09-17 16:52:59 +0000 |
|---|---|---|
| committer | Marcelo Araujo <araujo@FreeBSD.org> | 2007-09-17 16:52:59 +0000 |
| commit | 75a7e399c034e0e56604e3c9ba401cb19c02018f (patch) | |
| tree | ad669b4f3376ef3110204956c033eb80dce34e04 /sysutils | |
| parent | Update PostgreSQL ports to the latest patch releases. (diff) | |
- Unbreak with gcc4.
PR: ports/115323
Submitted by: Ulrich Spoerlein <uspoerlein@gmail.com>
Approved by: stas (mentor), maintainer timeout (2 weeks)
Notes
Notes:
svn path=/head/; revision=199627
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/gcombust/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/gcombust/files/patch-gcc4 | 22 | ||||
| -rw-r--r-- | sysutils/gcombust/pkg-plist | 6 |
3 files changed, 30 insertions, 6 deletions
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile index 57a22aee983b..703f61d93ba3 100644 --- a/sysutils/gcombust/Makefile +++ b/sysutils/gcombust/Makefile @@ -7,7 +7,7 @@ PORTNAME= gcombust PORTVERSION= 0.1.55 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://www.abo.fi/~jmunsin/gcombust/ @@ -35,8 +35,10 @@ post-configure: cd ${WRKSRC}/po && ${MAKE} update-po post-install: +.if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/gcombust - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gcombust - ${INSTALL_DATA} ${WRKSRC}/NEWS ${PREFIX}/share/doc/gcombust + ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR} +.endif .include <bsd.port.mk> diff --git a/sysutils/gcombust/files/patch-gcc4 b/sysutils/gcombust/files/patch-gcc4 new file mode 100644 index 000000000000..1aa1a0af5ff0 --- /dev/null +++ b/sysutils/gcombust/files/patch-gcc4 @@ -0,0 +1,22 @@ +--- src/rip_audio.c.orig 2007-08-08 19:26:25.000000000 +0200 ++++ src/rip_audio.c 2007-08-08 19:26:54.000000000 +0200 +@@ -41,7 +41,7 @@ + char *cdda2wav_path = NULL, *cdda_device_path; + char *def_rip_path = NULL; + char *cdparanoia_path = NULL, *cdpara_device_path; +-static GtkWidget *rip_path_entry; ++GtkWidget *rip_path_entry; + + static GtkWidget *rip_win = NULL, *p_win; + static GtkWidget *autoscroll_cdda2wav_text, *cdda2wav_text, *cdda2wav_text_scrollbar; +--- src/optimize_usage.c.orig 2007-08-08 19:26:00.000000000 +0200 ++++ src/optimize_usage.c 2007-08-08 19:26:11.000000000 +0200 +@@ -31,7 +31,7 @@ + #include "locks.h" + #include "globals.h" + +-static GtkWidget *opt_try_harder; ++GtkWidget *opt_try_harder; + + static GtkWidget *cdsize_option_menu, *cdsize_selected_label, *cdsector_selected_label; + static GtkWidget *used_size_label, *used_sectors_label, *wasted_size_label, *wasted_sectors_label; diff --git a/sysutils/gcombust/pkg-plist b/sysutils/gcombust/pkg-plist index 4d673562a89c..4f30c2a0b7c6 100644 --- a/sysutils/gcombust/pkg-plist +++ b/sysutils/gcombust/pkg-plist @@ -1,6 +1,6 @@ bin/gcombust -share/doc/gcombust/README -share/doc/gcombust/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/NEWS share/applications/gcombust.desktop share/locale/da/LC_MESSAGES/gcombust.mo share/locale/de/LC_MESSAGES/gcombust.mo @@ -20,4 +20,4 @@ share/locale/sk/LC_MESSAGES/gcombust.mo share/locale/sv/LC_MESSAGES/gcombust.mo share/pixmaps/gcombust.xpm @dirrmtry share/applications -@dirrm share/doc/gcombust +%%PORTDOCS%%@dirrm %%DOCSDIR%% |