kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Get rid of PTHREAD_CFLAGS and PTHREAD_LIBS (category: sysutils)

Browse source 
Approved by:	portmgr
This commit is contained in:
Pietro Cerutti 2013-02-28 10:51:58 +00:00
parent 298de7b9f0
commit 100d65b37a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=313088
50 changed files with 75 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysutils/afflib/Makefile
View file

@ -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

2
sysutils/bacula-server/Makefile
View file

@ -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

7
sysutils/cfengine22/Makefile
View file

@ -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 cfenvgraph.8 cfetoolcheck.8 \
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

2
sysutils/dircomp/Makefile
View file

@ -24,8 +24,6 @@ LIB_DEPENDS+= YGP.0:${PORTSDIR}/devel/libYGP
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 \

7
sysutils/dvd+rw-tools/Makefile
View file

@ -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}

3
sysutils/filelight/Makefile
View file

@ -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>

4
sysutils/fusefs-funionfs/Makefile
View file

@ -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

4
sysutils/fusefs-fur/Makefile
View file

@ -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}

5
sysutils/fusefs-fusexmp_fh/Makefile
View file

@ -27,11 +27,6 @@ CONFIGURE_ARGS= --disable-kernel-module --prefix=${PREFIX} \
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}

2
sysutils/fusefs-gunzip/Makefile
View file

@ -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:

1
sysutils/fusefs-ifuse/Makefile
View file

@ -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}

9
sysutils/fusefs-libs/Makefile
View file

@ -13,7 +13,6 @@ COMMENT= FUSE allows filesystem implementation in userspace
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

2
sysutils/fusefs-smbnetfs/Makefile
View file

@ -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

4
sysutils/fusefs-sqlfs/Makefile
View file

@ -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/

1
sysutils/fusefs-sshfs/Makefile
View file

@ -17,7 +17,6 @@ COMMENT= Mount remote directories over ssh
KMODDIR?= ${LOCALBASE}/modules
GNU_CONFIGURE= yes
CFLAGS+= ${PTHREAD_CFLAGS}
USE_FUSE= yes
USE_GNOME= glib20

2
sysutils/fusefs-unionfs/Makefile
View file

@ -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

6
sysutils/gcombust/Makefile
View file

@ -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

4
sysutils/graveman/Makefile
View file

@ -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

3
sysutils/gupsc/Makefile
View file

@ -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

10
sysutils/hourglass/Makefile
View file

@ -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:

4
sysutils/hourglass/files/patch-configure
View file

@ -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*)

2
sysutils/iextract/Makefile
View file

@ -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>

8
sysutils/isomaster/Makefile
View file

@ -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,^${PREFIX}/,,}"
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

3
sysutils/kcpuload/Makefile
View file

@ -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>

2
sysutils/klineakconfig/Makefile
View file

@ -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>

3
sysutils/komparator/Makefile
View file

@ -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)

4
sysutils/lineak-defaultplugin/Makefile
View file

@ -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

4
sysutils/lineak-kdeplugins/Makefile
View file

@ -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

4
sysutils/lineak-xosdplugin/Makefile
View file

@ -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 \

6
sysutils/lineakd/Makefile
View file

@ -18,8 +18,8 @@ COMMENT= Lineakd is a daemon which enables special keys on internet keyboards
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

6
sysutils/lineakd/files/patch-lineakd__Makefile.in
View file

@ -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

3
sysutils/npadmin/Makefile
View file

@ -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

7
sysutils/openipmi/files/patch-OpenIPMIpthread.pc.in
View file

@ -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}

3
sysutils/pwg/Makefile
View file

@ -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>

3
sysutils/respond/Makefile
View file

@ -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>

1
sysutils/rsyslog5/Makefile
View file

@ -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\

1
sysutils/rsyslog6-devel/Makefile
View file

@ -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\

1
sysutils/rsyslog6/Makefile
View file

@ -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\

1
sysutils/rsyslog7/Makefile
View file

@ -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\

3
sysutils/synergy-devel/Makefile
View file

@ -18,8 +18,7 @@ COMMENT= Mouse and keyboard sharing utility
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

11
sysutils/synergy-devel/files/patch-src-cmd-usynergy_uSynergyUnix.c Normal file
View file

@ -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);

2
sysutils/synergy/Makefile
View file

@ -16,8 +16,6 @@ COMMENT= Mouse and keyboard sharing utility
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

2
sysutils/tracker-client/Makefile
View file

@ -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 \

2
sysutils/udfclient/Makefile
View file

@ -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 \

1
sysutils/uhidd/Makefile
View file

@ -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

7
sysutils/usbhotkey/Makefile
View file

@ -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

2
sysutils/xfsprogs/Makefile
View file

@ -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'

11
sysutils/xfsprogs/files/patch-io_fadvise.c Normal file
View file

@ -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;
}

3
sysutils/xorriso/Makefile
View file

@ -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>

1
sysutils/xvidcap/Makefile
View file

@ -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