Attachment 95704 Details for Bug 134145 – lxr-1.0-fix-plist.diff

[patch] lxr-1.0-fix-plist.diff

lxr-1.0-fix-plist.diff (text/x-diff; charset=us-ascii), 1.59 KB, created by Eygene Ryabinkin on 2009-05-17 07:56:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eygene Ryabinkin

Created: 2009-05-17 07:56:24 UTC

Size: 1.59 KB

patch

obsolete

>diff --git a/devel/lxr/Makefile b/devel/lxr/Makefile
>index a7b1b86..06b3912 100644
>--- a/devel/lxr/Makefile
>+++ b/devel/lxr/Makefile
>@@ -34,13 +34,15 @@ DB_PREFIX=	lxr
> # Installation directory
> .if !defined(LXRDIR)
> .if defined(APACHE_DATADIR)
>-LXRDIR=	${APACHE_DATADIR}/data/lxr
>+LXRTOPDIR=	${APACHE_DATADIR}/data
> .else
>-LXRDIR=	${PREFIX}/www/data/lxr
>+LXRTOPDIR=	${PREFIX}/www/data
> .endif # defined(APACHE_DATADIR)
>+LXRDIR=	${LXRTOPDIR}/lxr
> .endif # !defined(LXRDIR)
> 
> PLIST_SUB+=	LXRDIR=${LXRDIR:S!^${PREFIX}/!!}
>+PLIST_SUB+=	LXRTOPDIR=${LXRTOPDIR:S!^${PREFIX}/!!}
> SUB_LIST+=	LXRDIR=${LXRDIR}
> 
> .include <bsd.port.pre.mk>
>@@ -118,8 +120,8 @@ do-install:
> 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
> .endfor # ${LXR_DOCS}
> .endif # !defined(NOPORTDOCS)
>-	${INSTALL_DATA} ${WRKSRC}/Local.pm ${SITE_PERL}
> 	${MKDIR} ${PREFIX}/${SITE_PERL_REL}
>+	${INSTALL_DATA} ${WRKSRC}/Local.pm ${PREFIX}/${SITE_PERL_REL}
> 	${TAR} -C ${WRKSRC}/lib -cf - --exclude *.orig LXR | ${TAR} -C ${PREFIX}/${SITE_PERL_REL} -xf -
> 	${TAR} -C ${WRKSRC} -cf - --exclude *.orig templates | ${TAR} -C ${LXRDIR} -xf -
> 	${CHMOD} 640 ${LXRDIR}/templates/lxr.conf
>diff --git a/devel/lxr/pkg-plist b/devel/lxr/pkg-plist
>index 7a1eca6..abdbb19 100644
>--- a/devel/lxr/pkg-plist
>+++ b/devel/lxr/pkg-plist
>@@ -25,6 +25,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/LICENSE
> %%PORTDOCS%%%%DOCSDIR%%/RELEASING
> %%PORTDOCS%%%%DOCSDIR%%/notes
>+%%SITE_PERL%%/Local.pm
> %%SITE_PERL%%/LXR/Files/Plain.pm
> %%SITE_PERL%%/LXR/Files/BK.pm
> %%SITE_PERL%%/LXR/Files/CVS.pm
>@@ -56,3 +57,4 @@
> @dirrm %%SITE_PERL%%/LXR
> @dirrm %%LXRDIR%%/templates
> @dirrmtry %%LXRDIR%%
>+@dirrmtry %%LXRTOPDIR%%

Actions: View | Diff

Attachments on bug 134145: 95703 | 95704 | 95705