Date: Thu, 28 Feb 2013 10:51:58 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313088 - in head/sysutils: afflib bacula-server cfengine22 dircomp dvd+rw-tools filelight fusefs-funionfs fusefs-fur fusefs-fusexmp_fh fusefs-gunzip fusefs-ifuse fusefs-libs fusefs-smb... Message-ID: <201302281051.r1SApxMW057951@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Thu Feb 28 10:51:58 2013 New Revision: 313088 URL: http://svnweb.freebsd.org/changeset/ports/313088 Log: - Get rid of PTHREAD_CFLAGS and PTHREAD_LIBS (category: sysutils) Approved by: portmgr Added: head/sysutils/synergy-devel/files/ head/sysutils/synergy-devel/files/patch-src-cmd-usynergy_uSynergyUnix.c (contents, props changed) head/sysutils/xfsprogs/files/patch-io_fadvise.c (contents, props changed) Modified: head/sysutils/afflib/Makefile head/sysutils/bacula-server/Makefile head/sysutils/cfengine22/Makefile head/sysutils/dircomp/Makefile head/sysutils/dvd+rw-tools/Makefile head/sysutils/filelight/Makefile head/sysutils/fusefs-funionfs/Makefile head/sysutils/fusefs-fur/Makefile head/sysutils/fusefs-fusexmp_fh/Makefile head/sysutils/fusefs-gunzip/Makefile head/sysutils/fusefs-ifuse/Makefile head/sysutils/fusefs-libs/Makefile head/sysutils/fusefs-smbnetfs/Makefile head/sysutils/fusefs-sqlfs/Makefile head/sysutils/fusefs-sshfs/Makefile head/sysutils/fusefs-unionfs/Makefile head/sysutils/gcombust/Makefile head/sysutils/graveman/Makefile head/sysutils/gupsc/Makefile head/sysutils/hourglass/Makefile head/sysutils/hourglass/files/patch-configure head/sysutils/iextract/Makefile head/sysutils/isomaster/Makefile head/sysutils/kcpuload/Makefile head/sysutils/klineakconfig/Makefile head/sysutils/komparator/Makefile head/sysutils/lineak-defaultplugin/Makefile head/sysutils/lineak-kdeplugins/Makefile head/sysutils/lineak-xosdplugin/Makefile head/sysutils/lineakd/Makefile head/sysutils/lineakd/files/patch-lineakd__Makefile.in head/sysutils/npadmin/Makefile head/sysutils/openipmi/files/patch-OpenIPMIpthread.pc.in head/sysutils/pwg/Makefile head/sysutils/respond/Makefile head/sysutils/rsyslog5/Makefile head/sysutils/rsyslog6-devel/Makefile head/sysutils/rsyslog6/Makefile head/sysutils/rsyslog7/Makefile head/sysutils/synergy-devel/Makefile head/sysutils/synergy/Makefile head/sysutils/tracker-client/Makefile head/sysutils/udfclient/Makefile head/sysutils/uhidd/Makefile head/sysutils/usbhotkey/Makefile head/sysutils/xfsprogs/Makefile head/sysutils/xorriso/Makefile head/sysutils/xvidcap/Makefile Modified: head/sysutils/afflib/Makefile ============================================================================== --- head/sysutils/afflib/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/afflib/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -30,8 +30,6 @@ USE_GNOME= gnomehack USE_AUTOTOOLS= autoconf CONFIGURE_ARGS= --enable-s3=yes --libdir=${PREFIX} CPPFLAGS+= -DFUSE_USE_VERSION=26 -LDFLAGS+= ${PTHREAD_LIBS} -CFLAGS+= ${PTHREAD_LIBS} MAKE_JOBS_SAFE= yes MAN1= affcat.1 Modified: head/sysutils/bacula-server/Makefile ============================================================================== --- head/sysutils/bacula-server/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/bacula-server/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -22,8 +22,6 @@ PLIST_SUB+= MAJOR=${PORTVERSION:R:R} GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" CPPFLAGS+= -I/usr/include/readline -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Modified: head/sysutils/cfengine22/Makefile ============================================================================== --- head/sysutils/cfengine22/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/cfengine22/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -28,8 +28,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-docs \ --docdir=${DOCSDIR} \ --htmldir=${DOCSDIR}/html -CONFIGURE_ENV+= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} \ - BERKELEY_DB_CFLAGS=-I${BDB_INCLUDE_DIR} \ +CONFIGURE_ENV+= BERKELEY_DB_CFLAGS=-I${BDB_INCLUDE_DIR} \ BERKELEY_DB_LDFLAGS=-L${BDB_LIB_DIR} \ BERKELEY_DB_LIB=-l${BDB_LIB_NAME} .if !defined(NOPORTDOCS) @@ -42,10 +41,6 @@ MAN8= cfagent.8 cfengine.8 cfenvd.8 cfe cfrun.8 cfservd.8 cfshow.8 post-patch: - @${REINPLACE_CMD} -e s,-pthread,${PTHREAD_CFLAGS},g \ - -e s,-lpthread,${PTHREAD_LIBS},g \ - -e s,lpthread,${PTHREAD_LIBS},g \ - ${WRKSRC}/configure @${REINPLACE_CMD} -e '/^docdir/s!=.*!= @docdir@!'\ ${WRKSRC}/doc/Makefile.in \ ${WRKSRC}/Makefile.in Modified: head/sysutils/dircomp/Makefile ============================================================================== --- head/sysutils/dircomp/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/dircomp/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -24,8 +24,6 @@ LIB_DEPENDS+= YGP.0:${PORTSDIR}/devel/li GNU_CONFIGURE= yes USE_GETTEXT= yes -LDFLAGS+= ${PTHREAD_LIBS} -CFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE} --disable-rpath PLIST_FILES+= bin/DirComp \ share/locale/de/LC_MESSAGES/DirComp.mo \ Modified: head/sysutils/dvd+rw-tools/Makefile ============================================================================== --- head/sysutils/dvd+rw-tools/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/dvd+rw-tools/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -29,12 +29,7 @@ PLIST_FILES= ${BIN_FILES:S|^|bin/|} PORTDOCS= index.html post-patch: - @${REINPLACE_CMD} -E \ - -e 's/-D_THREAS_SAFE/-D_THREAD_SAFE/' \ - -e 's/-D_THREAD_SAFE/-D_THREAD_SAFE ${PTHREAD_CFLAGS}/' \ - -e 's/-pthread/${PTHREAD_LIBS}/' \ - -e 's/-O2//' \ - ${WRKSRC}/Makefile.m4 + @${REINPLACE_CMD} -e 's/-O2//' ${WRKSRC}/Makefile.m4 do-install: .for i in ${BIN_FILES} Modified: head/sysutils/filelight/Makefile ============================================================================== --- head/sysutils/filelight/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/filelight/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -17,7 +17,6 @@ USE_GMAKE= yes USE_GETTEXT= yes post-patch: - @${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \ - ${WRKSRC}/${CONFIGURE_SCRIPT} + @${REINPLACE_CMD} -e 's/-O2//g' ${WRKSRC}/${CONFIGURE_SCRIPT} .include <bsd.port.mk> Modified: head/sysutils/fusefs-funionfs/Makefile ============================================================================== --- head/sysutils/fusefs-funionfs/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/fusefs-funionfs/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -14,8 +14,8 @@ PKGNAMEPREFIX= fusefs- MAINTAINER= ports@FreeBSD.org COMMENT= Union filesystem for the FUSE driver -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes USE_FUSE= yes Modified: head/sysutils/fusefs-fur/Makefile ============================================================================== --- head/sysutils/fusefs-fur/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/fusefs-fur/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -24,8 +24,8 @@ USE_FUSE= yes USE_GMAKE= yes USE_ICONV= yes USE_PKGCONFIG= build -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -DFUSE_USE_VERSION=26 +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include -DFUSE_USE_VERSION=26 PLIST_FILES= bin/${PORTNAME} Modified: head/sysutils/fusefs-fusexmp_fh/Makefile ============================================================================== --- head/sysutils/fusefs-fusexmp_fh/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/fusefs-fusexmp_fh/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -27,11 +27,6 @@ CONFIGURE_ARGS= --disable-kernel-module PLIST_FILES= bin/${PORTNAME} -post-patch: - ${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},' \ - ${WRKSRC}/lib/Makefile.in \ - ${WRKSRC}/example/Makefile.in - do-build: cd ${WRKSRC}/lib \ && ${MAKE} Modified: head/sysutils/fusefs-gunzip/Makefile ============================================================================== --- head/sysutils/fusefs-gunzip/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/fusefs-gunzip/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -24,7 +24,7 @@ do-build: (cd ${WRKSRC} && \ ${CC} ${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/fuse \ -D_FILE_OFFSET_BITS=64 \ - -o fuse.gunzip fuse.gunzip.c -L${LOCALBASE}/lib ${PTHREAD_LIBS} \ + -o fuse.gunzip fuse.gunzip.c -L${LOCALBASE}/lib \ -lulockmgr -lz -lfuse -liconv -lm) do-install: Modified: head/sysutils/fusefs-ifuse/Makefile ============================================================================== --- head/sysutils/fusefs-ifuse/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/fusefs-ifuse/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -30,7 +30,6 @@ GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_SAFE= yes CFLAGS+= -I${LOCALBASE}/include -CFLAGS+= ${PTHREAD_CFLAGS} PLIST_FILES= bin/${PORTNAME} Modified: head/sysutils/fusefs-libs/Makefile ============================================================================== --- head/sysutils/fusefs-libs/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/fusefs-libs/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -13,7 +13,6 @@ COMMENT= FUSE allows filesystem implemen GNU_CONFIGURE= yes CONFIGURE_ENV= MOUNT_FUSE_PATH=${PREFIX}/sbin -CFLAGS+= ${PTHREAD_CFLAGS} USE_LDCONFIG= yes USE_PKGCONFIG= yes USE_ICONV= yes @@ -22,14 +21,6 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ TXT_DOCS= how-fuse-works \ kernel.txt -post-patch: - ${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},' \ - -e 's,-D_FILE_OFFSET_BITS=64,-D_FILE_OFFSET_BITS=64 ${PTHREAD_CFLAGS},' \ - ${WRKSRC}/fuse.pc.in - ${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},' \ - ${WRKSRC}/lib/Makefile.in \ - ${WRKSRC}/example/Makefile.in - post-install: ${INSTALL_DATA} ${WRKSRC}/include/fuse_kernel.h ${PREFIX}/include/fuse Modified: head/sysutils/fusefs-smbnetfs/Makefile ============================================================================== --- head/sysutils/fusefs-smbnetfs/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/fusefs-smbnetfs/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_FUSE= yes GNU_CONFIGURE= yes -CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib SUB_FILES= pkg-message Modified: head/sysutils/fusefs-sqlfs/Makefile ============================================================================== --- head/sysutils/fusefs-sqlfs/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/fusefs-sqlfs/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -33,8 +33,8 @@ do-build: (cd ${WRKSRC} && ${CC} -DFUSE -DFUSE_USE_VERSION=25 \ -D_FILE_OFFSET_BITS=64 -D_REENTRANT ${CFLAGS} \ -I${LOCALBASE}/include -I. -L${LOCALBASE}/lib \ - -lfuse -lsqlite${SQLITE_VER} ${PTHREAD_CFLAGS} \ - ${PTHREAD_LIBS} sqlfs.c fuse_main.c -o sqlfs) + -lfuse -lsqlite${SQLITE_VER} sqlfs.c fuse_main.c \ + -o sqlfs) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sqlfs ${PREFIX}/bin/ Modified: head/sysutils/fusefs-sshfs/Makefile ============================================================================== --- head/sysutils/fusefs-sshfs/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/fusefs-sshfs/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -17,7 +17,6 @@ COMMENT= Mount remote directories over s KMODDIR?= ${LOCALBASE}/modules GNU_CONFIGURE= yes -CFLAGS+= ${PTHREAD_CFLAGS} USE_FUSE= yes USE_GNOME= glib20 Modified: head/sysutils/fusefs-unionfs/Makefile ============================================================================== --- head/sysutils/fusefs-unionfs/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/fusefs-unionfs/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -24,7 +24,7 @@ do-build: (cd ${WRKSRC}/src && \ ${CC} ${CFLAGS} -I${LOCALBASE}/include/fuse \ -D_FILE_OFFSET_BITS=64 -DFUSE_USE_VERSION=26 -U_POSIX_SYNCHRONIZED_IO \ - -o unionfs *.c -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lfuse -lm) + -o unionfs *.c -L${LOCALBASE}/lib -pthread -lfuse -lm) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/unionfs ${PREFIX}/bin Modified: head/sysutils/gcombust/Makefile ============================================================================== --- head/sysutils/gcombust/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/gcombust/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -29,9 +29,9 @@ CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @${PERL} -pi -e 's|==|=|g' ${WRKSRC}/po/Makefile.in.in + @${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \ + ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|==|=|g' ${WRKSRC}/po/Makefile.in.in post-configure: cd ${WRKSRC}/po && ${MAKE} update-po Modified: head/sysutils/graveman/Makefile ============================================================================== --- head/sysutils/graveman/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/graveman/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -24,8 +24,8 @@ GNU_CONFIGURE= yes USE_CDRTOOLS= yes USE_PKGCONFIG= build USE_GNOME= libglade2 intlhack gnomehack gnomeprefix -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include MAN1= graveman.1 Modified: head/sysutils/gupsc/Makefile ============================================================================== --- head/sysutils/gupsc/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/gupsc/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -23,8 +23,7 @@ CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|/usr/local|${PREFIX}|; \ + @${PERL} -pi -e 's|/usr/local|${PREFIX}|; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure \ ${WRKSRC}/src/Makefile.in Modified: head/sysutils/hourglass/Makefile ============================================================================== --- head/sysutils/hourglass/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/hourglass/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -25,17 +25,19 @@ PORTDOCS= CALIBRATION .include <bsd.port.pre.mk> .if defined(WITH_LINUXTHREADS) -PTHREAD_LIBS= -L${LOCALBASE}/lib -llthread -llgcc_r -PTHREAD_CFLAGS= -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads +THREAD_LIBS= -L${LOCALBASE}/lib -llthread -llgcc_r +THREAD_CFLAGS= -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads +.else +THREAD_LIBS= -pthread .endif post-patch: @${REINPLACE_CMD} -e 's,%LOCALBASE%,${LOCALBASE},g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's,%PTHREAD_LIBS%,${PTHREAD_LIBS},g' \ + @${REINPLACE_CMD} -e 's,%THREAD_LIBS%,${THREAD_LIBS},g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's,%PTHREAD_CFLAGS%,${PTHREAD_CFLAGS},g' \ + @${REINPLACE_CMD} -e 's,%THREAD_CFLAGS%,${THREAD_CFLAGS},g' \ ${WRKSRC}/configure post-install: Modified: head/sysutils/hourglass/files/patch-configure ============================================================================== --- head/sysutils/hourglass/files/patch-configure Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/hourglass/files/patch-configure Thu Feb 28 10:51:58 2013 (r313088) @@ -24,8 +24,8 @@ - CFLAGS='-D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads' ; + CFLAGS_sav=$CFLAGS ; + LDFLAGS_sav=$LDFLAGS ; -+ LDFLAGS="$LDFLAGS_sav %PTHREAD_LIBS%" ; -+ CFLAGS="$CFLAGS_sav %PTHREAD_CFLAGS%" ; ++ LDFLAGS="$LDFLAGS_sav %THREAD_LIBS%" ; ++ CFLAGS="$CFLAGS_sav %THREAD_CFLAGS%" ; on_unix='yes' ; on_windows='no' ;; *cygwin*) Modified: head/sysutils/iextract/Makefile ============================================================================== --- head/sysutils/iextract/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/iextract/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -20,8 +20,6 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_GETTEXT= yes USE_PKGCONFIG= yes -LDFLAGS+= ${PTHREAD_LIBS} -CFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE} --disable-rpath .include <bsd.port.mk> Modified: head/sysutils/isomaster/Makefile ============================================================================== --- head/sysutils/isomaster/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/isomaster/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -20,10 +20,10 @@ USE_GMAKE= yes MAKE_ENV= DESKTOPPATH=${DESKTOPDIR} MAKE_ARGS= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -CFLAGS+= -std=c99 ${PTHREAD_CFLAGS} ${PTHREAD_LIBS:S/"//g} \ +CFLAGS+= -std=c99 \ `pkg-config --cflags gtk+-2.0` \ -DICONPATH=\\\"${DATADIR}/icons\\\" -LDFLAGS+= ${PTHREAD_LIBS} -lcompat +LDFLAGS+= -lcompat .if !defined(WITHOUT_NLS) USE_GETTEXT= yes @@ -36,6 +36,10 @@ PLIST_SUB+= DESKTOPDIR="${DESKTOPDIR:S,^ MAN1= isomaster.1 +post-patch: + ${FIND} ${WRKSRC} -name Makefile | ${XARGS} \ + ${REINPLACE_CMD} -e 's|CC *=|CC ?=|g' + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/isomaster ${PREFIX}/bin ${MKDIR} ${DATADIR}/icons Modified: head/sysutils/kcpuload/Makefile ============================================================================== --- head/sysutils/kcpuload/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/kcpuload/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -21,7 +21,6 @@ USE_KDELIBS_VER=3 USE_AUTOTOOLS= libtool post-patch: - @${REINPLACE_CMD} -e 's|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/${CONFIGURE_SCRIPT} + @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} .include <bsd.port.mk> Modified: head/sysutils/klineakconfig/Makefile ============================================================================== --- head/sysutils/klineakconfig/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/klineakconfig/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -27,7 +27,7 @@ USE_AUTOTOOLS= libtool post-patch: @${TOUCH} ${WRKSRC}/config.h.in - @${REINPLACE_CMD} -e 's|-ldl||;s|-O2||g;s|-lpthread|${PTHREAD_LIBS}|g' \ + @${REINPLACE_CMD} -e 's|-ldl||;s|-O2||g' \ ${WRKSRC}/configure .include <bsd.port.mk> Modified: head/sysutils/komparator/Makefile ============================================================================== --- head/sysutils/komparator/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/komparator/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -23,8 +23,7 @@ INSTALLS_ICONS= yes DOCSDIR= ${PREFIX}/share/doc/HTML/en/komparator post-patch: - ${REINPLACE_CMD} -e 's,-O2,,g ; \ - s,-lpthread,${PTHREAD_LIBS},g' ${WRKSRC}/${CONFIGURE_SCRIPT} + ${REINPLACE_CMD} -e 's,-O2,,g' ${WRKSRC}/${CONFIGURE_SCRIPT} post-configure: .if defined(NOPORTDOCS) Modified: head/sysutils/lineak-defaultplugin/Makefile ============================================================================== --- head/sysutils/lineak-defaultplugin/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/lineak-defaultplugin/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -21,8 +21,8 @@ USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes USE_XORG= x11 xext xt xtst xfixes USE_GMAKE= yes -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --program-prefix='' MAN1= lineak_defaultplugin.1 Modified: head/sysutils/lineak-kdeplugins/Makefile ============================================================================== --- head/sysutils/lineak-kdeplugins/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/lineak-kdeplugins/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -23,8 +23,8 @@ EXPIRATION_DATE= 2013-07-01 USE_KDELIBS_VER=3 USE_GMAKE= yes USE_AUTOTOOLS= libtool -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --program-prefix='' MAN1= lineak_kdeplugins.1 Modified: head/sysutils/lineak-xosdplugin/Makefile ============================================================================== --- head/sysutils/lineak-xosdplugin/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/lineak-xosdplugin/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -24,8 +24,8 @@ USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes CFLAGS+= -fPIC -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= lineak_xosdplugin.1 PLIST_FILES= lib/lineakd/plugins/xosdplugin.la \ Modified: head/sysutils/lineakd/Makefile ============================================================================== --- head/sysutils/lineakd/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/lineakd/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -18,8 +18,8 @@ COMMENT= Lineakd is a daemon which enabl USE_GMAKE= yes USE_XORG= x11 xext xt USE_AUTOTOOLS= libtool -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes CONFIGURE_ARGS+=--program-prefix='' @@ -30,8 +30,6 @@ MAN1= lineakd.1 #MANCOMPRESSED= yes post-patch: - @${REINPLACE_CMD} -e 's|-lpthread||' \ - ${WRKSRC}/lineak/Makefile.in ${WRKSRC}/lineakd/Makefile.in @${REINPLACE_CMD} -e 's|-ldl||' \ ${WRKSRC}/lineak/Makefile.in ${WRKSRC}/lineakd/Makefile.in @${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure Modified: head/sysutils/lineakd/files/patch-lineakd__Makefile.in ============================================================================== --- head/sysutils/lineakd/files/patch-lineakd__Makefile.in Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/lineakd/files/patch-lineakd__Makefile.in Thu Feb 28 10:51:58 2013 (r313088) @@ -1,11 +1,11 @@ ---- lineakd/Makefile.in.orig Wed May 24 17:26:52 2006 -+++ lineakd/Makefile.in Mon Jun 5 17:07:33 2006 +--- lineakd/Makefile.in.orig 2006-05-24 17:26:52.000000000 +0200 ++++ lineakd/Makefile.in 2013-02-18 16:29:24.000000000 +0100 @@ -239,9 +239,9 @@ unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ lineakd_SOURCES = lineakd_core_functions.cpp cmdprefs.cpp main.cpp -lineakd_LDADD = -lpthread -llineak -lXext -lX11 -ldl -+lineakd_LDADD = -llineak -lXext -lX11 ++lineakd_LDADD = -lpthread -llineak -lXext -lX11 lineakd_LDFLAGS = -rdynamic -L../lineak $(all_libraries) @X_LIBS@ @X_PRE_LIBS@ -EXTRA_DIST = main.cpp eakprocs.h cmdprefs.cpp cmdprefs.h lineakkb.def lineakd.1.bz2 OLDCODE lineakd_core_functions.h lineakd_core_functions.cpp +EXTRA_DIST = main.cpp eakprocs.h cmdprefs.cpp cmdprefs.h lineakkb.def lineakd.1.gz OLDCODE lineakd_core_functions.h lineakd_core_functions.cpp Modified: head/sysutils/npadmin/Makefile ============================================================================== --- head/sysutils/npadmin/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/npadmin/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -19,9 +19,6 @@ PLIST_FILES= bin/npadmin GNU_CONFIGURE= yes -pre-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure - pre-configure: ${RM} ${WRKSRC}/getopt.h ${WRKSRC}/getopt1.c Modified: head/sysutils/openipmi/files/patch-OpenIPMIpthread.pc.in ============================================================================== --- head/sysutils/openipmi/files/patch-OpenIPMIpthread.pc.in Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/openipmi/files/patch-OpenIPMIpthread.pc.in Thu Feb 28 10:51:58 2013 (r313088) @@ -1,5 +1,5 @@ ---- OpenIPMIpthread.pc.in.orig 2012-12-18 16:15:18.000000000 +0000 -+++ OpenIPMIpthread.pc.in 2012-12-18 16:15:29.000000000 +0000 +--- OpenIPMIpthread.pc.in.orig 2005-08-17 05:56:02.000000000 +0200 ++++ OpenIPMIpthread.pc.in 2013-02-28 09:55:49.000000000 +0100 @@ -6,6 +6,6 @@ Name: OpenIPMIpthread Description: Pthread OS handler for OpenIPMI @@ -7,5 +7,4 @@ -Requires: OpenIPMI pthread +Requires: OpenIPMI Libs: -L${libdir} -lOpenIPMIutils -lOpenIPMIpthread --Cflags: -I${includedir} -+Cflags: -I${includedir} ${PTHREAD_LIBS} + Cflags: -I${includedir} Modified: head/sysutils/pwg/Makefile ============================================================================== --- head/sysutils/pwg/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/pwg/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -24,7 +24,6 @@ USE_AUTOTOOLS= libtool INSTALLS_ICONS= yes post-patch: - @${REINPLACE_CMD} -e 's|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/${CONFIGURE_SCRIPT} + @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} .include <bsd.port.mk> Modified: head/sysutils/respond/Makefile ============================================================================== --- head/sysutils/respond/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/respond/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -19,7 +19,6 @@ MANCOMPRESSED= maybe MAKE_ENV+= INSTALL_MAN="${INSTALL_MAN}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - MANEXT=${MANEXT} \ - PTHREAD_LIBS="${PTHREAD_LIBS}" + MANEXT=${MANEXT} .include <bsd.port.mk> Modified: head/sysutils/rsyslog5/Makefile ============================================================================== --- head/sysutils/rsyslog5/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/rsyslog5/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -65,7 +65,6 @@ SUB_FILES= pkg-message CONFIGURE_ARGS+=--enable-imfile --enable-mail --enable-imtemplate --enable-testbench=no post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr/local/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\ ${WRKSRC}/tools/syslogd.c @${GREP} -rl '/etc/rsyslog.conf' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} -e\ Modified: head/sysutils/rsyslog6-devel/Makefile ============================================================================== --- head/sysutils/rsyslog6-devel/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/rsyslog6-devel/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -66,7 +66,6 @@ SUB_FILES= pkg-message CONFIGURE_ARGS+= --enable-imfile --enable-mail --enable-imtemplate --enable-testbench=no post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\ ${WRKSRC}/tools/syslogd.c @${GREP} -rl '/etc/rsyslog.conf' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} -e\ Modified: head/sysutils/rsyslog6/Makefile ============================================================================== --- head/sysutils/rsyslog6/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/rsyslog6/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -67,7 +67,6 @@ SUB_FILES= pkg-message CONFIGURE_ARGS+= --enable-imfile --enable-mail --enable-imdiag --enable-impstats --enable-omstdout post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\ ${WRKSRC}/tools/syslogd.c @${GREP} -rl '/etc/rsyslog.conf' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} -e\ Modified: head/sysutils/rsyslog7/Makefile ============================================================================== --- head/sysutils/rsyslog7/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/rsyslog7/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -135,7 +135,6 @@ SUB_FILES= pkg-message CONFIGURE_ARGS+= --enable-imfile --enable-mail --enable-imdiag --enable-impstats --enable-omstdout post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\ ${WRKSRC}/tools/syslogd.c @${GREP} -rl '/etc/rsyslog.conf' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} -e\ Modified: head/sysutils/synergy-devel/Makefile ============================================================================== --- head/sysutils/synergy-devel/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/synergy-devel/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -18,8 +18,7 @@ COMMENT= Mouse and keyboard sharing util CONFLICTS= synergy-[0-9]* USE_CMAKE= yes USE_XORG= ice xtst x11 sm -MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" +USE_DOS2UNIX= yes CFLAGS+= -L${LOCALBASE}/lib -I${LOCALBASE}/include Added: head/sysutils/synergy-devel/files/patch-src-cmd-usynergy_uSynergyUnix.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/synergy-devel/files/patch-src-cmd-usynergy_uSynergyUnix.c Thu Feb 28 10:51:58 2013 (r313088) @@ -0,0 +1,11 @@ +--- src/cmd/usynergy/uSynergyUnix.c.orig 2013-02-18 12:04:59.000000000 +0100 ++++ src/cmd/usynergy/uSynergyUnix.c 2013-02-18 12:05:53.000000000 +0100 +@@ -27,7 +27,7 @@ + #include "uSynergy.h" + + // TODO: implement callbacks. +-int main(char* argv, int argc) { ++int main(int argc, char **argv) { + uSynergyContext context; + uSynergyInit(&context); + Modified: head/sysutils/synergy/Makefile ============================================================================== --- head/sysutils/synergy/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/synergy/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -16,8 +16,6 @@ COMMENT= Mouse and keyboard sharing util USE_CMAKE= yes USE_XORG= ice xtst x11 sm -MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" CFLAGS+= -L${LOCALBASE}/lib -I${LOCALBASE}/include Modified: head/sysutils/tracker-client/Makefile ============================================================================== --- head/sysutils/tracker-client/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/tracker-client/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -46,7 +46,7 @@ USE_GSTREAMER= core INSTALLS_ICONS= yes USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/tracker ${PTHREAD_LIBS} +LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/tracker CONFIGURE_ARGS= --enable-video-extractor=gstreamer \ --enable-file-monitoring=fam \ --with-session-bus-services-dir=${LOCALBASE}/share/dbus-1/services \ Modified: head/sysutils/udfclient/Makefile ============================================================================== --- head/sysutils/udfclient/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/udfclient/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -21,8 +21,6 @@ COMMENT= Tools for UDF filesystem WRKSRC= ${WRKDIR}/UDFclient.${PORTVERSION} GNU_CONFIGURE= yes -CONFIGURE_ENV+= with_pthread_cflags="${PTHREAD_CFLAGS}" \ - with_thread_libs="${PTHREAD_LIBS}" MAKE_ARGS+= INSTALL="${INSTALL_PROGRAM}" OPTIONS= FUSE "udfclientfs via FUSE" off \ Modified: head/sysutils/uhidd/Makefile ============================================================================== --- head/sysutils/uhidd/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/uhidd/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -48,7 +48,6 @@ PLIST_SUB+= PL_DEVD="@comment " post-patch: .SILENT ${FIND} ${WRKSRC}/uhidd -type f -not -name Makefile \ -exec ${REINPLACE_CMD} 's|/usr/local|${PREFIX}|g' {} + - ${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/uhidd/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/uhidd/uhidd ${PREFIX}/sbin/uhidd Modified: head/sysutils/usbhotkey/Makefile ============================================================================== --- head/sysutils/usbhotkey/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/usbhotkey/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -20,17 +20,10 @@ HAS_CONFIGURE= yes .include <bsd.port.pre.mk> -.if !defined(WITHOUT_PTHREADS) -CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include \ - -I${LOCALBASE}/include/ruby-${RUBY_VER} \ - -I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH} -LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -.else CPPFLAGS+= -I${LOCALBASE}/include \ -I${LOCALBASE}/include/ruby-${RUBY_VER} \ -I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH} LDFLAGS+= -L${LOCALBASE}/lib -.endif .if !defined(WITHOUT_GUI) LIB_DEPENDS+= Imlib.5:${PORTSDIR}/graphics/imlib Modified: head/sysutils/xfsprogs/Makefile ============================================================================== --- head/sysutils/xfsprogs/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/xfsprogs/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -48,8 +48,6 @@ pre-configure: ${RM} -f ${WRKSRC}/configure post-configure: - ${FIND} ${WRKSRC} -name "configure" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|-lpthread|${PTHREAD_LIBS}|g' ${FIND} ${WRKSRC}/include -name "builddefs" | ${XARGS} ${REINPLACE_CMD} -e \ 's|LIBRT =|LIBRT = -lrt|g' Added: head/sysutils/xfsprogs/files/patch-io_fadvise.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/xfsprogs/files/patch-io_fadvise.c Thu Feb 28 10:51:58 2013 (r313088) @@ -0,0 +1,11 @@ +--- io/fadvise.c.orig 2013-02-18 10:17:09.000000000 +0100 ++++ io/fadvise.c 2013-02-18 10:17:20.000000000 +0100 +@@ -105,7 +105,7 @@ + return command_usage(&fadvise_cmd); + } + +- if (posix_fadvise64(file->fd, offset, length, advise) < 0) { ++ if (posix_fadvise(file->fd, offset, length, advise) < 0) { + perror("fadvise"); + return 0; + } Modified: head/sysutils/xorriso/Makefile ============================================================================== --- head/sysutils/xorriso/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/xorriso/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -27,7 +27,4 @@ WANT_GNOME= yes INFO= xorrecord xorriso xorrisofs MAN1= xorrecord.1 xorriso.1 xorrisofs.1 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure - .include <bsd.port.mk> Modified: head/sysutils/xvidcap/Makefile ============================================================================== --- head/sysutils/xvidcap/Makefile Thu Feb 28 10:48:18 2013 (r313087) +++ head/sysutils/xvidcap/Makefile Thu Feb 28 10:51:58 2013 (r313088) @@ -46,7 +46,6 @@ NULLDOCS= COPYING MAN1= xvidcap.1 pre-configure: - ${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure .if defined(NOPORTDOCS) ${REINPLACE_CMD} -e 's|pkgdataDATA install-xvidcapdocDATA|pkgdataDATA|' \ ${WRKSRC}/Makefile.in
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302281051.r1SApxMW057951>