diff --git a/www/ktdms/Makefile b/www/ktdms/Makefile index 2bd0ca4c301..1947ac0fb99 100644 --- a/www/ktdms/Makefile +++ b/www/ktdms/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2010/11/11 12:35:09 sthen Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/15 17:37:16 jasper Exp $ COMMENT= web-based document management system V= 3.5.1 DISTNAME= ktdms-${V} -REVISION= 1 +REVISION= 2 DISTFILES= ktdms-src-oss-${V}.tgz CATEGORIES= www @@ -42,10 +42,5 @@ RUN_DEPENDS= :php5-core-*:www/php5/core \ do-install: @mv ${WRKDIR}/knowledgeTree-OSS ${PREFIX}/ktdms @chown -R ${SHAREOWN}.${SHAREGRP} ${PREFIX}/ktdms - @${INSTALL_DATA} ${FILESDIR}/INSTALL ${PREFIX}/ktdms/docs - @${INSTALL_DATA} ${FILESDIR}/README.chroot \ - ${PREFIX}/ktdms/docs - @perl -pi -e "s,%%INSTDIR%%,${INSTDIR}," \ - ${PREFIX}/ktdms/docs/INSTALL .include diff --git a/www/ktdms/files/INSTALL b/www/ktdms/files/INSTALL deleted file mode 100644 index 617a79c50f7..00000000000 --- a/www/ktdms/files/INSTALL +++ /dev/null @@ -1,25 +0,0 @@ -To finish the installation of KnowledgeTree, setup a database. -In order to create the dms database issue the following command, -on your database server: - - # mysqladmin -p create dms - -Then you have to create and populate the tables by issuing the -following commands on the same database server: - - # mysql -p dms < %%INSTDIR%%/ktdms/sql/mysql/install/structure.sql - # mysql -p dms < %%INSTDIR%%/ktdms/sql/mysql/install/data.sql - - -Please adjust the %%INSTDIR%%/ktdms/config/config.ini file to your -needs. This file also cointains the default username and password -for the dms database. - -Note: A default Admin user with username admin and password admin -is set up during the database setup. -The default admin user login allows initial access to KnowledgeTree. -This initial login has no relation to the two MySQL accounts in the -%%INSTDIR%%/ktdms/config/config.ini file. - -If you are running a chroot'ed apache please read the -%%INSTDIR%%/ktdms/docs/README.chroot file. diff --git a/www/ktdms/files/README.chroot b/www/ktdms/files/README.chroot deleted file mode 100644 index 84df0e75543..00000000000 --- a/www/ktdms/files/README.chroot +++ /dev/null @@ -1,39 +0,0 @@ -# $OpenBSD: README.chroot,v 1.1.1.1 2007/12/12 13:21:43 robert Exp $ -# Author: Robet Nagy - -In order to make ktdms operate in a chroot environment, it is -necessary to copy all of the relevant tools, libraries, that -ktdms employs into /var/www. - -First, create the basic directory structure: - -$ cd /var/www -# mkdir {tmp,usr} -# chown www:www tmp (needs to be writeable for the www user) - -$ cd /var/www/usr -# mkdir -p {bin,lib,libexec,local} - -$ cd /var/www/usr/local -# mkdir -p bin - -Now, the required binaries: - -$ cd /var/www/bin -# cp -p /bin/df . - -$ cd /var/www/usr/local/bin -# cp -p /usr/local/bin/{zip,unzip,catdoc,catpps,xls2csv} . - -Next, the libraries that the binaries are linked to: - -NOTE: Wildcards will, of course, copy any old, unused libraries that are -lurking around (for example, from an upgrade): - -$ cd /var/www/usr/lib -# cp -p /usr/lib/lib{c,m}.so* . - -Now, the run-time link-editor: - -$ cd /var/www/usr/libexec -# cp -p /usr/libexec/ld.so . diff --git a/www/ktdms/pkg/MESSAGE b/www/ktdms/pkg/MESSAGE deleted file mode 100644 index d803faaa6e7..00000000000 --- a/www/ktdms/pkg/MESSAGE +++ /dev/null @@ -1,11 +0,0 @@ -KnowledgeTree DMS has been installed into ${INSTDIR} - -You should point this to the DocumentRoot of your web-server: - # ln -s ../ktdms /var/www/htdocs/ktdms -(make sure you use a relative symlink since Apache is chrooted) - -To complete the installation please read: -${INSTDIR}/docs/INSTALL - -You can ensure you have a working install by accessing: -http:///ktdms/setup/ diff --git a/www/ktdms/pkg/PLIST b/www/ktdms/pkg/PLIST index d7457a541a8..199934620d7 100644 --- a/www/ktdms/pkg/PLIST +++ b/www/ktdms/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2007/12/12 13:21:43 robert Exp $ +@comment $OpenBSD: PLIST,v 1.2 2010/11/15 17:37:16 jasper Exp $ @group daemon ktdms/ ktdms/.htaccess @@ -72,8 +72,6 @@ ktdms/docs/CHANGELOG ktdms/docs/CHANGELOG-build ktdms/docs/CHANGELOG-release ktdms/docs/COPYING -ktdms/docs/INSTALL -ktdms/docs/README.chroot ktdms/docs/README.txt ktdms/docs/VERSION-NAME.txt ktdms/docs/VERSION-OSS.txt @@ -3719,3 +3717,5 @@ ktdms/var/uploads/ @mode @group daemon ktdms/view.php +@cwd ${LOCALBASE}/share/doc/pkg-readmes +${FULLPKGNAME} diff --git a/www/ktdms/pkg/README b/www/ktdms/pkg/README new file mode 100644 index 00000000000..564832c056b --- /dev/null +++ b/www/ktdms/pkg/README @@ -0,0 +1,66 @@ +$OpenBSD: README,v 1.1 2010/11/15 17:37:16 jasper Exp $ + +Running KnowledgeTree on OpenBSD +================================ + +To finish the installation of KnowledgeTree, setup a database. +In order to create the dms database issue the following command, +on your database server: + + # mysqladmin -p create dms + +Then you have to create and populate the tables by issuing the +following commands on the same database server: + + # mysql -p dms < ${INSTDIR}/ktdms/sql/mysql/install/structure.sql + # mysql -p dms < ${INSTDIR}/ktdms/sql/mysql/install/data.sql + +Please adjust the %%INSTDIR%%/ktdms/config/config.ini file to your +needs. This file also cointains the default username and password +for the dms database. + +Note: A default Admin user with username admin and password admin +is set up during the database setup. +The default admin user login allows initial access to KnowledgeTree. +This initial login has no relation to the two MySQL accounts in the +${INSTDIR}/ktdms/config/config.ini file. + +Chroot instructions +=================== + +In order to make ktdms operate in a chroot environment, it is +necessary to copy all of the relevant tools, libraries, that +ktdms employs into /var/www. + +First, create the basic directory structure: + +$ cd /var/www +# mkdir {tmp,usr} +# chown www:www tmp (needs to be writeable for the www user) + +$ cd /var/www/usr +# mkdir -p {bin,lib,libexec,local} + +$ cd /var/www/usr/local +# mkdir -p bin + +Now, the required binaries: + +$ cd /var/www/bin +# cp -p /bin/df . + +$ cd /var/www/usr/local/bin +# cp -p /usr/local/bin/{zip,unzip,catdoc,catpps,xls2csv} . + +Next, the libraries that the binaries are linked to: + +NOTE: Wildcards will, of course, copy any old, unused libraries that are +lurking around (for example, from an upgrade): + +$ cd /var/www/usr/lib +# cp -p /usr/lib/lib{c,m}.so* . + +Now, the run-time link-editor: + +$ cd /var/www/usr/libexec +# cp -p /usr/libexec/ld.so . diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile index 97d82e48fb0..847bd36d790 100644 --- a/www/p5-Apache-Gallery/Makefile +++ b/www/p5-Apache-Gallery/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.11 2010/10/19 08:02:54 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2010/11/15 17:39:47 jasper Exp $ COMMENT= mod_perl Apache gallery handler MODULES= cpan DISTNAME= Apache-Gallery-1.0RC3 -REVISION= 0 +REVISION= 1 CATEGORIES= www USE_GROFF = Yes @@ -45,7 +45,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/htdocs/*.png ${ICONSDIR} ${INSTALL_DATA_DIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/{README,INSTALL} ${DOCSDIR} - ${SUBST_CMD} -c ${FILESDIR}/README.chroot ${DOCSDIR}/README.chroot - chown ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}/README.chroot .include diff --git a/www/p5-Apache-Gallery/pkg/PLIST b/www/p5-Apache-Gallery/pkg/PLIST index 627ea2713b2..967b2602ade 100644 --- a/www/p5-Apache-Gallery/pkg/PLIST +++ b/www/p5-Apache-Gallery/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2009/05/03 15:58:10 landry Exp $ +@comment $OpenBSD: PLIST,v 1.4 2010/11/15 17:39:47 jasper Exp $ ${P5SITE}/Apache/ ${P5SITE}/Apache/Gallery.pm @man man/man3p/Apache::Gallery.3p @@ -68,4 +68,4 @@ share/Apache-Gallery/templates/new/slideshowoff.tpl share/doc/Apache-Gallery/ share/doc/Apache-Gallery/INSTALL share/doc/Apache-Gallery/README -share/doc/Apache-Gallery/README.chroot +share/doc/pkg-readmes/${FULLPKGNAME} diff --git a/www/p5-Apache-Gallery/files/README.chroot b/www/p5-Apache-Gallery/pkg/README similarity index 84% rename from www/p5-Apache-Gallery/files/README.chroot rename to www/p5-Apache-Gallery/pkg/README index 9022048b39d..1d75032e4b6 100644 --- a/www/p5-Apache-Gallery/files/README.chroot +++ b/www/p5-Apache-Gallery/pkg/README @@ -1,4 +1,7 @@ -# $OpenBSD: README.chroot,v 1.4 2009/12/23 18:58:54 landry Exp $ +$OpenBSD: README,v 1.1 2010/11/15 17:39:47 jasper Exp $ + +Running KnowledgeTree in a chroot on OpenBSD +============================================ In order to make A::G operate in a chrooted environment, it is necessary to copy all of the relevant libraries and perl modules @@ -44,13 +47,13 @@ Next, the A::G images and templates: $ cd /var/www${LOCALBASE} # mkdir -p share libdata/perl5/site_perl/`machine`-openbsd -# cp -pR ${LOCALBASE}/share/Apache-Gallery share +# cp -pR ${TRUEPREFIX}/share/Apache-Gallery share Next, the non-base Perl stuff: $ cd /var/www${LOCALBASE}/libdata/perl5/site_perl/ # mkdir -p {,`machine`-openbsd/{,auto/}}Apache -# cp -p ${LOCALBASE}/libdata/perl5/site_perl/Apache/Gallery.pm Apache +# cp -p ${TRUEPREFIX}/libdata/perl5/site_perl/Apache/Gallery.pm Apache # cp -pR ${LOCALBASE}/libdata/perl5/site_perl/`machine`-openbsd/Apache* \ `machine`-openbsd # cp -pR ${LOCALBASE}/libdata/perl5/site_perl/`machine`-openbsd/auto/Apache \ @@ -80,12 +83,12 @@ Setting up httpd ErrorLog logs/gallery-error CustomLog logs/gallery-access combined ServerName gallery.site.tld - Alias /icons/gallery/ "${LOCALBASE}/share/Apache-Gallery/icons/" - Alias /gallery.css "${LOCALBASE}/share/Apache-Gallery/templates/new/gallery.css" + Alias /icons/gallery/ "${TRUEPREFIX}/share/Apache-Gallery/icons/" + Alias /gallery.css "${TRUEPREFIX}/share/Apache-Gallery/templates/new/gallery.css" # This is necessary. Options -Indexes PerlSetVar GalleryCacheDir '/tmp/' - PerlSetVar GalleryTemplateDir '${LOCALBASE}/share/Apache-Gallery/templates/new/' + PerlSetVar GalleryTemplateDir '${TRUEPREFIX}/share/Apache-Gallery/templates/new/' PerlSetVar GalleryInfo 'Picture Taken => DateTimeOriginal, Flash => Flash' PerlSetVar GallerySizes '640 1024' PerlSetVar GalleryThumbnailSize '100x75' @@ -93,7 +96,7 @@ Setting up httpd # Note that you will want to change this. PerlSetVar GalleryCopyrightImage '${LOCALBASE}/share/Apache-Gallery/icons/c.png' - + order allow,deny allow from all