svn commit: r430516 - in head: editors/focuswriter editors/texworks/files games/frogatto/files games/tanglet graphics/atril/files graphics/gthumb multimedia/ogmrip polish/kadu textproc/stardict3

Tue Jan 3 19:58:39 UTC 2017

Author: jbeich
Date: Tue Jan  3 19:58:37 2017
New Revision: 430516
URL: https://svnweb.freebsd.org/changeset/ports/430516

Log:
  Assume "pkg-config zlib" works after 9.x reached EOL

Deleted:
  head/graphics/atril/files/
Modified:
  head/editors/focuswriter/Makefile   (contents, props changed)
  head/editors/texworks/files/patch-TeXworks.pro   (contents, props changed)
  head/games/frogatto/files/patch-Makefile   (contents, props changed)
  head/games/tanglet/Makefile   (contents, props changed)
  head/graphics/gthumb/Makefile   (contents, props changed)
  head/multimedia/ogmrip/Makefile   (contents, props changed)
  head/polish/kadu/Makefile   (contents, props changed)
  head/textproc/stardict3/Makefile   (contents, props changed)

Modified: head/editors/focuswriter/Makefile
==============================================================================

--- head/editors/focuswriter/Makefile	Tue Jan  3 19:17:45 2017	(r430515)
+++ head/editors/focuswriter/Makefile	Tue Jan  3 19:58:37 2017	(r430516)
@@ -25,8 +25,6 @@ USE_QT5=	concurrent core gui multimedia 
 		buildtools_build linguisttools_build
 INSTALLS_ICONS=	yes
 
-LIBS+=		-lz
-
 PORTDATA=	*
 PORTDOCS=	CREDITS NEWS README
 
@@ -35,8 +33,7 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e '/PKGCONFIG/s/ zlib// ; \
-		/INSTALLS/s/man //' \
+	@${REINPLACE_CMD} -e '/INSTALLS/s/man //' \
 		${WRKSRC}/focuswriter.pro
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054
 	@${REINPLACE_CMD} -e 's/std::lround/lround/g' \

Modified: head/editors/texworks/files/patch-TeXworks.pro
==============================================================================
--- head/editors/texworks/files/patch-TeXworks.pro	Tue Jan  3 19:17:45 2017	(r430515)
+++ head/editors/texworks/files/patch-TeXworks.pro	Tue Jan  3 19:58:37 2017	(r430516)
@@ -1,12 +1,11 @@
 --- TeXworks.pro.orig	2015-04-03 18:05:39 UTC
 +++ TeXworks.pro
-@@ -108,7 +108,8 @@ unix:!macx { # on Unix-ish platforms we 
+@@ -108,7 +108,7 @@ unix:!macx { # on Unix-ish platforms we 
  	CONFIG		+= link_pkgconfig
  	PKGCONFIG	+= hunspell
  	PKGCONFIG	+= poppler-qt4
 -	PKGCONFIG	+= zlib
-+	PKGCONFIG	+= synctex
-+	LIBS		+= -lz
++	PKGCONFIG	+= synctex zlib
  
  	# Enclose the path in \\\" (which later gets expanded to \", which in turn
  	# gets expanded to " in the c++ code)

Modified: head/games/frogatto/files/patch-Makefile
==============================================================================
--- head/games/frogatto/files/patch-Makefile	Tue Jan  3 19:17:45 2017	(r430515)
+++ head/games/frogatto/files/patch-Makefile	Tue Jan  3 19:58:37 2017	(r430516)
@@ -9,7 +9,7 @@
  CCACHE?=ccache
  USE_CCACHE?=$(shell which $(CCACHE) 2>&1 > /dev/null && echo yes)
  ifneq ($(USE_CCACHE),yes)
-@@ -34,14 +34,14 @@ BASE_CXXFLAGS += -O2
+@@ -34,7 +34,7 @@ BASE_CXXFLAGS += -O2
  endif
  
  # Initial compiler options, used before CXXFLAGS and CPPFLAGS.
@@ -17,16 +17,7 @@
 +BASE_CXXFLAGS += -fno-inline-functions -fthreadsafe-statics -Wnon-virtual-dtor -Werror -Wformat -Wswitch
  
  # Compiler include options, used after CXXFLAGS and CPPFLAGS.
--INC := $(shell pkg-config --cflags x11 sdl glu glew SDL_image libpng zlib)
-+INC := $(shell pkg-config --cflags x11 sdl glu glew SDL_image libpng)
- 
- # Linker library options.
- LIBS := $(shell pkg-config --libs x11 ) -lSDLmain \
--	$(shell pkg-config --libs sdl glu glew SDL_image libpng zlib) -lSDL_ttf -lSDL_mixer
-+	$(shell pkg-config --libs sdl glu glew SDL_image libpng) -lz -lSDL_ttf -lSDL_mixer
- 
- include Makefile.common
- 
+ INC := $(shell pkg-config --cflags x11 sdl glu glew SDL_image libpng zlib)
 @@ -60,7 +60,7 @@ game: $(objects)
  	$(CCACHE) $(CXX) \
  		$(BASE_CXXFLAGS) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(INC) \

Modified: head/games/tanglet/Makefile
==============================================================================
--- head/games/tanglet/Makefile	Tue Jan  3 19:17:45 2017	(r430515)
+++ head/games/tanglet/Makefile	Tue Jan  3 19:58:37 2017	(r430516)
@@ -14,17 +14,14 @@ LICENSE=	GPLv3+
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USES=		compiler:c++11-lib desktop-file-utils qmake shared-mime-info tar:bzip2
+USES=		compiler:c++11-lib desktop-file-utils pkgconfig qmake \
+		shared-mime-info tar:bzip2
 USE_QT5=	buildtools_build linguisttools_build core gui widgets
 CXXFLAGS+=	-D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
 		-D_DECLARE_C99_LDBL_MATH # XXX ports/193528
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		 '/link_pkgconfig/d ; \
-		 s|PKGCONFIG|LIBS| ; \
-		 s|zlib|-lz| ; \
-		 s|share/man|man|' ${WRKSRC}/tanglet.pro
+	@${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/tanglet.pro
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Modified: head/graphics/gthumb/Makefile
==============================================================================
--- head/graphics/gthumb/Makefile	Tue Jan  3 19:17:45 2017	(r430515)
+++ head/graphics/gthumb/Makefile	Tue Jan  3 19:58:37 2017	(r430516)
@@ -94,8 +94,6 @@ YELP_DESC=		Viewer for built-in help sys
 YELP_RUN_DEPENDS=	yelp:x11/yelp
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|-Wl,--as-needed|| ; \
-		 /^[[:blank:]]zlib/d' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-Wl,--as-needed||' ${WRKSRC}/configure
 
 .include <bsd.port.mk>

Modified: head/multimedia/ogmrip/Makefile
==============================================================================
--- head/multimedia/ogmrip/Makefile	Tue Jan  3 19:17:45 2017	(r430515)
+++ head/multimedia/ogmrip/Makefile	Tue Jan  3 19:58:37 2017	(r430516)
@@ -136,8 +136,7 @@ pre-everything::
 post-patch:
 	@${REINPLACE_CMD} -e '/local/s|^CFLAGS=|#CFLAGS=|g ; \
 		 /local/s|^CPPFLAGS=|#CPPFLAGS=|g ; \
-		 /local/s|^LDFLAGS=|#LDFLAGS=|g ; \
-		 s|libpng zlib|libpng|g' ${WRKSRC}/configure
+		 /local/s|^LDFLAGS=|#LDFLAGS=|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|^SUBDIRS|#SUBDIRS|g' ${WRKSRC}/docs/Makefile.in
 	@${REINPLACE_CMD} -e \
 		'/PROGRAM/s|MP4Box|mp4box|g' ${WRKSRC}/libogmrip/ogmrip-mp4.c

Modified: head/polish/kadu/Makefile
==============================================================================
--- head/polish/kadu/Makefile	Tue Jan  3 19:17:45 2017	(r430515)
+++ head/polish/kadu/Makefile	Tue Jan  3 19:58:37 2017	(r430516)
@@ -56,8 +56,6 @@ GG_EMOTS_DISTFILES=	${GG6_EMOTS_DISTFILE
 			${GG7_EMOTS_DISTFILE}:additions
 
 post-patch:
-	@${REINPLACE_CMD} '/zlib/ s|^|#|' \
-		${WRKSRC}/plugins/jabber_protocol/CMakeLists.txt
 	@${REINPLACE_CMD} '/kadu_add_test/ s|^|#|' \
 		${WRKSRC}/kadu-core/plugin/CMakeLists.txt
 

Modified: head/textproc/stardict3/Makefile
==============================================================================
--- head/textproc/stardict3/Makefile	Tue Jan  3 19:17:45 2017	(r430515)
+++ head/textproc/stardict3/Makefile	Tue Jan  3 19:58:37 2017	(r430516)
@@ -43,9 +43,6 @@ post-patch:
 		-e '/as_fn_error.*gnome-doc-utils/d' \
 		-e '/DEP_MODULES=/s/"$$/ gmodule-2.0"/' \
 		${WRKSRC}/dict/configure
-	@${REINPLACE_CMD} \
-		-e '/^DEP_MODULES=/s/zlib//' \
-		${WRKSRC}/lib/configure
 
 post-patch-GNOME-off:
 	${REINPLACE_CMD} -e '/^SUBDIRS/s,help,,' ${WRKSRC}/dict/Makefile.in
