From 5db5c54b12f4f3c03fd166a790d17453568cd2c6 Mon Sep 17 00:00:00 2001 From: sobomax Date: Mon, 23 Oct 2000 08:14:50 +0000 Subject: Attempt to fix breakage when building on ssl-enabled systems (add -lcrypto if /usr/lib/libcrypto.a exists). Also add -lutil for glimmer which seems required to build it with Python2.0. Submitted by: bento --- devel/veepee/Makefile | 5 ++++- editors/glimmer/Makefile | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/devel/veepee/Makefile b/devel/veepee/Makefile index d521a001f2ea..75c5ca489318 100644 --- a/devel/veepee/Makefile +++ b/devel/veepee/Makefile @@ -19,9 +19,12 @@ LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ USE_XLIB= yes USE_PYTHON= yes USE_LIBTOOL= yes -CONFIGURE_ENV= LDFLAGS="-pthread" +CONFIGURE_ENV= LDFLAGS="-pthread ${PYTHON_LIBS}" CONFIGURE_ARGS= --with-gd-includes=${LOCALBASE}/include/gd \ --disable-kde +.if exists(/usr/lib/libcrypto.a) +PYTHON_LIBS+= -lcrypto +.endif pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g' \ diff --git a/editors/glimmer/Makefile b/editors/glimmer/Makefile index d0d7f8d5fca7..2b6eab24ff41 100644 --- a/editors/glimmer/Makefile +++ b/editors/glimmer/Makefile @@ -20,10 +20,14 @@ USE_GNOME= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" +PYTHON_LIBS= -lutil -lreadline -lcrypt -lpython +.if exists(/usr/lib/libcrypto.a) +PYTHON_LIBS+= -lcrypto +.endif pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ - s|-lpython|-lreadline -lcrypt -lpython|g ; \ + s|-lpython|${PYTHON_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ -- cgit