Date: Sun, 27 Jan 2002 14:35:06 +0300 From: Sergey Skvortsov <skv@protey.ru> To: Alan Eldridge <alane@geeksrus.net> Cc: ports@FreeBSD.ORG, portmgr@FreeBSD.ORG Subject: Re: patch for ports/Mk/bsd.port.mk Message-ID: <3C53E5EA.6556EEBA@protey.ru> References: <200201251504.g0PF4Re43715@freefall.freebsd.org> <20020125160633.GA70080@wwweasel.geeksrus.net> <3C52F476.CA20E11E@protey.ru> <20020126183209.GA67709@wwweasel.geeksrus.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Alan Eldridge wrote:
>
> So do I. I think leaving DATADIR alone is probably a good idea.
>
> >Other way - localize these changes to bsd.perl.mk or variables like PERL_(DOCS|EXAMPLES|DATA)DIR.
> >This way seems not elegant to me.
>
> Py- (or py22-) ports need it, too. :) And ruby, etc, etc.
And so, result patch seems like:
Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.395
diff -u -u -r1.395 bsd.port.mk
--- bsd.port.mk 22 Dec 2001 17:13:38 -0000 1.395
+++ bsd.port.mk 27 Jan 2002 11:25:30 -0000
@@ -475,9 +475,9 @@
# %%PREFIX%% for ${PREFIX}, %%LOCALBASE%% for
# ${LOCALBASE} and %%X11BASE%% for ${X11BASE}.
# DOCSDIR - Name of the directory to install the packages docs in
-# (default: ${PREFIX}/share/doc/${PORTNAME}).
+# (default: ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}).
# EXAMPLESDIR - Name of the directory to install the packages examples in
-# (default: ${PREFIX}/share/examples/${PORTNAME}).
+# (default: ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}).
# DATADIR - Name of the directory to install the packages shared data
# in (default: ${PREFIX}/share/${PORTNAME}).
#
@@ -1379,6 +1379,7 @@
CONFIGURE_ARGS+= CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}"
CONFIGURE_SCRIPT?= Makefile.PL
USE_PERL5= yes
+MAN3PREFIX?= ${PREFIX}/lib/perl5/${PERL_VERSION}
.undef HAS_CONFIGURE
.endif
@@ -1495,9 +1496,14 @@
LDCONFIG_RUNLIST!= ${ECHO} ${LDCONFIG_PLIST} | ${SED} -e "s!%D!${PREFIX}!g"
.endif
-DOCSDIR?= ${PREFIX}/share/doc/${PORTNAME}
-EXAMPLESDIR?= ${PREFIX}/share/examples/${PORTNAME}
+DOCSDIR?= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+EXAMPLESDIR?= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
DATADIR?= ${PREFIX}/share/${PORTNAME}
+
+PLIST_DIRS= DOCSDIR="${DOCSDIR}" \
+ EXAMPLESDIR="${EXAMPLESDIR}" \
+ DATADIR="${DATADIR}"
+PLIST_SUB+= ${PLIST_DIRS:S,DIR="${PREFIX}/,DIR=",}
.MAIN: all
Index: bsd.ruby.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.ruby.mk,v
retrieving revision 1.65
diff -u -u -r1.65 bsd.ruby.mk
--- bsd.ruby.mk 25 Dec 2001 17:02:32 -0000 1.65
+++ bsd.ruby.mk 25 Jan 2002 14:46:55 -0000
@@ -181,8 +181,8 @@
RUBY_ARCHLIBDIR?= ${RUBY_LIBDIR}/${RUBY_ARCH}
RUBY_SITELIBDIR?= ${_RUBY_SITEDIR}/${RUBY_VER}
RUBY_SITEARCHLIBDIR?= ${RUBY_SITELIBDIR}/${RUBY_ARCH}
-RUBY_DOCDIR?= ${LOCALBASE}/share/doc/${RUBY_NAME}
-RUBY_EXAMPLESDIR?= ${LOCALBASE}/share/examples/${RUBY_NAME}
+RUBY_DOCDIR?= ${LOCALBASE}/share/doc/${RUBY_PKGNAMEPREFIX}${RUBY_NAME}
+RUBY_EXAMPLESDIR?= ${LOCALBASE}/share/examples/${RUBY_PKGNAMEPREFIX}${RUBY_NAME}
RUBY_ELISPDIR?= ${_RUBY_SYSLIBDIR}/ruby/elisp
# PLIST
--
Sergey Skvortsov
mailto: skv@protey.ru
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3C53E5EA.6556EEBA>