diff --git a/www/clearsilver/Makefile b/www/clearsilver/Makefile index c6c19764aef..00369e49df5 100644 --- a/www/clearsilver/Makefile +++ b/www/clearsilver/Makefile @@ -1,17 +1,25 @@ -# $OpenBSD: Makefile,v 1.22 2011/06/15 23:33:00 sthen Exp $ +# $OpenBSD: Makefile,v 1.23 2011/09/05 17:12:35 okan Exp $ SHARED_ONLY= Yes -COMMENT= fast, powerful, and language-neutral HTML template system +COMMENT-main= fast, powerful, and language-neutral HTML template system +COMMENT-perl= perl bindings for clearsilver +COMMENT-python= python bindings for clearsilver -DISTNAME= clearsilver-0.10.4 +V= 0.10.4 +DISTNAME= clearsilver-${V} EPOCH= 0 -REVISION= 5 +REVISION= 6 +PKGNAME-main= ${DISTNAME} +PKGNAME-perl= clearsilver-perl-${V} +PKGNAME-python= clearsilver-python-${V} + CATEGORIES= www net HOMEPAGE= http://www.clearsilver.net/ +MASTER_SITES= ${HOMEPAGE}/downloads/ -MAINTAINER= Markus Friedl +MAINTAINER= Okan Demirmen # Apache 1 PERMIT_PACKAGE_CDROM= Yes @@ -19,9 +27,17 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c pthread z +MULTI_PACKAGES= -main -perl -python +MODULES= lang/python -MASTER_SITES= ${HOMEPAGE}/downloads/ +WANTLIB-main= c pthread z +RUN_DEPENDS-main= + +WANTLIB-perl= pthread z +RUN_DEPENDS-perl= ${PKGPATH} + +WANTLIB-python= ${MODPY_WANTLIB} pthread z +RUN_DEPENDS-python= ${MODPY_RUN_DEPENDS} ${PKGPATH} USE_GMAKE= Yes @@ -29,19 +45,8 @@ CONFIGURE_STYLE=gnu CONFIGURE_ARGS= --disable-csharp \ --disable-java \ --disable-ruby \ + --with-python=${MODPY_BIN} \ LDFLAGS="-L${LOCALBASE}/lib" -USE_GROFF = Yes - -FLAVORS+= python -FLAVOR?= - -.if ${FLAVOR:L:Mpython} -MODULES= lang/python -CONFIGURE_ARGS+= --with-python=${MODPY_BIN} -WANTLIB+= ${MODPY_WANTLIB} -.else -CONFIGURE_ARGS+= --disable-python -.endif pre-configure: @perl -pi -e 's|%%WRKSRC%%|${WRKSRC}|g' ${WRKSRC}/python/setup.py diff --git a/www/clearsilver/pkg/DESCR b/www/clearsilver/pkg/DESCR-main similarity index 100% rename from www/clearsilver/pkg/DESCR rename to www/clearsilver/pkg/DESCR-main diff --git a/www/clearsilver/pkg/DESCR-perl b/www/clearsilver/pkg/DESCR-perl new file mode 100644 index 00000000000..ffe6fcab2a2 --- /dev/null +++ b/www/clearsilver/pkg/DESCR-perl @@ -0,0 +1 @@ +Perl bindings for clearsilver. diff --git a/www/clearsilver/pkg/DESCR-python b/www/clearsilver/pkg/DESCR-python new file mode 100644 index 00000000000..6391dd498dd --- /dev/null +++ b/www/clearsilver/pkg/DESCR-python @@ -0,0 +1 @@ +Python bindings for clearsilver. diff --git a/www/clearsilver/pkg/PFRAG.python b/www/clearsilver/pkg/PFRAG.python deleted file mode 100644 index 2dcfff7493f..00000000000 --- a/www/clearsilver/pkg/PFRAG.python +++ /dev/null @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.python,v 1.2 2005/10/11 03:59:24 fgsch Exp $ -lib/python${MODPY_VERSION}/site-packages/neo_cgi.so diff --git a/www/clearsilver/pkg/PLIST b/www/clearsilver/pkg/PLIST-main similarity index 89% rename from www/clearsilver/pkg/PLIST rename to www/clearsilver/pkg/PLIST-main index fc2038e953a..54f9a552029 100644 --- a/www/clearsilver/pkg/PLIST +++ b/www/clearsilver/pkg/PLIST-main @@ -1,7 +1,9 @@ -@comment $OpenBSD: PLIST,v 1.5 2008/11/18 20:00:09 okan Exp $ -bin/cs -bin/cs_static.cgi -bin/cstest +@comment $OpenBSD: PLIST-main,v 1.1 2011/09/05 17:12:35 okan Exp $ +@pkgpath www/clearsilver +@pkgpath www/clearsilver,python +@bin bin/cs +@bin bin/cs_static.cgi +@bin bin/cstest include/ClearSilver/ include/ClearSilver/ClearSilver.h include/ClearSilver/cgi/ @@ -33,12 +35,6 @@ include/ClearSilver/util/wildmat.h lib/libneo_cgi.a lib/libneo_cs.a lib/libneo_utl.a -libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/ -libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/ClearSilver.pm -libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/ -libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/ClearSilver/ -libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/ClearSilver/ClearSilver.bs -libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/ClearSilver/ClearSilver.so libexec/mod_ecs.so @man man/man3/cBroadcast.3 @man man/man3/cCreate.3 @@ -160,5 +156,3 @@ libexec/mod_ecs.so @man man/man3/skipRelease.3 @man man/man3/skipSearch.3 @man man/man3/wdb_keys.3 -@man man/man3p/ClearSilver.3p -%%python%% diff --git a/www/clearsilver/pkg/PLIST-perl b/www/clearsilver/pkg/PLIST-perl new file mode 100644 index 00000000000..2464560ad84 --- /dev/null +++ b/www/clearsilver/pkg/PLIST-perl @@ -0,0 +1,11 @@ +@comment $OpenBSD: PLIST-perl,v 1.1 2011/09/05 17:12:35 okan Exp $ +libdata/perl5/${MACHINE_ARCH}-openbsd/ +libdata/perl5/${MACHINE_ARCH}-openbsd/5.12.2/ +libdata/perl5/${MACHINE_ARCH}-openbsd/5.12.2/perllocal.pod +libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/ +libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/ClearSilver.pm +libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/ +libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/ClearSilver/ +libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/ClearSilver/ClearSilver.bs +libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/ClearSilver/ClearSilver.so +@man man/man3p/ClearSilver.3p diff --git a/www/clearsilver/pkg/PLIST-python b/www/clearsilver/pkg/PLIST-python new file mode 100644 index 00000000000..2495a779130 --- /dev/null +++ b/www/clearsilver/pkg/PLIST-python @@ -0,0 +1,4 @@ +@comment $OpenBSD: PLIST-python,v 1.1 2011/09/05 17:12:35 okan Exp $ +lib/python${MODPY_VERSION}/ +lib/python${MODPY_VERSION}/site-packages/ +lib/python${MODPY_VERSION}/site-packages/neo_cgi.so