diff options
Diffstat (limited to 'archivers')
-rw-r--r-- | archivers/p7zip/Makefile | 3 | ||||
-rw-r--r-- | archivers/paq/Makefile | 6 | ||||
-rw-r--r-- | archivers/par2cmdline-tbb/Makefile | 2 | ||||
-rw-r--r-- | archivers/pbzip2/Makefile | 3 | ||||
-rw-r--r-- | archivers/ppmd-7z/Makefile | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile index 5bc7e76bb93c..6f0f8724dff5 100644 --- a/archivers/p7zip/Makefile +++ b/archivers/p7zip/Makefile @@ -61,12 +61,11 @@ CFLAGS+= -fPIC .endif post-patch: - ${SED} -e 's!-O!${CFLAGS} ${PTHREAD_CFLAGS}!' \ + ${SED} -e 's!-O!${CFLAGS}!' \ -e 's!g\+\+!${CXX}!' \ -e 's!gcc!${CC}!' \ -e 's/-D_LARGEFILE_SOURCE//' \ -e 's/-D_FILE_OFFSET_BITS=64//' \ - -e 's/-lpthread/${PTHREAD_LIBS}/' \ ${WRKSRC}/makefile.freebsd6 > ${WRKSRC}/makefile.machine ${REINPLACE_CMD} -e 's|{DEST_SHARE_DOC}|${DOCSDIR}|' \ ${WRKSRC}/man1/* diff --git a/archivers/paq/Makefile b/archivers/paq/Makefile index c503f0c23841..7cedd86803af 100644 --- a/archivers/paq/Makefile +++ b/archivers/paq/Makefile @@ -69,7 +69,7 @@ PORTDATA= ${WDATA} ${DDATA} zpsfx .endif .if ${PORT_OPTIONS:MOPENMP} -PTHREAD_CFLAGS+= -fopenmp +OPENMP_CFLAGS+= -fopenmp USE_GCC= any .endif @@ -98,8 +98,8 @@ do-build: .endif @cd ${WRKSRC}; \ ${CXX} ${CXXFLAGS} -o wbpe wbpe.cpp; \ - ${CXX} ${CXXFLAGS} ${PTHREAD_CFLAGS} ${ZPAQFLAGS} \ - -o zpaq zpaq.cpp libzpaq.cpp divsufsort.c ${LDFLAGS} ${PTHREAD_LIBS}; \ + ${CXX} ${CXXFLAGS} ${OPENMP_CFLAGS} ${ZPAQFLAGS} \ + -o zpaq zpaq.cpp libzpaq.cpp divsufsort.c ${LDFLAGS} -pthread; \ ${CXX} ${CXXFLAGS} ${ZPAQFLAGS} \ -o zpaqd zpaqd.cpp libzpaq.cpp ${LDFLAGS}; \ ${CXX} ${CXXFLAGS} ${ZPAQFLAGS} -o zpipe zpipe.cpp libzpaq.cpp diff --git a/archivers/par2cmdline-tbb/Makefile b/archivers/par2cmdline-tbb/Makefile index a8362dee0881..dd9d7e176f74 100644 --- a/archivers/par2cmdline-tbb/Makefile +++ b/archivers/par2cmdline-tbb/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= tbb:${PORTSDIR}/devel/tbb ONLY_FOR_ARCHS= i386 amd64 ia64 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -L${LOCALBASE}/lib -pthread USE_AUTOTOOLS= aclocal automake autoconf USE_GCC= 4.2+ diff --git a/archivers/pbzip2/Makefile b/archivers/pbzip2/Makefile index dbd755188b4f..9c5050fac90a 100644 --- a/archivers/pbzip2/Makefile +++ b/archivers/pbzip2/Makefile @@ -28,8 +28,7 @@ PLIST_FILES= bin/pbzip2 bin/pbunzip2 post-patch: @${REINPLACE_CMD} \ - -e 's,-pthread -lpthread,${PTHREAD_LIBS},g; \ - s,-O2,${CXXFLAGS},; \ + -e 's,-O2,${CXXFLAGS},; \ s,^CC,#CC,; \ s,CC,CXX,' ${WRKSRC}/Makefile diff --git a/archivers/ppmd-7z/Makefile b/archivers/ppmd-7z/Makefile index b763b2c815d3..7473d7d64386 100644 --- a/archivers/ppmd-7z/Makefile +++ b/archivers/ppmd-7z/Makefile @@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/p7zip_${DISTVERSION} BUILD_WRKSRC= ${WRKSRC}/CPP/7zip/Compress/PPMD_Alone MAKEFILE= makefile PLIST_FILES= bin/${PKGBASE} -MAKE_ARGS= PROG=${PORTNAME} CXX="${CXX}" LIB="${PTHREAD_LIBS}" +MAKE_ARGS= PROG=${PORTNAME} CXX="${CXX}" LIB="-pthread" post-patch: @${REINPLACE_CMD} -e '/bool Open(LPCTSTR fileName, DWORD creationDisposition)/,/}/d'\ |