diff options
| author | obache <obache@pkgsrc.org> | 2014-12-25 05:10:38 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2014-12-25 05:10:38 +0000 |
| commit | b466e3d2713022f2cc3284f269da1e5ef5fbaa07 (patch) | |
| tree | ed05b43ac7354f4ca2fffb15132c5484b3412a78 /graphics | |
| parent | 687775586796ff3d544b6634dc95ff1aee0177a6 (diff) | |
| download | pkgsrc-b466e3d2713022f2cc3284f269da1e5ef5fbaa07.tar.gz | |
Assume cp as GNU cp only for Linux and Fixes installation of symbolic link,
other than platforms using GNU cp except SVR4 and Darwin.
FIxes a part of PR pkg/49497.
Bump PKGREVISION.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/ivtools/Makefile | 6 | ||||
| -rw-r--r-- | graphics/ivtools/PLIST | 4 | ||||
| -rw-r--r-- | graphics/ivtools/distinfo | 4 | ||||
| -rw-r--r-- | graphics/ivtools/patches/patch-be | 13 |
4 files changed, 17 insertions, 10 deletions
diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile index 8239baa292a..77381d84472 100644 --- a/graphics/ivtools/Makefile +++ b/graphics/ivtools/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.30 2014/12/25 04:30:19 obache Exp $ +# $NetBSD: Makefile,v 1.31 2014/12/25 05:10:38 obache Exp $ DISTNAME= ivtools-1.2.8 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ivtools/} EXTRACT_SUFX= .tgz @@ -15,7 +15,7 @@ CONFLICTS+= dclock-[0-9]* DEPENDS+= pstoedit>=3.0:../../graphics/pstoedit USE_LANGUAGES= c c++ -USE_TOOLS+= imake bash:run wget:run +USE_TOOLS+= imake bash:run wget:run tar REPLACE_BASH+= src/scripts/ivgetjpg.bash src/scripts/ivtiftopnm.bash diff --git a/graphics/ivtools/PLIST b/graphics/ivtools/PLIST index a0524ef378b..bf5a302e4ca 100644 --- a/graphics/ivtools/PLIST +++ b/graphics/ivtools/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2014/12/25 04:57:25 obache Exp $ +@comment $NetBSD: PLIST,v 1.12 2014/12/25 05:10:38 obache Exp $ bin/comdraw bin/comterp bin/comtest @@ -205,6 +205,7 @@ include/IV-2_6/InterViews/world.h include/IV-2_6/_enter.h include/IV-2_6/_leave.h include/IV-2_6/_names.h +include/IV-3_1/InterViews include/IV-X11/Xdefs.h include/IV-X11/Xext.h include/IV-X11/Xlib.h @@ -844,4 +845,3 @@ man/man3/transfns.3 man/man3/transforms.3 man/man3/uctrls.3 man/man3/viewcmds.3 -@pkgdir include/IV-3_1 diff --git a/graphics/ivtools/distinfo b/graphics/ivtools/distinfo index baca9ff9dee..dc35032763a 100644 --- a/graphics/ivtools/distinfo +++ b/graphics/ivtools/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.24 2014/12/25 04:53:14 obache Exp $ +$NetBSD: distinfo,v 1.25 2014/12/25 05:10:38 obache Exp $ SHA1 (ivtools-1.2.8.tgz) = b494c726cf8784e0a5ca3a4092e5831d2d5b2bba RMD160 (ivtools-1.2.8.tgz) = 7f63f2b491202ba81c6d24234760d17d7f95ebc6 @@ -33,7 +33,7 @@ SHA1 (patch-ba) = bcc98482672d9c1642dd108fbecec16627d43345 SHA1 (patch-bb) = 8221a722579cc8921cd71e9ff8aedbf73a938e0b SHA1 (patch-bc) = be65c4c37689880cb66de15efd27ab2fa77d76d0 SHA1 (patch-bd) = faf9683d941c342eb1ce70fff541e9b8f2034ba1 -SHA1 (patch-be) = 71397158e66fb694ad3482ab2c231daa26fa3631 +SHA1 (patch-be) = 11e770cd4288556ccd161afb86434591bb8c9e68 SHA1 (patch-bf) = 60e8f16226e526e75da80652aaeb11b7f51c30a9 SHA1 (patch-bg) = 36113051de323a5483337b4821ffa1a8163f59bf SHA1 (patch-bh) = dcd30d0096d8a13bdd2e5db2eb5eace3b010ba56 diff --git a/graphics/ivtools/patches/patch-be b/graphics/ivtools/patches/patch-be index 37e05c13d0c..2922a81b146 100644 --- a/graphics/ivtools/patches/patch-be +++ b/graphics/ivtools/patches/patch-be @@ -1,4 +1,7 @@ -$NetBSD: patch-be,v 1.1 2010/04/05 22:52:23 markd Exp $ +$NetBSD: patch-be,v 1.2 2014/12/25 05:10:38 obache Exp $ + +* DESTDIR support +* Assume cp as GNU cp only for Linux. --- config/rules.def.orig 2005-10-11 21:21:17.000000000 +0000 +++ config/rules.def @@ -153,8 +156,12 @@ $NetBSD: patch-be,v 1.1 2010/04/05 22:52:23 markd Exp $ #endif #endif -@@ -1095,19 +1095,19 @@ uninstall:: @@\ - #if !defined(SVR4) && !defined(DarwinArchitecture) +@@ -1092,22 +1092,22 @@ uninstall:: @@\ + #if InstallRelative + #define InstallSymLink(dir, file) /**/ + #else +-#if !defined(SVR4) && !defined(DarwinArchitecture) ++#if defined(LinuxArchitecture) #define InstallSymLink(dir, file) @@\ install:: @@\ - MakeDir(dir) @@\ |