diff options
| author | jbeich <jbeich@FreeBSD.org> | 2017-01-04 03:58:37 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2017-01-04 03:58:37 +0800 |
| commit | 3b60577b7e5013e3a6efcf3ad34edcf626dbba67 (patch) | |
| tree | e04a4a95d5849381e2b282b3e90796f6b4ae0139 /games | |
| parent | 47fd05d0f8b654164d53e6fe8274ad60f67dfa21 (diff) | |
| download | freebsd-ports-gnome-3b60577b7e5013e3a6efcf3ad34edcf626dbba67.tar.gz freebsd-ports-gnome-3b60577b7e5013e3a6efcf3ad34edcf626dbba67.tar.zst freebsd-ports-gnome-3b60577b7e5013e3a6efcf3ad34edcf626dbba67.zip | |
Assume "pkg-config zlib" works after 9.x reached EOL
Diffstat (limited to 'games')
| -rw-r--r-- | games/frogatto/files/patch-Makefile | 13 | ||||
| -rw-r--r-- | games/tanglet/Makefile | 9 |
2 files changed, 5 insertions, 17 deletions
diff --git a/games/frogatto/files/patch-Makefile b/games/frogatto/files/patch-Makefile index 1d6d82bb7289..50294eedbd5d 100644 --- a/games/frogatto/files/patch-Makefile +++ b/games/frogatto/files/patch-Makefile @@ -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) \ diff --git a/games/tanglet/Makefile b/games/tanglet/Makefile index d0676189df8d..0f333e609de3 100644 --- a/games/tanglet/Makefile +++ b/games/tanglet/Makefile @@ -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} |