diff options
author | wxs <wxs@FreeBSD.org> | 2009-01-23 04:58:49 +0800 |
---|---|---|
committer | wxs <wxs@FreeBSD.org> | 2009-01-23 04:58:49 +0800 |
commit | 7527a7815b5c78ee0eacef78030aa7a8dfbcab6f (patch) | |
tree | 7421bbb558d191aa8eb6b208dbf19fe0eaaa9cb6 /www | |
parent | 848c5f05b7d95bab49f4a8b32a8cc6c44b3eb60b (diff) | |
download | freebsd-ports-gnome-7527a7815b5c78ee0eacef78030aa7a8dfbcab6f.tar.gz freebsd-ports-gnome-7527a7815b5c78ee0eacef78030aa7a8dfbcab6f.tar.zst freebsd-ports-gnome-7527a7815b5c78ee0eacef78030aa7a8dfbcab6f.zip |
- Fix config.layout so database can be properly initialized
- Also, don't hardcode /usr/local in config.layout
PR: porta/130425
Submitted by: Petr Rehor <prehor@gmail.com>
Approved by: Steven Kreuzer <skreuzer@exit2shell.com> (maintainer)
Diffstat (limited to 'www')
-rw-r--r-- | www/rt38/Makefile | 9 | ||||
-rw-r--r-- | www/rt38/files/patch-config.layout | 21 | ||||
-rw-r--r-- | www/rt38/pkg-plist | 2 | ||||
-rw-r--r-- | www/rt40/Makefile | 9 | ||||
-rw-r--r-- | www/rt40/files/patch-config.layout | 21 | ||||
-rw-r--r-- | www/rt40/pkg-plist | 2 |
6 files changed, 42 insertions, 22 deletions
diff --git a/www/rt38/Makefile b/www/rt38/Makefile index b3461a570129..955d624c7994 100644 --- a/www/rt38/Makefile +++ b/www/rt38/Makefile @@ -15,7 +15,7 @@ PORTNAME= rt PORTVERSION= 3.8.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= http://download.bestpractical.com/pub/rt/release/ \ ftp://ftp.eu.uu.net/pub/unix/ticketing/rt/release/ @@ -30,9 +30,9 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-noportdocs-Makefile.in CONFLICTS= rt-2* rt-3.0* rt-3.2* rt-3.4* rt-3.6* LATEST_LINK= rt38 -OPTIONS= MYSQL "Enable MySQL backend" on \ - APACHE2 "Enable Apache2 server" on \ - MODPERL2 "Enable mod_perl2 support" on \ +OPTIONS= MYSQL "Enable MySQL backend" on \ + APACHE2 "Enable Apache2 server" on \ + MODPERL2 "Enable mod_perl2 support" on \ POSTGRESQL "Enable Postgresql backend" off \ ORACLE "Enable Oracle backend" off \ SQLITE "Enable SQLite backend" off \ @@ -194,6 +194,7 @@ pre-fetch: post-patch: @${RM} -f ${WRKSRC}/lib/RT.pm.in.orig + @${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!g' ${WRKSRC}/config.layout @${REINPLACE_CMD} -e 's!%%SITE_PERL%%!${SITE_PERL}!g' ${WRKSRC}/config.layout pre-install: diff --git a/www/rt38/files/patch-config.layout b/www/rt38/files/patch-config.layout index c4d4d7557141..5da101cb4f94 100644 --- a/www/rt38/files/patch-config.layout +++ b/www/rt38/files/patch-config.layout @@ -1,6 +1,13 @@ ---- ./config.layout.orig 2008-08-18 11:13:57.000000000 -0400 -+++ ./config.layout 2008-12-28 23:12:31.000000000 -0500 -@@ -91,19 +91,20 @@ +--- config.layout.orig 2008-08-18 11:13:57.000000000 -0400 ++++ config.layout 2009-01-21 10:35:34.000000000 -0500 +@@ -85,25 +85,26 @@ + </Layout> + + <Layout FreeBSD> +- prefix: /usr/local ++ prefix: %%PREFIX%% + exec_prefix: ${prefix} + bindir: ${exec_prefix}/bin sbindir: ${exec_prefix}/sbin sysconfdir: ${prefix}/etc+ mandir: ${prefix}/man @@ -8,7 +15,7 @@ + libdir: %%SITE_PERL%% datadir: ${prefix}/share+ htmldir: ${datadir}/html -+ sharedir: ${prefix}/share+ ++ sharedir: ${prefix}/share+ manualdir: ${prefix}/share/doc+ logfiledir: /var/log localstatedir: /var/run+ @@ -20,10 +27,10 @@ - customlexdir: ${customdir}/local/po - customlibdir: ${customdir}/local/lib + customdir: ${prefix} -+ custometcdir: ${customdir}/etc+ ++ custometcdir: ${datadir}/etc + customhtmldir: ${customdir}/www+ -+ customlexdir: ${sharedir}/po -+ customlibdir: %%SITE_PERL%% ++ customlexdir: ${datadir}/po ++ customlibdir: ${datadir}/lib </Layout> <Layout Win32> diff --git a/www/rt38/pkg-plist b/www/rt38/pkg-plist index a92df8e07e8b..2247b1ed975b 100644 --- a/www/rt38/pkg-plist +++ b/www/rt38/pkg-plist @@ -1051,6 +1051,7 @@ share/rt38/html/autohandler share/rt38/html/dhandler share/rt38/html/index.html share/rt38/html/l +@dirrm share/rt38/etc @dirrm share/rt38/plugins @dirrm share/rt38/po @dirrm share/rt38/html/Widgets/Form @@ -1183,6 +1184,7 @@ share/rt38/html/l @dirrm share/rt38/html/Admin/CustomFields @dirrm share/rt38/html/Admin @dirrm share/rt38/html +@dirrm share/rt38/lib @dirrm share/rt38 %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%SITE_PERL%%/RT/URI diff --git a/www/rt40/Makefile b/www/rt40/Makefile index b3461a570129..955d624c7994 100644 --- a/www/rt40/Makefile +++ b/www/rt40/Makefile @@ -15,7 +15,7 @@ PORTNAME= rt PORTVERSION= 3.8.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= http://download.bestpractical.com/pub/rt/release/ \ ftp://ftp.eu.uu.net/pub/unix/ticketing/rt/release/ @@ -30,9 +30,9 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-noportdocs-Makefile.in CONFLICTS= rt-2* rt-3.0* rt-3.2* rt-3.4* rt-3.6* LATEST_LINK= rt38 -OPTIONS= MYSQL "Enable MySQL backend" on \ - APACHE2 "Enable Apache2 server" on \ - MODPERL2 "Enable mod_perl2 support" on \ +OPTIONS= MYSQL "Enable MySQL backend" on \ + APACHE2 "Enable Apache2 server" on \ + MODPERL2 "Enable mod_perl2 support" on \ POSTGRESQL "Enable Postgresql backend" off \ ORACLE "Enable Oracle backend" off \ SQLITE "Enable SQLite backend" off \ @@ -194,6 +194,7 @@ pre-fetch: post-patch: @${RM} -f ${WRKSRC}/lib/RT.pm.in.orig + @${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!g' ${WRKSRC}/config.layout @${REINPLACE_CMD} -e 's!%%SITE_PERL%%!${SITE_PERL}!g' ${WRKSRC}/config.layout pre-install: diff --git a/www/rt40/files/patch-config.layout b/www/rt40/files/patch-config.layout index c4d4d7557141..5da101cb4f94 100644 --- a/www/rt40/files/patch-config.layout +++ b/www/rt40/files/patch-config.layout @@ -1,6 +1,13 @@ ---- ./config.layout.orig 2008-08-18 11:13:57.000000000 -0400 -+++ ./config.layout 2008-12-28 23:12:31.000000000 -0500 -@@ -91,19 +91,20 @@ +--- config.layout.orig 2008-08-18 11:13:57.000000000 -0400 ++++ config.layout 2009-01-21 10:35:34.000000000 -0500 +@@ -85,25 +85,26 @@ + </Layout> + + <Layout FreeBSD> +- prefix: /usr/local ++ prefix: %%PREFIX%% + exec_prefix: ${prefix} + bindir: ${exec_prefix}/bin sbindir: ${exec_prefix}/sbin sysconfdir: ${prefix}/etc+ mandir: ${prefix}/man @@ -8,7 +15,7 @@ + libdir: %%SITE_PERL%% datadir: ${prefix}/share+ htmldir: ${datadir}/html -+ sharedir: ${prefix}/share+ ++ sharedir: ${prefix}/share+ manualdir: ${prefix}/share/doc+ logfiledir: /var/log localstatedir: /var/run+ @@ -20,10 +27,10 @@ - customlexdir: ${customdir}/local/po - customlibdir: ${customdir}/local/lib + customdir: ${prefix} -+ custometcdir: ${customdir}/etc+ ++ custometcdir: ${datadir}/etc + customhtmldir: ${customdir}/www+ -+ customlexdir: ${sharedir}/po -+ customlibdir: %%SITE_PERL%% ++ customlexdir: ${datadir}/po ++ customlibdir: ${datadir}/lib </Layout> <Layout Win32> diff --git a/www/rt40/pkg-plist b/www/rt40/pkg-plist index a92df8e07e8b..2247b1ed975b 100644 --- a/www/rt40/pkg-plist +++ b/www/rt40/pkg-plist @@ -1051,6 +1051,7 @@ share/rt38/html/autohandler share/rt38/html/dhandler share/rt38/html/index.html share/rt38/html/l +@dirrm share/rt38/etc @dirrm share/rt38/plugins @dirrm share/rt38/po @dirrm share/rt38/html/Widgets/Form @@ -1183,6 +1184,7 @@ share/rt38/html/l @dirrm share/rt38/html/Admin/CustomFields @dirrm share/rt38/html/Admin @dirrm share/rt38/html +@dirrm share/rt38/lib @dirrm share/rt38 %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%SITE_PERL%%/RT/URI |