diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-02-21 06:24:29 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-02-21 06:24:29 +0800 |
| commit | 65819abc9779a3a49c60312dcf81edcb5ae696ff (patch) | |
| tree | e860ae433c1b66b4460bb464344b17da62e6b465 /archivers/file-roller | |
| parent | feb11084c5f57787899e3182b3a00c71e9176261 (diff) | |
| download | marcuscom-ports-65819abc9779a3a49c60312dcf81edcb5ae696ff.tar marcuscom-ports-65819abc9779a3a49c60312dcf81edcb5ae696ff.tar.gz marcuscom-ports-65819abc9779a3a49c60312dcf81edcb5ae696ff.tar.bz2 marcuscom-ports-65819abc9779a3a49c60312dcf81edcb5ae696ff.tar.lz marcuscom-ports-65819abc9779a3a49c60312dcf81edcb5ae696ff.tar.xz marcuscom-ports-65819abc9779a3a49c60312dcf81edcb5ae696ff.tar.zst marcuscom-ports-65819abc9779a3a49c60312dcf81edcb5ae696ff.zip | |
FreeBSD 5.3 and higher already has gtar in /usr/bin, but this gtar is too
old. So fix things a bit so that we always depend on the gtar port, and
we always use ${LOCALBASE}/bin/gtar.
Things would be so much better if GNU tar was updated to 1.15.1 in the base
OS.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3686 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'archivers/file-roller')
| -rw-r--r-- | archivers/file-roller/Makefile | 10 | ||||
| -rw-r--r-- | archivers/file-roller/files/patch-src_fr-command-tar.c | 11 |
2 files changed, 20 insertions, 1 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index 8f4fafdd2..467cb459c 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -18,11 +18,15 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= An archive manager for zip files, tar, etc -RUN_DEPENDS= gtar:${PORTSDIR}/archivers/gtar +# XXX: We need the ports version of gtar since gtar-1.13.25 included with +# FreeBSD is not sufficient. If the base version of GNU tar is updated, then +# we can do away with this dependency. +RUN_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar USE_BZIP2= yes INSTALLS_OMF= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils nautilus2 USE_LIBTOOL_VER=15 @@ -31,6 +35,10 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GCONF_SCHEMAS= file-roller.schemas +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/src/fr-command-tar.c + post-install: @-update-desktop-database .if !defined(NOPORTDOCS) diff --git a/archivers/file-roller/files/patch-src_fr-command-tar.c b/archivers/file-roller/files/patch-src_fr-command-tar.c new file mode 100644 index 000000000..ea0addced --- /dev/null +++ b/archivers/file-roller/files/patch-src_fr-command-tar.c @@ -0,0 +1,11 @@ +--- src/fr-command-tar.c.orig Sun Feb 20 17:17:15 2005 ++++ src/fr-command-tar.c Sun Feb 20 17:19:07 2005 +@@ -219,7 +219,7 @@ + /* In solaris gtar is present under /usr/sfw/bin */ + + prev_path = g_getenv ("PATH"); +- temp = g_strdup_printf ("PATH=%s:%s", prev_path, "/usr/sfw/bin"); ++ temp = g_strdup_printf ("PATH=%s:%s:%s", "%%LOCALBASE%%/bin", prev_path, "/usr/sfw/bin"); + putenv (temp); + + path = g_find_program_in_path ("gtar"); |