diff options
| author | sobomax <sobomax@FreeBSD.org> | 2000-09-27 08:17:17 +0000 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2000-09-27 08:17:17 +0000 |
| commit | 71845d7a302f417d0e402d22e15e86ecf66b14ab (patch) | |
| tree | 10ab74a4346e6cecd3ae44459640312f8b3a1858 | |
| parent | 38b5bee231ce1ce1d42b811284fb41436fe0ad74 (diff) | |
| download | FreeBSD-ports-71845d7a302f417d0e402d22e15e86ecf66b14ab.zip FreeBSD-ports-71845d7a302f417d0e402d22e15e86ecf66b14ab.tar.gz | |
Numerous improvements:
- properly use libc_r;
- provide hack around missing thread-safe version of fpathconf(1) syscall if
OSVERSION < 41100;
- remove ugly direct call to configure script from post-extract target;
- don't add -1.2 suffix to shared libraries;
- bump PORTREVISION to make kris happy ;).
| -rw-r--r-- | devel/commoncpp/Makefile | 27 | ||||
| -rw-r--r-- | devel/commoncpp/pkg-plist | 6 |
2 files changed, 17 insertions, 16 deletions
diff --git a/devel/commoncpp/Makefile b/devel/commoncpp/Makefile index bdfbb44..af12b45 100644 --- a/devel/commoncpp/Makefile +++ b/devel/commoncpp/Makefile @@ -7,6 +7,7 @@ PORTNAME= CommonC++ PORTVERSION= 1.2.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= cplusplus @@ -14,21 +15,21 @@ MASTER_SITE_SUBDIR= cplusplus MAINTAINER= dyfet@gnu.org USE_GMAKE= yes -USE_CONFIGURE= yes USE_LIBTOOL= yes -#USE_AUTOCONF= yes INSTALLS_SHLIB= yes -#AUTOCONF= autoconf && ${PERL} -pi -e 's|-lpthread|-pthread|g ; \ -# s|l\$$ost_cv_thread_library|\$$ost_cv_thread_library|g' \ -# ${WRKSRC}/configure -# -# I had immense problems with autoconf generated on xBSD 4.0 where the -# generated configure would mangle library names. -post-extract: - cd ${WRKSRC} ; ./configure -# @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ -# 's|-release \$$\(LT_RELEASE\)||g' +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 411000 +CFLAGS+= -DUSE_FPATHCONF_HACK +.endif + +pre-patch: + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|-release \$$\(LT_RELEASE\)||g' + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|l\$$ost_cv_thread_library|\$$ost_cv_thread_library|g ; \ + s|=c_r|=pthread|g' ${WRKSRC}/configure post-install: .if !defined(NOPORTDOCS) @@ -36,4 +37,4 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/commoncpp .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/commoncpp/pkg-plist b/devel/commoncpp/pkg-plist index be172dd..107fe57 100644 --- a/devel/commoncpp/pkg-plist +++ b/devel/commoncpp/pkg-plist @@ -12,13 +12,13 @@ include/cc++/socket.h include/cc++/thread.h lib/libccio.a lib/libccio.so -lib/libccio-1.2.so.0 +lib/libccio.so.0 lib/libccstd.a lib/libccstd.so -lib/libccstd-1.2.so.0 +lib/libccstd.so.0 lib/libccxx.a lib/libccxx.so -lib/libccxx-1.2.so.0 +lib/libccxx.so.0 share/doc/commoncpp/AtomicCounter.html share/doc/commoncpp/BaseObject.html share/doc/commoncpp/Body.html |
