Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/hourglass/Makefile,v
retrieving revision 1.5
diff -u -u -r1.5 Makefile
--- Makefile	4 Sep 2006 08:35:44 -0000	1.5
+++ Makefile	20 Jan 2007 16:23:33 -0000
@@ -23,15 +23,25 @@
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_LINUXTHREADS)
+
 .if ${OSVERSION} >= 500035
+PTHREAD_LIBS=	-L${LOCALBASE}/lib -llthread -llgcc_r
+PTHREAD_CFLAGS=	-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
 LIB_DEPENDS+=	lthread.3:${PORTSDIR}/devel/linuxthreads
 .else
 LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
 .endif
 
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,%LOCALBASE%,${LOCALBASE},g' \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,%PTHREAD_LIBS%,${PTHREAD_LIBS},g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,%PTHREAD_CFLAGS%,${PTHREAD_CFLAGS},g' \
+		${WRKSRC}/configure
 
 post-install:
 .if !defined(NOPORTDOCS)
Index: files/patch-configure
===================================================================
RCS file: /home/pcvs/ports/sysutils/hourglass/files/patch-configure,v
retrieving revision 1.1
diff -u -u -r1.1 patch-configure
--- files/patch-configure	12 Apr 2004 15:54:55 -0000	1.1
+++ files/patch-configure	20 Jan 2007 16:23:33 -0000
@@ -24,8 +24,8 @@
 -  CFLAGS='-D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads' ;
 +  CFLAGS_sav=$CFLAGS ;
 +  LDFLAGS_sav=$LDFLAGS ;
-+  LDFLAGS="$LDFLAGS_sav -llthread -llgcc_r -L%LOCALBASE%/lib" ;
-+  CFLAGS="$CFLAGS_sav -D_THREAD_SAFE -I%LOCALBASE%/include/pthread/linuxthreads" ;
++  LDFLAGS="$LDFLAGS_sav %PTHREAD_LIBS%" ;
++  CFLAGS="$CFLAGS_sav %PTHREAD_CFLAGS%" ;
    on_unix='yes' ;
    on_windows='no' ;;
  *cygwin*)