Date: Tue, 12 Aug 2014 15:29:37 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364712 - in head: graphics/autopano-sift-c graphics/tif22pnm mail/deforaos-mailer multimedia/gavl net-p2p/transmission-cli print/libharu print/libharu/files sysutils/deltup sysutils/de... Message-ID: <53ea32e2.6076.31d04fce@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Tue Aug 12 15:29:37 2014 New Revision: 364712 URL: http://svnweb.freebsd.org/changeset/ports/364712 QAT: https://qat.redports.org/buildarchive/r364712/ Log: Fix problems with missing libs when the linker enforces explicit linking (ports that are dependencies of other ports) net-p2p/transmission-cli: add USES=libtool and remove PTHREAD_LIBS sysutils/deltup: simplify patch by using MAKE_ARGS x11-fm/rox-filer: convert to USES=shared-mime-info x11-wm/emerald: remove PTHREAD_LIBS PR: 192062 Modified: head/graphics/autopano-sift-c/Makefile head/graphics/tif22pnm/Makefile head/mail/deforaos-mailer/Makefile head/multimedia/gavl/Makefile head/net-p2p/transmission-cli/Makefile head/print/libharu/Makefile head/print/libharu/files/patch-demo_CMakeLists.txt head/sysutils/deltup/Makefile head/sysutils/deltup/files/patch-Makefile head/x11-fm/rox-filer/Makefile head/x11-fm/rox-filer/pkg-plist head/x11-toolkits/gtkglarea2/Makefile head/x11-wm/emerald/Makefile Modified: head/graphics/autopano-sift-c/Makefile ============================================================================== --- head/graphics/autopano-sift-c/Makefile Tue Aug 12 15:06:56 2014 (r364711) +++ head/graphics/autopano-sift-c/Makefile Tue Aug 12 15:29:37 2014 (r364712) @@ -27,7 +27,8 @@ PORTDOCS= * .include <bsd.port.options.mk> post-patch: - @${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e 's|share/man|man|' -e '/set(all_libs/s/$$/ m/' \ + ${WRKSRC}/CMakeLists.txt post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/graphics/tif22pnm/Makefile ============================================================================== --- head/graphics/tif22pnm/Makefile Tue Aug 12 15:06:56 2014 (r364711) +++ head/graphics/tif22pnm/Makefile Tue Aug 12 15:29:37 2014 (r364712) @@ -32,7 +32,7 @@ do-build: && ${CC} ${CFLAGS} -DNDEBUG -I${LOCALBASE}/include \ ${TIF22PNM_SRCS} -o tif22pnm -L${LOCALBASE}/lib -ltiff \ && ${CC} ${CFLAGS} -DNDEBUG `pkg-config libpng15 --cflags` \ - ${PNG2PNM_SRCS} -o png22pnm `pkg-config libpng15 --libs` + ${PNG2PNM_SRCS} -o png22pnm `pkg-config libpng15 --libs` -lm do-install: ${INSTALL_PROGRAM} ${WRKSRC}/png22pnm ${STAGEDIR}${PREFIX}/bin Modified: head/mail/deforaos-mailer/Makefile ============================================================================== --- head/mail/deforaos-mailer/Makefile Tue Aug 12 15:06:56 2014 (r364711) +++ head/mail/deforaos-mailer/Makefile Tue Aug 12 15:29:37 2014 (r364712) @@ -31,7 +31,9 @@ MAKE_ENV+= MANDIR=${STAGEDIR}${MANPREFIX MAKE_JOBS_UNSAFE= yes post-patch: - ${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \ + @${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \ ${WRKSRC}/data/pkgconfig.sh + @${REINPLACE_CMD} 's|`pkg-config --libs openssl` -lssl|-lssl -lcrypto|' \ + ${WRKSRC}/src/Makefile .include <bsd.port.mk> Modified: head/multimedia/gavl/Makefile ============================================================================== --- head/multimedia/gavl/Makefile Tue Aug 12 15:06:56 2014 (r364711) +++ head/multimedia/gavl/Makefile Tue Aug 12 15:29:37 2014 (r364712) @@ -17,7 +17,7 @@ USES= pathfix pkgconfig libtool USE_LDCONFIG= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib -lm CONFIGURE_ARGS= --with-cpuflags=none --without-doxygen INSTALL_TARGET= install-strip Modified: head/net-p2p/transmission-cli/Makefile ============================================================================== --- head/net-p2p/transmission-cli/Makefile Tue Aug 12 15:06:56 2014 (r364711) +++ head/net-p2p/transmission-cli/Makefile Tue Aug 12 15:29:37 2014 (r364712) @@ -38,19 +38,15 @@ GEN_LIB_DEPENDS=libcurl.so:${PORTSDIR}/f GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission-web # This is master port of transmission-*, so don't override USES definition -USES+= gmake pkgconfig iconv +USES+= gmake iconv libtool pkgconfig USE_OPENSSL= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lcrypto ${ICONV_LIB} +LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} CONFIGURE_ARGS=--with-zlib=/usr \ ${EXTRA_CONF_ARGS} -CONFIGURE_ENV+= OPENSSL_LIBS=${OPENSSL_LDFLAGS} -.if empty(OPENSSL_CFLAGS) -CONFIGURE_ENV+= OPENSSL_CFLAGS=-I${OPENSSLINC} -.else -CONFIGURE_ENV+= OPENSSL_CFLAGS=${OPENSSL_CFLAGS},-I${OPENSSLINC} -.endif +CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ + OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" EXTRA_CONF_ARGS?=--enable-cli \ --disable-daemon \ --without-gtk \ @@ -77,9 +73,8 @@ general-patch: ${WRKSRC}/libtransmission/utils.h .endif @${REINPLACE_CMD} -e \ - 's|_pthread_flags=".*"|_pthread_flags="${PTHREAD_LIBS}"|g ; \ - s|rt_clock_gettime=yes|rt_clock_gettime=no|g ; \ - s|" == "|" = "|g ; s|$$with_ssl.*/usr;|${OPENSSLBASE};|g' \ + 's|rt_clock_gettime=yes|rt_clock_gettime=no|g ; \ + s|" == "|" = "|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|doc \\| \\|g' \ ${WRKSRC}/Makefile.in Modified: head/print/libharu/Makefile ============================================================================== --- head/print/libharu/Makefile Tue Aug 12 15:06:56 2014 (r364711) +++ head/print/libharu/Makefile Tue Aug 12 15:29:37 2014 (r364712) @@ -33,7 +33,6 @@ CMAKE_ARGS+= -DLIBHPDF_EXAMPLES:BOOL=ON .endif post-install: - ${LN} -s ${PREFIX}/lib/libhpdf.so \ - ${STAGEDIR}${PREFIX}/lib/libhpdf.so.${SOVERSION} + ${LN} -s libhpdf.so ${STAGEDIR}${PREFIX}/lib/libhpdf.so.${SOVERSION} .include <bsd.port.mk> Modified: head/print/libharu/files/patch-demo_CMakeLists.txt ============================================================================== --- head/print/libharu/files/patch-demo_CMakeLists.txt Tue Aug 12 15:06:56 2014 (r364711) +++ head/print/libharu/files/patch-demo_CMakeLists.txt Tue Aug 12 15:29:37 2014 (r364712) @@ -1,6 +1,14 @@ --- demo/CMakeLists.txt.orig 2013-11-18 14:51:59.000000000 +0100 +++ demo/CMakeLists.txt 2013-11-18 14:52:21.000000000 +0100 -@@ -86,15 +86,15 @@ +@@ -75,6 +75,7 @@ + set_target_properties(${demo} PROPERTIES COMPILE_FLAGS ${DEMO_C_FLAGS}) + endif(DEMO_C_FLAGS) + endforeach(demo) ++ target_link_libraries(text_demo2 m) + + # the grid_sheet demo needs extra defines + add_executable(grid_sheet grid_sheet.c) +@@ -86,15 +87,15 @@ # ======================================================================= install( TARGETS ${demos_NAMES} ${demos_with_grid_NAMES} grid_sheet Modified: head/sysutils/deltup/Makefile ============================================================================== --- head/sysutils/deltup/Makefile Tue Aug 12 15:06:56 2014 (r364711) +++ head/sysutils/deltup/Makefile Tue Aug 12 15:29:37 2014 (r364712) @@ -27,6 +27,7 @@ BZIP2_103= 1.0.3 USE_OPENSSL= yes USES= gmake ALL_TARGET= deltup +MAKE_ARGS= CC="${CC}" CXX="${CXX}" PREFIX="${PREFIX}" PLIST_FILES= bin/deltup \ bin/bzip2_1.0.2 \ bin/bzip2_1.0.3 \ @@ -37,17 +38,17 @@ WRKSRC_BZIP2_103= ${WRKDIR}/bzip2-${BZIP PORTDOCS= ChangeLog README post-patch: - @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's/CC/CXX/' -e 's,gcc,$${CXX},' ${WRKSRC}/Makefile pre-build: @${REINPLACE_CMD} -e 's|-Wall -Winline -O2|-Wall -Winline -O2 ${CFLAGS}|' \ - -e 's|CC=gcc|CC?=gcc|' \ - ${WRKSRC_BZIP2_102}/Makefile + ${WRKSRC_BZIP2_102}/Makefile @${REINPLACE_CMD} -e 's|-Wall -Winline -O -g|-Wall -Winline -O2 ${CFLAGS}|' \ - -e 's|CC=gcc|CC?=gcc|' \ - ${WRKSRC_BZIP2_103}/Makefile - @cd ${WRKSRC_BZIP2_102}; ${MAKE_CMD} bzip2; \ - cd ${WRKSRC_BZIP2_103}; ${MAKE_CMD} bzip2; + ${WRKSRC_BZIP2_103}/Makefile + @(cd ${WRKSRC_BZIP2_102} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ + ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} bzip2) + @(cd ${WRKSRC_BZIP2_103} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ + ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} bzip2) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/deltup ${STAGEDIR}${PREFIX}/bin Modified: head/sysutils/deltup/files/patch-Makefile ============================================================================== --- head/sysutils/deltup/files/patch-Makefile Tue Aug 12 15:06:56 2014 (r364711) +++ head/sysutils/deltup/files/patch-Makefile Tue Aug 12 15:29:37 2014 (r364712) @@ -1,17 +1,13 @@ --- Makefile.orig 2005-05-21 04:23:34.000000000 +0400 +++ Makefile 2013-03-16 09:57:42.000000000 +0400 -@@ -1,21 +1,21 @@ - DESTDIR= --PREFIX=/usr -+PREFIX=%%PREFIX%% - BINDIR=$(PREFIX)/bin +@@ -4,13 +4,13 @@ --CC = g++ -+CC ?= g++ + CC = g++ -objfiles=bpatch.o bzip2.o file.o system.o tmpstore.o deltup.o +-libs=-lstdc++ -lz -lbz2 -lssl +objfiles=bpatch.o bzip2.o gzip.o file.o system.o tmpstore.o deltup.o - libs=-lstdc++ -lz -lbz2 -lssl ++libs=-lz -lbz2 -lcrypto #edelta: edelta.cpp deltup # gcc edelta.cpp ${CXXFLAGS} -o edelta @@ -21,9 +17,3 @@ all: deltup - depend: -- gcc -MM *.cpp > .depend -+ ${CC} -MM *.cpp > .depend - - deltup: $(objfiles) - ${CC} $(objfiles) ${CXXFLAGS} -o deltup $(libs) Modified: head/x11-fm/rox-filer/Makefile ============================================================================== --- head/x11-fm/rox-filer/Makefile Tue Aug 12 15:06:56 2014 (r364711) +++ head/x11-fm/rox-filer/Makefile Tue Aug 12 15:29:37 2014 (r364712) @@ -2,7 +2,7 @@ PORTNAME= rox-filer PORTVERSION= 2.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fm gnome MASTER_SITES= SF/rox/rox/${PORTVERSION} DISTNAME= rox-filer-${PORTVERSION} @@ -17,16 +17,14 @@ PLIST_SUB+= LOCALBASE=${LOCALBASE} USE_AUTOTOOLS= autoconf213 USE_XORG= x11 sm xaw xproto USE_GNOME= atk gconf2 glib20 gnomevfs2 gtk20 libglade2 libidl libxml2 orbit2 pango -USES= gmake pkgconfig tar:bzip2 -HAS_CONFIGURE= yes - -.include <bsd.port.pre.mk> +USES= gmake pkgconfig shared-mime-info tar:bzip2 CONFIGURE_ENV= APP_DIR=${WRKSRC}/ROX-Filer CONFIGURE_ARGS= --enable-rox --with-platform=FreeBSD CONFIGURE_WRKSRC= ${WRKSRC}/ROX-Filer/src BUILD_WRKSRC= ${CONFIGURE_WRKSRC} ALL_TARGET= +LIBS+= -lm post-configure: @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ @@ -48,4 +46,4 @@ do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages ${INSTALL_DATA} ${WRKSRC}/rox.xml ${STAGEDIR}${PREFIX}/share/mime/packages -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/x11-fm/rox-filer/pkg-plist ============================================================================== --- head/x11-fm/rox-filer/pkg-plist Tue Aug 12 15:06:56 2014 (r364711) +++ head/x11-fm/rox-filer/pkg-plist Tue Aug 12 15:29:37 2014 (r364712) @@ -207,5 +207,3 @@ share/mime/packages/rox.xml @dirrm apps/ROX-Filer/Help @dirrm apps/ROX-Filer @dirrmtry apps -@exec %%LOCALBASE%%/bin/update-mime-database %%LOCALBASE%%/share/mime -@unexec %%LOCALBASE%%/bin/update-mime-database %%LOCALBASE%%/share/mime Modified: head/x11-toolkits/gtkglarea2/Makefile ============================================================================== --- head/x11-toolkits/gtkglarea2/Makefile Tue Aug 12 15:06:56 2014 (r364711) +++ head/x11-toolkits/gtkglarea2/Makefile Tue Aug 12 15:29:37 2014 (r364712) @@ -20,5 +20,6 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-lib-GL INSTALL_TARGET= install-strip +LIBS+= -lm .include <bsd.port.mk> Modified: head/x11-wm/emerald/Makefile ============================================================================== --- head/x11-wm/emerald/Makefile Tue Aug 12 15:06:56 2014 (r364711) +++ head/x11-wm/emerald/Makefile Tue Aug 12 15:29:37 2014 (r364712) @@ -22,12 +22,13 @@ USE_LDCONFIG= yes INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LIBS+= -L${LOCALBASE}/lib # XXX - might want to change that post-patch: @${REINPLACE_CMD} 's|icons/gnome|icons/hicolor|' ${WRKSRC}/misc/Makefile.in @${REINPLACE_CMD} -e 's|#define GDK_DISABLE_DEPRECATED||g' \ -e 's|#define GTK_DISABLE_DEPRECATED||g' ${WRKSRC}/include/emerald.h + @${REINPLACE_CMD} '/^emerald_LDADD =/s/$$/ -lm/' ${WRKSRC}/src/Makefile.in .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53ea32e2.6076.31d04fce>