diff options
Diffstat (limited to 'x11/kdebase2/Makefile')
| -rw-r--r-- | x11/kdebase2/Makefile | 39 |
1 files changed, 5 insertions, 34 deletions
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index 8ce6abfc9403..c6cff7b719dc 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -24,30 +24,7 @@ USE_XPM= yes USE_BZIP2= yes USE_NEWGCC= yes INSTALLS_SHLIB= yes -USE_AUTOCONF= yes - -.include <bsd.port.pre.mk> - -# Hack to make pthread support work correctly. -.if exists(${X11BASE}/lib/libqt2-mt.so) -.if exists(${X11BASE}/lib/libXThrStub.so) -QTNAME= qt2-mt -.if ${OSVERSION} >= 500016 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -lc_r -.else -PTHREAD_CFLAGS= -D_THREAD_SAFE -PTHREAD_LIBS= -pthread -.endif -.else -QTNAME= qt2 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -.endif -.endif - -CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} -LDFLAGS+= ${PTHREAD_LIBS} +GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-qt-dir=${X11BASE} \ @@ -56,10 +33,9 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --without-ldap \ --disable-closure -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \ - MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" \ - LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" +CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" \ + CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \ + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" USE_GMAKE= yes pre-configure: @@ -68,9 +44,4 @@ pre-configure: ${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in ${PERL} -pi -e "s@TIME_WITH_SYS_TIME@INVALID_FOO@g" ${WRKSRC}/kioslave/ldap/kldap.h -post-configure: - @${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig - ${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \ - > ${WRKSRC}/libtool - -.include <bsd.port.post.mk> +.include <bsd.port.mk> |