diff options
| author | obache <obache> | 2010-09-25 12:24:02 +0000 |
|---|---|---|
| committer | obache <obache> | 2010-09-25 12:24:02 +0000 |
| commit | f455baf0ff40009c877fbf7daa446d37af8ec64e (patch) | |
| tree | ed1a0c1dcadc0ab540dfdaf012ab8a6f27f69790 /net | |
| parent | 593c1f1b912ce19f2ed35c970cc62214718a8a30 (diff) | |
| download | pkgsrc-f455baf0ff40009c877fbf7daa446d37af8ec64e.tar.gz | |
* remove USE_LIBTOOLS, this package not using libtool.
* remove adding PYTHON=${PYTHONBIN} to CONFIGURE_ENV, it alredy in ALL_ENV.
* remove pre-install target, because no need, broke destdir installation
* some cosmetic fixes.
Diffstat (limited to 'net')
| -rw-r--r-- | net/omniORB/Makefile | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/net/omniORB/Makefile b/net/omniORB/Makefile index 0e2742e199a..169a7d4f055 100644 --- a/net/omniORB/Makefile +++ b/net/omniORB/Makefile @@ -1,19 +1,22 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/09/01 15:52:58 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2010/09/25 12:24:02 obache Exp $ # DISTNAME= omniORB-4.1.4 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=omniorb/} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=omniorb/} MAINTAINER= ianzag@mail.ru HOMEPAGE= http://omniorb.sourceforge.net/ COMMENT= CORBA ORB PKG_DESTDIR_SUPPORT= user-destdir + MAKE_FILE= GNUmakefile + GNU_CONFIGURE= YES USE_LANGUAGES= c c++ USE_TOOLS+= gmake + PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omniCOS4.pc.in PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omniCOSDynamic4.pc.in PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omniConnectionMgmt4.pc.in @@ -21,9 +24,6 @@ PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omniDynamic4.pc.in PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omniORB4.pc.in PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omnithread3.pc.in -# Note: not sure if it is required though -USE_LIBTOOL= YES - # omniORB requires native threads support PTHREAD_OPTS= require native RCD_SCRIPTS= omninames @@ -31,10 +31,9 @@ RCD_SCRIPTS= omninames OMNIORB_ETCDIR?= ${PKG_SYSCONFDIR} OMNIORB_CONFIG= ${OMNIORB_ETCDIR}/omniORB.cfg -CONFIGURE_ENV+= PYTHON=${PYTHONBIN} -CONFIGURE_ARGS+= --with-omniORB-config=${OMNIORB_CONFIG:Q} -#CONFIGURE_ARGS+= --with-omniNames-logdir= -#CONFIGURE_ARGS+= --with-openssl +CONFIGURE_ARGS+= --with-omniORB-config=${OMNIORB_CONFIG:Q} +#CONFIGURE_ARGS+= --with-omniNames-logdir= +#CONFIGURE_ARGS+= --with-openssl PKG_OPTIONS_VAR= PKG_OPTIONS.omniORB PKG_SUPPORTED_OPTIONS= inet6 @@ -43,11 +42,8 @@ PKG_SUPPORTED_OPTIONS= inet6 CONFIGURE_ARGS+=--disable-ipv6 .endif -PY_PATCHPLIST= yes -REPLACE_PYTHON+= src/tool/omniidl/python/scripts/omniidlrun.py - -pre-install: - cd ${WRKSRC}/include && ${SETENV} ${MAKE_ENV} ${GMAKE} install +PY_PATCHPLIST= yes +REPLACE_PYTHON+= src/tool/omniidl/python/scripts/omniidlrun.py post-install: ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/omniORB/ |