diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-02-05 02:55:27 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-02-05 02:55:27 +0800 |
| commit | 6ed14e968a8d016dec7b233b1909b4f2aa68ccc6 (patch) | |
| tree | 0d5b5c18648c9259e406f1a918e4c4d908a1d2f1 | |
| parent | 1644ee97fe87aaa656fcb1122c08c96fb4dd393a (diff) | |
| download | marcuscom-ports-6ed14e968a8d016dec7b233b1909b4f2aa68ccc6.tar marcuscom-ports-6ed14e968a8d016dec7b233b1909b4f2aa68ccc6.tar.gz marcuscom-ports-6ed14e968a8d016dec7b233b1909b4f2aa68ccc6.tar.bz2 marcuscom-ports-6ed14e968a8d016dec7b233b1909b4f2aa68ccc6.tar.lz marcuscom-ports-6ed14e968a8d016dec7b233b1909b4f2aa68ccc6.tar.xz marcuscom-ports-6ed14e968a8d016dec7b233b1909b4f2aa68ccc6.tar.zst marcuscom-ports-6ed14e968a8d016dec7b233b1909b4f2aa68ccc6.zip | |
Swith to USES=libtool, and use option helpers.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18999 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | textproc/libxml2/Makefile | 31 | ||||
| -rw-r--r-- | textproc/libxml2/pkg-plist | 1 | ||||
| -rw-r--r-- | textproc/py-libxml2/Makefile | 2 |
3 files changed, 10 insertions, 24 deletions
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index 55129c8a7..33605bab7 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -17,8 +17,7 @@ COMMENT?= XML parser library for GNOME .if !defined(REFERENCE_PORT) GNU_CONFIGURE= yes -USES= gmake iconv pathfix pkgconfig shebangfix -USE_GNOME+= ltverhack +USES= gmake iconv libtool pathfix pkgconfig shebangfix USE_LDCONFIG= yes CONFIGURE_ARGS?=--with-iconv=${ICONVBASE} \ --with-html-dir=${PREFIX}/share/doc \ @@ -27,37 +26,23 @@ CONFIGURE_ARGS?=--with-iconv=${ICONVBASE} \ --without-python SHEBANG_FILES= *.py */*.py */*/*.py +PLIST_SUB+= LIBVERSION=${PORTVERSION} + .if !defined(MASTERDIR) OPTIONS_DEFINE= SCHEMA THREADS MEM_DEBUG XMLLINT_HIST THREAD_ALLOC OPTIONS_DEFAULT=SCHEMA THREADS SCHEMA_DESC= XML schema support +SCHEMA_CONFIGURE_WITH=schemas THREADS_DESC= Threads support +THREADS_CONFIGURE_WITH=threads MEM_DEBUG_DESC= Memory debugging (DEVELOPERS ONLY!) +MEM_DEBUG_CONFIGURE_WITH=mem-debug XMLLINT_HIST_DESC= History for xmllint +XMLLINT_HIST_CONFIGURE_WITH=history THREAD_ALLOC_DESC= Per-thread memory (DEVELOPERS ONLY!) +THREAD_ALLOC_CONFIGURE_WITH=thread-alloc -.include <bsd.port.options.mk> - -.if ! ${PORT_OPTIONS:MSCHEMA} -CONFIGURE_ARGS+= --without-schemas -.endif - -.if ! ${PORT_OPTIONS:MTHREADS} -CONFIGURE_ARGS+= --without-threads -.endif - -.if ${PORT_OPTIONS:MMEM_DEBUG} -CONFIGURE_ARGS+= --with-mem-debug -.endif - -.if ${PORT_OPTIONS:MXMLLINT_HIST} -CONFIGURE_ARGS+= --with-history -.endif - -.if ${PORT_OPTIONS:MTHREAD_ALLOC} -CONFIGURE_ARGS+= --with-thread-alloc -.endif .endif # !defined(MASTERDIR) post-patch: diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist index 7bad9137a..a29dbf73f 100644 --- a/textproc/libxml2/pkg-plist +++ b/textproc/libxml2/pkg-plist @@ -52,6 +52,7 @@ lib/libxml2.a lib/libxml2.la lib/libxml2.so lib/libxml2.so.2 +lib/libxml2.so.%%LIBVERSION%% lib/xml2Conf.sh libdata/pkgconfig/libxml-2.0.pc share/aclocal/libxml.m4 diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile index e7be0bb30..91fcd74c9 100644 --- a/textproc/py-libxml2/Makefile +++ b/textproc/py-libxml2/Makefile @@ -16,7 +16,7 @@ DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist USE_GNOME+= libxml2 -USE_PYTHON= -2.7 +USE_PYTHON= 2 USE_PYDISTUTILS=yes PYDISTUTILS_EGGINFO= libxml2_python-${PORTVERSION}-py${PYTHON_VER}.egg-info |