subst /usr/local for ${TRUEPREFIX}, reminded by ajacoutot, ok aja mcbride

This commit is contained in:
sthen 2012-06-09 13:03:40 +00:00
parent f67ddd6517
commit 3e7efbda74
2 changed files with 6 additions and 4 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2012/06/09 12:31:55 mcbride Exp $
# $OpenBSD: Makefile,v 1.2 2012/06/09 13:03:40 sthen Exp $
COMMENT = cross-platform password manager
V = 1.5.3.6.3
REVISION = 0
DISTNAME = zdia-gorilla-v${V}-0-gfc80d95
PKGNAME = password-gorilla-${V}
CATEGORIES = security
@ -38,6 +39,7 @@ GORILLASTUFF = blowfish isaac.tcl viewhelp.tcl pwsafe \
do-install:
${MODTCL_WISH_ADJ} ${WRKDIST}/gorilla.tcl
${SUBST_CMD} ${WRKDIST}/gorilla.tcl
${INSTALL_PROGRAM_DIR} ${GORILLALIB}
@cd ${WRKDIST}; \
tar -cf - ${GORILLASTUFF} | tar -xf - -C ${GORILLALIB}

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gorilla_tcl,v 1.1.1.1 2012/06/09 12:31:55 mcbride Exp $
$OpenBSD: patch-gorilla_tcl,v 1.2 2012/06/09 13:03:40 sthen Exp $
--- gorilla.tcl.orig Sat Jun 9 17:41:45 2012
+++ gorilla.tcl Sat Jun 9 17:42:04 2012
@@ -36,11 +36,7 @@ set ::gorillaVersion {$Revision: 1.1.1.1 $}
@@ -36,11 +36,7 @@ set ::gorillaVersion {$Revision: 1.2 $}
# find the location of the install directory even when "executing" a symlink
# pointing to the gorilla.tcl file
@ -10,7 +10,7 @@ $OpenBSD: patch-gorilla_tcl,v 1.1.1.1 2012/06/09 12:31:55 mcbride Exp $
-} else {
- set ::gorillaDir [ file normalize [ file dirname [ info script ] ] ]
-}
+ set ::gorillaDir "/usr/local/lib/password-gorilla"
+ set ::gorillaDir "${TRUEPREFIX}/lib/password-gorilla"
# ----------------------------------------------------------------------
# Make sure that our prerequisite packages are available. Don't want