summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordmcmahill <dmcmahill@pkgsrc.org>2007-10-01 23:40:17 +0000
committerdmcmahill <dmcmahill@pkgsrc.org>2007-10-01 23:40:17 +0000
commit526bf714f975f9ccfea1b044393cabb773eb2d99 (patch)
tree295d0ee0e4e994030fd8d43522cf85d395f7ab73
parent73ed08725434b07390f472a27fe83dbcb2b7b2ea (diff)
downloadpkgsrc-526bf714f975f9ccfea1b044393cabb773eb2d99.tar.gz
Fix this again on solaris. WRKSRC was out of date and there was a missing
option to the install script for where to install the man page.
-rw-r--r--www/opera/Makefile.plain15
1 files changed, 7 insertions, 8 deletions
diff --git a/www/opera/Makefile.plain b/www/opera/Makefile.plain
index 79ba97bc4ab..e0fd238885f 100644
--- a/www/opera/Makefile.plain
+++ b/www/opera/Makefile.plain
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.plain,v 1.1 2007/08/23 22:22:07 jlam Exp $
+# $NetBSD: Makefile.plain,v 1.2 2007/10/01 23:40:17 dmcmahill Exp $
.if ${EMUL_PLATFORM} == "freebsd-i386"
ONLY_FOR_PLATFORM+= FreeBSD-*-i386
@@ -7,7 +7,7 @@ OPERA_ARCH= .i386.freebsd
OPERA_DIR= unix/freebsd/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/static
OPERA_DIST_VERSION= ${OPERA_PKG_VERSION:C/u.*//}-${OPERA_VER_DATE}.1-static-qt
-WRKSRC= ${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}-655
+WRKSRC= ${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}-660
OWN_DIRS= ${PREFIX}/share/opera/plugins
@@ -19,7 +19,7 @@ OPERA_ARCH= -sol8-sparc
OPERA_DIR= unix/solaris/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/sparc/static
OPERA_DIST_VERSION= ${OPERA_PKG_VERSION:C/u.*//}-${OPERA_VER_DATE}.1-static-qt
-WRKSRC= ${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}-655
+WRKSRC= ${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}-660
BUILD_DEFS+= INSTALL_ETC_OPERARC
INSTALL_ETC_OPERARC?= no
@@ -38,12 +38,11 @@ SUBST_STAGE.opera= post-build
SUBST_FILES.opera= man/opera.1
SUBST_SED.opera= -e 's,/usr/,${PREFIX}/,g'
+FULLMANDIR= ${PREFIX}/${PKGMANDIR}
do-install:
- @(${ECHO} "n"; ${ECHO} "n") > ${WRKSRC}/inst.cmd
- @cd ${WRKSRC} && ${CAT} ${WRKSRC}/inst.cmd | \
- ./install.sh --prefix=${PREFIX:Q}
+ (${ECHO} "n"; ${ECHO} "n") > ${WRKSRC}/inst.cmd
+ cd ${WRKSRC} && ${CAT} ${WRKSRC}/inst.cmd | \
+ ./install.sh --prefix=${PREFIX:Q} --mandir=${FULLMANDIR:Q}
@${ECHO} "=> You can ignore any previous lines about opera6rc"
@${ECHO}
-post-install:
- @${INSTALL_MAN} ${WRKSRC}/man/opera.1 ${PREFIX}/${PKGMANDIR}/man1