Date: Tue, 24 Mar 2015 23:45:42 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382189 - in head: comms/aprsd comms/echolinux comms/fldigi comms/flwrap comms/gnokii comms/gnokii/files comms/gpsk31 comms/gsmlib comms/hf comms/linrad comms/qrq comms/qrq/files comms/... Message-ID: <201503242345.t2ONjgqj079444@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Tue Mar 24 23:45:41 2015 New Revision: 382189 URL: https://svnweb.freebsd.org/changeset/ports/382189 QAT: https://qat.redports.org/buildarchive/r382189/ Log: 2 ports categories: Remove $PTHREAD_LIBS Categories: net-p2p, comms Note that qrq was not properly staged, it failed stage-QA. aprsd failed check-plist; it had a plist orphan. Now it fails stage-QA with a fs violation, but it may be acceptable. Fixes added to both. approved by: PTHREAD blanket Deleted: head/net-p2p/twister/files/patch-libtorrent_m4_ax_pthread.m4 Modified: head/comms/aprsd/Makefile head/comms/aprsd/pkg-plist head/comms/echolinux/Makefile head/comms/fldigi/Makefile head/comms/flwrap/Makefile head/comms/gnokii/Makefile head/comms/gnokii/files/patch-configure head/comms/gpsk31/Makefile head/comms/gsmlib/Makefile head/comms/hf/Makefile head/comms/linrad/Makefile head/comms/qrq/Makefile head/comms/qrq/files/patch-Makefile head/comms/tlf/Makefile head/net-p2p/amule-devel/Makefile head/net-p2p/amule/Makefile head/net-p2p/gkremldk/Makefile head/net-p2p/lopster/Makefile head/net-p2p/mktorrent/Makefile head/net-p2p/mldonkey/Makefile head/net-p2p/namecoin/Makefile head/net-p2p/twister/Makefile head/net-p2p/valknut/Makefile Modified: head/comms/aprsd/Makefile ============================================================================== --- head/comms/aprsd/Makefile Tue Mar 24 23:19:59 2015 (r382188) +++ head/comms/aprsd/Makefile Tue Mar 24 23:45:41 2015 (r382189) @@ -3,6 +3,7 @@ PORTNAME= aprsd PORTVERSION= 2.2.515 +PORTREVISION= 1 CATEGORIES= comms hamradio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2.2.5-15 DISTNAME= aprsd-2.2.5-15 @@ -24,10 +25,6 @@ post-patch: @${REINPLACE_CMD} -e 's|%%LOGPATH%%|/var/log/aprsd/|' \ ${WRKSRC}/src/utils.cpp -post-configure: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \ - ${WRKSRC}/Makefile - pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/aprsd @${MKDIR} ${STAGEDIR}"/var/log/aprsd" Modified: head/comms/aprsd/pkg-plist ============================================================================== --- head/comms/aprsd/pkg-plist Tue Mar 24 23:19:59 2015 (r382188) +++ head/comms/aprsd/pkg-plist Tue Mar 24 23:45:41 2015 (r382189) @@ -12,3 +12,4 @@ etc/rc.d/aprsd %%PORTDOCS%%%%DOCSDIR%%/ports.html %%PORTDOCS%%%%DOCSDIR%%/q.html %%PORTDOCS%%%%DOCSDIR%%/qalgorithm.html +@dir /var/log/aprsd Modified: head/comms/echolinux/Makefile ============================================================================== --- head/comms/echolinux/Makefile Tue Mar 24 23:19:59 2015 (r382188) +++ head/comms/echolinux/Makefile Tue Mar 24 23:45:41 2015 (r382189) @@ -20,8 +20,8 @@ OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's|gcc|$${CC}|' -e 's|/usr/include/X11|$${LOCALBASE}/include|' \ - -e 's|-o echogui -L/usr/X11R6/lib -lX11 -lXpm -lforms -lm -lpthread|$${CFLAGS} -o echogui -L$${LOCALBASE}/lib -lX11 -lXpm -lforms -lm ${PTHREAD_LIBS}|' \ - -e 's|CARGS|CFLAGS|' -e 's|= -DNodeFont=FL_TINY_SIZE|+= ${PTHREAD_CFLAGS} -DNodeFont=FL_TINY_SIZE|' \ + -e 's|-o echogui -L/usr/X11R6/lib|$${CFLAGS} -o echogui -L$${LOCALBASE}/lib|' \ + -e 's|CARGS|CFLAGS|' -e 's|= -DNodeFont=FL_TINY_SIZE|+= -DNodeFont=FL_TINY_SIZE|' \ -e 's|/usr/local/bin/|${STAGEDIR}${PREFIX}/bin/|' \ ${WRKSRC}/echogui/Makefile @${REINPLACE_CMD} -e 's|<linux/soundcard.h>|<sys/soundcard.h>|' \ Modified: head/comms/fldigi/Makefile ============================================================================== --- head/comms/fldigi/Makefile Tue Mar 24 23:19:59 2015 (r382188) +++ head/comms/fldigi/Makefile Tue Mar 24 23:45:41 2015 (r382189) @@ -107,8 +107,7 @@ post-patch: ${WRKSRC}/Makefile.in post-configure: - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' \ - -e 's|^CPPFLAGS|#CPPFLAGS|' \ + @${REINPLACE_CMD} -e 's|^CPPFLAGS|#CPPFLAGS|' \ ${WRKSRC}/src/Makefile # force rebuild of man pages ${RM} ${WRKSRC}/doc/*.1 Modified: head/comms/flwrap/Makefile ============================================================================== --- head/comms/flwrap/Makefile Tue Mar 24 23:19:59 2015 (r382188) +++ head/comms/flwrap/Makefile Tue Mar 24 23:45:41 2015 (r382189) @@ -23,12 +23,11 @@ CONFIGURE_ENV= FLTK_CONFIG="${LOCALBASE} OPTIONS_DEFINE= DOCS post-configure: - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' \ - -e 's|^CPPFLAGS|#CPPFLAGS|' \ + @${REINPLACE_CMD} -e 's|^CPPFLAGS|#CPPFLAGS|' \ ${WRKSRC}/src/Makefile post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/comms/gnokii/Makefile ============================================================================== --- head/comms/gnokii/Makefile Tue Mar 24 23:19:59 2015 (r382188) +++ head/comms/gnokii/Makefile Tue Mar 24 23:45:41 2015 (r382189) @@ -99,8 +99,6 @@ post-patch: @${REINPLACE_CMD} -e "s:/etc/gnokiirc:${PREFIX}/etc/gnokiirc:g" \ ${WRKSRC}/${f} .endfor - @${REINPLACE_CMD} -e "s:%%PTHREAD_LIBS%%:${PTHREAD_LIBS}:; \ - s:%%PTHREAD_CFLAGS%%:${PTHREAD_CFLAGS}:" ${WRKSRC}/configure .for f in common/data/virtmodem.c utils/mgnokiidev.c @${REINPLACE_CMD} -E -e "s:^(#ifdef.*)__OpenBSD__:\1__FreeBSD__:" \ ${WRKSRC}/${f} Modified: head/comms/gnokii/files/patch-configure ============================================================================== --- head/comms/gnokii/files/patch-configure Tue Mar 24 23:19:59 2015 (r382188) +++ head/comms/gnokii/files/patch-configure Tue Mar 24 23:45:41 2015 (r382189) @@ -1,6 +1,6 @@ ---- configure.orig 2011-12-02 15:54:03.000000000 +0100 -+++ configure 2014-03-28 12:32:41.264513620 +0100 -@@ -955,7 +955,7 @@ +--- configure.orig 2011-12-02 14:54:03 UTC ++++ configure +@@ -955,7 +955,7 @@ pdfdir='${docdir}' psdir='${docdir}' libdir='${exec_prefix}/lib' localedir='${datarootdir}/locale' @@ -9,7 +9,7 @@ ac_prev= ac_dashdash= -@@ -7939,19 +7939,6 @@ +@@ -7939,19 +7939,6 @@ _ACEOF fi @@ -29,7 +29,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if building on NetBSD" >&5 $as_echo_n "checking if building on NetBSD... " >&6; } -@@ -15803,7 +15790,7 @@ +@@ -15803,7 +15790,7 @@ $as_echo "$as_me: WARNING: we do not kno $as_echo_n "checking if more special flags are required for pthreads... " >&6; } flag=no case "${host_cpu}-${host_os}" in @@ -38,16 +38,7 @@ *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5 -@@ -16399,7 +16386,7 @@ - - - if test "$enable_libical" = "yes"; then -- ICAL_LIBS="$ICAL_LIBS -lpthread -lical" -+ ICAL_LIBS="$ICAL_LIBS -pthread -lical" - OLD_CFLAGS="$CFLAGS" - OLD_LIBS="$LIBS" - LIBS="$LIBS $ICAL_LIBS" -@@ -16716,7 +16703,7 @@ +@@ -16716,7 +16703,7 @@ $as_echo "#define HAVE_BLUETOOTH 1" >>co $as_echo "#define HAVE_BLUETOOTH_BLUEZ /**/" >>confdefs.h USE_BLUETOOTH="yes" @@ -56,7 +47,7 @@ fi fi -@@ -16849,7 +16836,7 @@ +@@ -16849,7 +16836,7 @@ if ${ac_cv_lib_bluetooth_bt_aton+:} fals $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -65,7 +56,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -16880,7 +16867,7 @@ +@@ -16880,7 +16867,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bluetooth_bt_aton" >&5 $as_echo "$ac_cv_lib_bluetooth_bt_aton" >&6; } if test "x$ac_cv_lib_bluetooth_bt_aton" = xyes; then : @@ -74,7 +65,7 @@ else ac_cv_have_bt_lib=no fi -@@ -16977,7 +16964,7 @@ +@@ -16977,7 +16964,7 @@ if ${ac_cv_lib_bluetooth_bt_aton+:} fals $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -83,7 +74,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -17008,7 +16995,7 @@ +@@ -17008,7 +16995,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bluetooth_bt_aton" >&5 $as_echo "$ac_cv_lib_bluetooth_bt_aton" >&6; } if test "x$ac_cv_lib_bluetooth_bt_aton" = xyes; then : @@ -92,7 +83,7 @@ else ac_cv_have_bt_lib=no fi -@@ -17488,8 +17475,7 @@ +@@ -17488,8 +17475,7 @@ if ${ac_cv_lib_Xpm_XpmWriteFileFromXpmIm $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -102,7 +93,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -17521,7 +17507,7 @@ +@@ -17521,7 +17507,7 @@ fi $as_echo "$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&6; } if test "x$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" = xyes; then : XPM_CFLAGS="$XINCL" @@ -111,7 +102,7 @@ $as_echo "#define XPM 1" >>confdefs.h -@@ -17556,7 +17542,7 @@ +@@ -17556,7 +17542,7 @@ $as_echo "$as_me: WARNING: Disabling xgn fi fi Modified: head/comms/gpsk31/Makefile ============================================================================== --- head/comms/gpsk31/Makefile Tue Mar 24 23:19:59 2015 (r382188) +++ head/comms/gpsk31/Makefile Tue Mar 24 23:45:41 2015 (r382189) @@ -8,13 +8,10 @@ CATEGORIES= comms hamradio MASTER_SITES= http://www.qsl.net/pg4i/download/ MAINTAINER= hamradio@FreeBSD.org -COMMENT= A gtk psk31 client +COMMENT= gtk psk31 client USES= pkgconfig USE_GNOME= gtk20 GNU_CONFIGURE= yes -post-patch: - @${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure - .include <bsd.port.mk> Modified: head/comms/gsmlib/Makefile ============================================================================== --- head/comms/gsmlib/Makefile Tue Mar 24 23:19:59 2015 (r382188) +++ head/comms/gsmlib/Makefile Tue Mar 24 23:45:41 2015 (r382189) @@ -17,9 +17,8 @@ USES= gmake libtool USE_LDCONFIG= yes GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -DBROKEN_STRFTIME -DHAVE_DECL_GETOPT \ - ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include -DBROKEN_STRFTIME -DHAVE_DECL_GETOPT +LDFLAGS+= -lpthread -L${LOCALBASE}/lib INSTALL_TARGET= install-strip OPTIONS_DEFINE= NLS Modified: head/comms/hf/Makefile ============================================================================== --- head/comms/hf/Makefile Tue Mar 24 23:19:59 2015 (r382188) +++ head/comms/hf/Makefile Tue Mar 24 23:45:41 2015 (r382189) @@ -27,8 +27,6 @@ CONFLICTS= sysutils/lbl-hf-1.* OPTIONS_DEFINE= DOCS EXAMPLES post-configure: - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' \ - ${WRKSRC}/hfkernel/Makefile @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \ ${WRKSRC}/util/reffreq.c ${WRKSRC}/scripts/Makefile @@ -36,7 +34,7 @@ post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for d in ${WRKSRC}/doc/hf-examplefiles/fix.[0-1]*[0-9]* \ ${WRKSRC}/doc/hf-examplefiles/gag - @${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${EXAMPLESDIR} .endfor @${ECHO} "If examples are installed they will be found in ${EXAMPLESDIR}" >> ${WRKDIR}/pkg-message @${MKDIR} ${STAGEDIR}${DOCSDIR} @@ -49,7 +47,7 @@ post-install: ${WRKSRC}/doc/lfconv.jpg ${WRKSRC}/doc/mt63.txt \ ${WRKSRC}/doc/pactor.ps ${WRKSRC}/doc/pactor.txt \ ${WRKSRC}/doc/pactor_statediag.fig - @${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR} .endfor @${ECHO} "If docs are installed they will be found in ${DOCSDIR}" >> ${WRKDIR}/pkg-message Modified: head/comms/linrad/Makefile ============================================================================== --- head/comms/linrad/Makefile Tue Mar 24 23:19:59 2015 (r382188) +++ head/comms/linrad/Makefile Tue Mar 24 23:45:41 2015 (r382189) @@ -47,8 +47,7 @@ post-patch: # These extensions seem to be Windows only # @${CP} ${WRKSRC}/extra_w3sz.c ${WRKSRC}/users_extra.c # @${CP} ${WRKSRC}/users_tr.c ${WRKSRC}/users_hwaredriver.c - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g'\ - -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}/|' \ ${WRKSRC}/help.c Modified: head/comms/qrq/Makefile ============================================================================== --- head/comms/qrq/Makefile Tue Mar 24 23:19:59 2015 (r382188) +++ head/comms/qrq/Makefile Tue Mar 24 23:45:41 2015 (r382189) @@ -2,6 +2,7 @@ PORTNAME= qrq PORTVERSION= 0.3.1 +PORTREVISION= 1 CATEGORIES= comms hamradio MASTER_SITES= http://fkurz.net/ham/qrq/ \ ${MASTER_SITE_LOCAL} @@ -12,11 +13,8 @@ COMMENT= Morse telegraphy trainer simila LICENSE= GPLv2 -USES= gmake - -post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g' \ - -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' ${WRKSRC}/Makefile +USES= gmake shebangfix +SHEBANG_FILES= qrqscore post-install: ${INSTALL_DATA} ${WRKSRC}/qrq.png ${STAGEDIR}${DATADIR}/qrq.png Modified: head/comms/qrq/files/patch-Makefile ============================================================================== --- head/comms/qrq/files/patch-Makefile Tue Mar 24 23:19:59 2015 (r382188) +++ head/comms/qrq/files/patch-Makefile Tue Mar 24 23:45:41 2015 (r382189) @@ -1,14 +1,6 @@ ---- Makefile.orig 2013-01-06 09:14:09.000000000 -0500 -+++ Makefile 2013-12-27 23:29:30.000000000 -0500 -@@ -1,14 +1,14 @@ - # qrq Makefile -- Fabian Kurz, DJ1YFK -- http://fkurz.net/ham/qrq.html - - VERSION=0.3.1 --DESTDIR?=/usr -+DSTDIR=%%PREFIX%% - - # set to YES if you want to use Core Audio - # note that you must use Core Audio for OSX +--- Makefile.orig 2013-01-06 14:14:09 UTC ++++ Makefile +@@ -8,7 +8,7 @@ DESTDIR?=/usr USE_CA=NO # set to YES if you want to use PulseAudio instead of OSS @@ -17,17 +9,15 @@ # set to YES if you compile with MINGW32 USE_WIN32=NO -@@ -25,8 +25,7 @@ - OSX_BUNDLE=NO +@@ -26,7 +26,6 @@ ifneq ($(OSX_PLATFORM), YES) endif --CFLAGS:=$(CFLAGS) -D DESTDIR=\"$(DESTDIR)\" -D VERSION=\"$(VERSION)\" -I. + CFLAGS:=$(CFLAGS) -D DESTDIR=\"$(DESTDIR)\" -D VERSION=\"$(VERSION)\" -I. -CC=gcc -+CFLAGS:=$(CFLAGS) -D DESTDIR=\"$(DSTDIR)\" -D VERSION=\"$(VERSION)\" -I. ifeq ($(USE_CA), YES) OBJECTS=qrq.o coreaudio.o -@@ -95,44 +94,44 @@ +@@ -95,16 +94,14 @@ uninstall: else install: qrq @@ -41,62 +31,14 @@ - install -m 0644 english.qcb $(DESTDIR)/share/qrq/ - install -m 0644 qrqrc $(DESTDIR)/share/qrq/ - install -m 0644 toplist $(DESTDIR)/share/qrq/ -+ install -d -v $(DSTDIR)/share/qrq/ -+ install -d -v $(DSTDIR)/share/man/man1/ -+ install -d -v $(DSTDIR)/bin/ -+ install -s -m 0755 qrq $(DSTDIR)/bin/ -+ install -m 0755 qrqscore $(DSTDIR)/bin/ -+ install -m 0644 qrq.1 $(DSTDIR)/man/man1/ -+ install -m 0644 callbase.qcb $(DSTDIR)/share/qrq/ -+ install -m 0644 english.qcb $(DSTDIR)/share/qrq/ -+ install -m 0644 qrqrc $(DSTDIR)/share/qrq/ -+ install -m 0644 toplist $(DSTDIR)/share/qrq/ ++ mkdir -p $(DESTDIR)$(PREFIX)/share/qrq/ ++ $(BSD_INSTALL_PROGRAM) qrq $(DESTDIR)$(PREFIX)/bin/ ++ $(BSD_INSTALL_SCRIPT) qrqscore $(DESTDIR)$(PREFIX)/bin/ ++ $(BSD_INSTALL_MAN) qrq.1 $(DESTDIR)$(PREFIX)/man/man1/ ++ $(BSD_INSTALL_DATA) callbase.qcb $(DESTDIR)$(PREFIX)/share/qrq/ ++ $(BSD_INSTALL_DATA) english.qcb $(DESTDIR)$(PREFIX)/share/qrq/ ++ $(BSD_INSTALL_DATA) qrqrc $(DESTDIR)$(PREFIX)/share/qrq/ ++ $(BSD_INSTALL_DATA) toplist $(DESTDIR)$(PREFIX)/share/qrq/ uninstall: -- rm -f $(DESTDIR)/bin/qrq -- rm -f $(DESTDIR)/bin/qrqscore -- rm -f $(DESTDIR)/share/man/man1/qrq.1 -- rm -f $(DESTDIR)/share/qrq/callbase.qcb -- rm -f $(DESTDIR)/share/qrq/english.qcb -- rm -f $(DESTDIR)/share/qrq/qrqrc -- rm -f $(DESTDIR)/share/qrq/toplist -- rmdir $(DESTDIR)/share/qrq/ -+ rm -f $(DSTDIR)/bin/qrq -+ rm -f $(DSTDIR)/bin/qrqscore -+ rm -f $(DSTDIR)/man/man1/qrq.1 -+ rm -f $(DSTDIR)/share/qrq/callbase.qcb -+ rm -f $(DSTDIR)/share/qrq/english.qcb -+ rm -f $(DSTDIR)/share/qrq/qrqrc -+ rm -f $(DSTDIR)/share/qrq/toplist -+ rmdir $(DSTDIR)/share/qrq/ - - endif - - package: qrq - export CODESIGN_ALLOCATE=/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/codesign_allocate; ldid -s qrq - rm -rf qrq-pkg -- install -d -v qrq-pkg/$(DESTDIR)/share/qrq/ -- install -d -v qrq-pkg/$(DESTDIR)/share/man/man1/ -- install -d -v qrq-pkg/$(DESTDIR)/bin/ -+ install -d -v qrq-pkg/$(DSTDIR)/share/qrq/ -+ install -d -v qrq-pkg/$(DSTDIR)/share/man/man1/ -+ install -d -v qrq-pkg/$(DSTDIR)/bin/ - install -d -v qrq-pkg/DEBIAN/ -- install -s -m 0755 qrq qrq-pkg/$(DESTDIR)/bin/ -- install -m 0755 qrqscore qrq-pkg/$(DESTDIR)/bin/ -- install -m 0644 qrq.1 qrq-pkg/$(DESTDIR)/share/man/man1/ -- install -m 0644 callbase.qcb qrq-pkg/$(DESTDIR)/share/qrq/ -- install -m 0644 english.qcb qrq-pkg/$(DESTDIR)/share/qrq/ -- install -m 0644 qrqrc qrq-pkg/$(DESTDIR)/share/qrq/ -- install -m 0644 toplist qrq-pkg/$(DESTDIR)/share/qrq/ -+ install -s -m 0755 qrq qrq-pkg/$(DSTDIR)/bin/ -+ install -m 0755 qrqscore qrq-pkg/$(DSTDIR)/bin/ -+ install -m 0644 qrq.1 qrq-pkg/$(DSTDIR)/share/man/man1/ -+ install -m 0644 callbase.qcb qrq-pkg/$(DSTDIR)/share/qrq/ -+ install -m 0644 english.qcb qrq-pkg/$(DSTDIR)/share/qrq/ -+ install -m 0644 qrqrc qrq-pkg/$(DSTDIR)/share/qrq/ -+ install -m 0644 toplist qrq-pkg/$(DSTDIR)/share/qrq/ - install -m 0644 control qrq-pkg/DEBIAN/ - export COPYFILE_DISABLE=1; export COPY_EXTENDED_ATTRIBUTES_DISABLE=1; dpkg-deb -b qrq-pkg cydiastore_com.kb1ooo.qrq_v$(shell grep ^Version: control | cut -d ' ' -f 2).deb - $(SCP) cydiastore_com.kb1ooo.qrq_v$(shell grep ^Version: control | cut -d ' ' -f 2).deb $(IPHONE_HOST):/tmp Modified: head/comms/tlf/Makefile ============================================================================== --- head/comms/tlf/Makefile Tue Mar 24 23:19:59 2015 (r382188) +++ head/comms/tlf/Makefile Tue Mar 24 23:45:41 2015 (r382189) @@ -21,7 +21,7 @@ USES= libtool AUTOMAKE_ARGS= --add-missing GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib +LDFLAGS+= -lpthread -L${LOCALBASE}/lib OPTIONS_DEFINE= HAMLIB HAMLIB_DESC= Use hamlib Modified: head/net-p2p/amule-devel/Makefile ============================================================================== --- head/net-p2p/amule-devel/Makefile Tue Mar 24 23:19:59 2015 (r382188) +++ head/net-p2p/amule-devel/Makefile Tue Mar 24 23:45:41 2015 (r382189) @@ -31,8 +31,7 @@ CONFIGURE_ENV= LEX="${FLEX}" PKG_CONFIG= docdir='$${prefix}/${DOCSDIR_REL}' CPPFLAGS+= -I${LOCALBASE}/include -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib +LDFLAGS+= -lpthread -L${LOCALBASE}/lib OPTIONS_DEFINE= ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG DOCS ED2K \ FILEVIEW GEOIP MMAP MONOLITHIC NLS OPTIMIZED_CFLAGS PLASMAMULE UPNP \ @@ -126,8 +125,7 @@ WX_UNICODE= yes .endif post-patch: .SILENT - ${REINPLACE_CMD} -e '/LDFLAGS/s/-lpthread/${PTHREAD_LIBS}/' \ - -e 's/test.*-print-file-name.*`/true/' \ + ${REINPLACE_CMD} -e 's/test.*-print-file-name.*`/true/' \ -e '/if.*test/s/==/=/' \ ${WRKSRC}/configure .if ! ${PORT_OPTIONS:MDOCS} Modified: head/net-p2p/amule/Makefile ============================================================================== --- head/net-p2p/amule/Makefile Tue Mar 24 23:19:59 2015 (r382188) +++ head/net-p2p/amule/Makefile Tue Mar 24 23:45:41 2015 (r382189) @@ -30,8 +30,7 @@ CONFIGURE_ENV= LEX="${FLEX}" PKG_CONFIG= docdir='$${prefix}/${DOCSDIR_REL}' CPPFLAGS+= -I${LOCALBASE}/include -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib +LDFLAGS+= -lpthread -L${LOCALBASE}/lib OPTIONS_DEFINE= ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG DOCS ED2K \ FILEVIEW GEOIP MMAP MONOLITHIC NLS PLASMAMULE UPNP \ @@ -121,8 +120,7 @@ WX_UNICODE= yes .endif post-patch: .SILENT - ${REINPLACE_CMD} -e '/LDFLAGS/s/-lpthread/${PTHREAD_LIBS}/' \ - -e 's/test.*-print-file-name.*`/true/' \ + ${REINPLACE_CMD} -e 's/test.*-print-file-name.*`/true/' \ -e '/if.*test/s/==/=/' \ ${WRKSRC}/configure .if ! ${PORT_OPTIONS:MDOCS} Modified: head/net-p2p/gkremldk/Makefile ============================================================================== --- head/net-p2p/gkremldk/Makefile Tue Mar 24 23:19:59 2015 (r382188) +++ head/net-p2p/gkremldk/Makefile Tue Mar 24 23:45:41 2015 (r382189) @@ -25,9 +25,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER post-patch: @${REINPLACE_CMD} -E \ - -e 's|^(LFLAGS).*|\1 = ${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib|' \ - -e 's|-lpthread|${PTHREAD_LIBS}|' \ - -e 's|(-fPIC)|\1 ${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include|' \ + -e 's|^(LFLAGS).*|\1 = ${LDFLAGS} -lpthread -L${LOCALBASE}/lib|' \ + -e 's|(-fPIC)|\1 ${CFLAGS} -I${LOCALBASE}/include|' \ ${WRKSRC}/Makefile.in do-install: Modified: head/net-p2p/lopster/Makefile ============================================================================== --- head/net-p2p/lopster/Makefile Tue Mar 24 23:19:59 2015 (r382188) +++ head/net-p2p/lopster/Makefile Tue Mar 24 23:45:41 2015 (r382189) @@ -43,8 +43,6 @@ CONFIGURE_ARGS+= --without-zlib .endif post-patch: - @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \ - ${WRKSRC}/configure @${REINPLACE_CMD} -e "s/www.naplist.com/www.gotnap.com/" \ ${WRKSRC}/src/lopster.h Modified: head/net-p2p/mktorrent/Makefile ============================================================================== --- head/net-p2p/mktorrent/Makefile Tue Mar 24 23:19:59 2015 (r382188) +++ head/net-p2p/mktorrent/Makefile Tue Mar 24 23:45:41 2015 (r382189) @@ -39,9 +39,6 @@ USE_OPENSSL= yes MAKE_FLAGS+= NO_HASH_CHECK=1 .endif -post-patch: - @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/BSDmakefile - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin Modified: head/net-p2p/mldonkey/Makefile ============================================================================== --- head/net-p2p/mldonkey/Makefile Tue Mar 24 23:19:59 2015 (r382188) +++ head/net-p2p/mldonkey/Makefile Tue Mar 24 23:45:41 2015 (r382189) @@ -25,7 +25,7 @@ MAKE_JOBS_UNSAFE= yes CONFIGURE_ARGS+=${ICONV_CONFIGURE_ARG} CONFIGURE_ENV+= NEWCXX="${CXX}" \ - PTHREAD_LIBS="-pthread" + PTHREAD_LIBS="-lpthread" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Modified: head/net-p2p/namecoin/Makefile ============================================================================== --- head/net-p2p/namecoin/Makefile Tue Mar 24 23:19:59 2015 (r382188) +++ head/net-p2p/namecoin/Makefile Tue Mar 24 23:45:41 2015 (r382189) @@ -76,7 +76,6 @@ post-patch: @cd ${WRKSRC}/src && ${CP} ${FILESDIR}/makefile.unix Makefile @${REINPLACE_CMD} \ -e 's|^USE_UPNP.*$$|USE_UPNP=${QMAKE_USE_UPNP}|' \ - -e 's|-l pthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/src/Makefile .endif Modified: head/net-p2p/twister/Makefile ============================================================================== --- head/net-p2p/twister/Makefile Tue Mar 24 23:19:59 2015 (r382188) +++ head/net-p2p/twister/Makefile Tue Mar 24 23:45:41 2015 (r382189) @@ -35,8 +35,6 @@ CONFIGURE_WRKSRC=${WRKSRC}/libtorrent CONFIGURE_ARGS= --with-libiconv \ --with-boost=${LOCALBASE} \ --with-boost-system=boost_system -CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" MAKEFILE= makefile.freebsd BUILD_WRKSRC= ${WRKSRC}/src MAKE_ENV= BOOST_INCLUDE_PATH=${LOCALBASE}/include \ Modified: head/net-p2p/valknut/Makefile ============================================================================== --- head/net-p2p/valknut/Makefile Tue Mar 24 23:19:59 2015 (r382188) +++ head/net-p2p/valknut/Makefile Tue Mar 24 23:45:41 2015 (r382189) @@ -25,12 +25,11 @@ GNU_CONFIGURE= yes INSTALLS_ICONS= yes CFLAGS+= -I${QT_INCDIR} LDFLAGS+= -L${QT_LIBDIR} -QTCFGLIBS+= ${PTHREAD_LIBS} +QTCFGLIBS+= -lpthread CONFIGURE_ENV+= DCLIB_CFLAGS=-I${LOCALBASE}/include post-patch: - ${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g;\ - s|-D_XOPEN_SOURCE=500||g' \ + ${REINPLACE_CMD} -e 's|-D_XOPEN_SOURCE=500||g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503242345.t2ONjgqj079444>