svn commit: r344109 - in head/games: ggz-client-libs ggz-gtk-client ggz-gtk-games ggz-sdl-games ggz-txt-client libggz
Max Brazhnikov
makc at FreeBSD.org
Thu Feb 13 13:52:17 UTC 2014
Author: makc
Date: Thu Feb 13 13:52:14 2014
New Revision: 344109
URL: http://svnweb.freebsd.org/changeset/ports/344109
QAT: https://qat.redports.org/buildarchive/r344109/
Log:
games/libggz and games/ggz-* ports:
- Switch to USES=libtool:oldver
- Convert LIB_DEPENDS to new style
- Add stage support
- Use install-strip target
- Remove deprecated PTHREAD_FLAGS/LIBS
- Use options helpers
- Add missing NLS option to OPTIONS_DEFINE [1]
- Drop maintainership: kdegames don't need these ports anymore
Prompted by: ehaupt [1]
Modified:
head/games/ggz-client-libs/Makefile
head/games/ggz-client-libs/pkg-plist
head/games/ggz-gtk-client/Makefile
head/games/ggz-gtk-client/pkg-plist
head/games/ggz-gtk-games/Makefile
head/games/ggz-sdl-games/Makefile
head/games/ggz-txt-client/Makefile
head/games/ggz-txt-client/pkg-plist
head/games/libggz/Makefile
head/games/libggz/bsd.ggz.mk
head/games/libggz/pkg-plist
Modified: head/games/ggz-client-libs/Makefile
==============================================================================
--- head/games/ggz-client-libs/Makefile Thu Feb 13 13:50:45 2014 (r344108)
+++ head/games/ggz-client-libs/Makefile Thu Feb 13 13:52:14 2014 (r344109)
@@ -6,43 +6,31 @@ PORTVERSION= ${GGZ_VERSION}
PORTREVISION= 2
CATEGORIES= games
-MAINTAINER= kde at FreeBSD.org
+MAINTAINER= ports at FreeBSD.org
COMMENT= The GGZ Gaming Zone - Core Client Libraries
-LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2
-USE_AUTOTOOLS= libtool
+USES= libtool:oldver
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-debug --with-libggz-dir="${LOCALBASE}"
USE_LDCONFIG= yes
USE_GGZ= core
-MAN1= ggzwrap.1
-MAN3= ggzcore_h.3 ggzmod_h.3
-MAN5= ggz.modules.5
-MAN6= ggz.6 ggz-config.6 ggz-wrapper.6
-MAN7= ggz.7
-
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-
-NO_STAGE= yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+= --disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+INSTALL_TARGET= install-strip
+
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -pthread
+
+OPTIONS_DEFINE= NLS
+OPTIONS_SUB= yes
+
+NLS_USES= gettext
+NLS_CONFIGURE_ARGS= --disable-nls
post-patch:
@${REINPLACE_CMD} -e 's|libggz.la|libggz.so|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|#!/bin/bash|#!/bin/sh|' ${WRKSRC}/ggz-wrapper/ggz
-post-install:
- @${TOUCH} ${PREFIX}/etc/ggz.modules
-
.include "${.CURDIR}/../libggz/bsd.ggz.mk"
.include <bsd.port.mk>
Modified: head/games/ggz-client-libs/pkg-plist
==============================================================================
--- head/games/ggz-client-libs/pkg-plist Thu Feb 13 13:50:45 2014 (r344108)
+++ head/games/ggz-client-libs/pkg-plist Thu Feb 13 13:52:14 2014 (r344109)
@@ -14,6 +14,14 @@ lib/libggzmod.a
lib/libggzmod.la
lib/libggzmod.so
lib/libggzmod.so.5
+man/man1/ggzwrap.1.gz
+man/man3/ggzcore_h.3.gz
+man/man3/ggzmod_h.3.gz
+man/man5/ggz.modules.5.gz
+man/man6/ggz.6.gz
+man/man6/ggz-config.6.gz
+man/man6/ggz-wrapper.6.gz
+man/man7/ggz.7.gz
share/desktop-directories/ggz-games.directory
share/desktop-directories/ggz.directory
%%NLS%%share/locale/ar/LC_MESSAGES/ggzcore.mo
Modified: head/games/ggz-gtk-client/Makefile
==============================================================================
--- head/games/ggz-gtk-client/Makefile Thu Feb 13 13:50:45 2014 (r344108)
+++ head/games/ggz-gtk-client/Makefile Thu Feb 13 13:52:14 2014 (r344109)
@@ -6,31 +6,26 @@ PORTVERSION= ${GGZ_VERSION}
PORTREVISION= 6
CATEGORIES= games
-MAINTAINER= kde at FreeBSD.org
+MAINTAINER= ports at FreeBSD.org
COMMENT= The GGZ Gaming Zone - GTK+ Frontend
-USE_AUTOTOOLS= libtool
+USES= libtool:oldver
USE_GNOME= gtk20
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-debug
USE_GGZ= client
USES= pkgconfig
-MAN6= ggz-gtk.6
+INSTALL_TARGET= install-strip
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -pthread
-NO_STAGE= yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE= NLS
+OPTIONS_SUB= yes
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+= --disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+NLS_USES= gettext
+NLS_CONFIGURE_ARGS= --disable-nls
.include "${.CURDIR}/../libggz/bsd.ggz.mk"
.include <bsd.port.mk>
Modified: head/games/ggz-gtk-client/pkg-plist
==============================================================================
--- head/games/ggz-gtk-client/pkg-plist Thu Feb 13 13:50:45 2014 (r344108)
+++ head/games/ggz-gtk-client/pkg-plist Thu Feb 13 13:52:14 2014 (r344109)
@@ -5,6 +5,7 @@ lib/libggz-gtk.so.1
lib/libggz-gtk.so
lib/libggz-gtk.la
lib/libggz-gtk.a
+man/man6/ggz-gtk.6.gz
share/applications/ggz-gtk.desktop
share/ggz/ggz-gtk-client/about_bg.png
share/ggz/ggz-gtk-client/ggz_gtk_admin.svg
Modified: head/games/ggz-gtk-games/Makefile
==============================================================================
--- head/games/ggz-gtk-games/Makefile Thu Feb 13 13:50:45 2014 (r344108)
+++ head/games/ggz-gtk-games/Makefile Thu Feb 13 13:52:14 2014 (r344109)
@@ -6,7 +6,7 @@ PORTVERSION= ${GGZ_VERSION}
PORTREVISION= 6
CATEGORIES= games
-MAINTAINER= kde at FreeBSD.org
+MAINTAINER= ports at FreeBSD.org
COMMENT= The GGZ Gaming Zone - GTK+ Games
RUN_DEPENDS= ${LOCALBASE}/bin/ggz-gtk:${PORTSDIR}/games/ggz-gtk-client
@@ -17,30 +17,27 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-debug
USE_GGZ= client
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+INSTALL_TARGET= install-strip
-NO_STAGE= yes
-.include <bsd.port.options.mk>
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -pthread
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+= --disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+OPTIONS_DEFINE= NLS
+OPTIONS_SUB= yes
+
+NLS_USES= gettext
+NLS_CONFIGURE_ARGS= --disable-nls
post-install:
- ${INSTALL_DATA} ${WRKSRC}/chess/module.dsc ${PREFIX}/share/ggz/chess.dsc
- ${INSTALL_DATA} ${WRKSRC}/chinese-checkers/module.dsc ${PREFIX}/share/ggz/chinese-checkers.dsc
- ${INSTALL_DATA} ${WRKSRC}/combat/module.dsc ${PREFIX}/share/ggz/combat.dsc
- ${INSTALL_DATA} ${WRKSRC}/dots/module.dsc ${PREFIX}/share/ggz/dots.dsc
- ${INSTALL_DATA} ${WRKSRC}/ggzcards/module.dsc ${PREFIX}/share/ggz/ggzcards.dsc
- ${INSTALL_DATA} ${WRKSRC}/hastings/module.dsc ${PREFIX}/share/ggz/hastings.dsc
- ${INSTALL_DATA} ${WRKSRC}/reversi/module.dsc ${PREFIX}/share/ggz/reversi.dsc
- ${INSTALL_DATA} ${WRKSRC}/spades/module.dsc ${PREFIX}/share/ggz/spades.dsc
- ${INSTALL_DATA} ${WRKSRC}/tictactoe/module.dsc ${PREFIX}/share/ggz/tictactoe.dsc
+ ${INSTALL_DATA} ${WRKSRC}/chess/module.dsc ${STAGEDIR}/${PREFIX}/share/ggz/chess.dsc
+ ${INSTALL_DATA} ${WRKSRC}/chinese-checkers/module.dsc ${STAGEDIR}/${PREFIX}/share/ggz/chinese-checkers.dsc
+ ${INSTALL_DATA} ${WRKSRC}/combat/module.dsc ${STAGEDIR}/${PREFIX}/share/ggz/combat.dsc
+ ${INSTALL_DATA} ${WRKSRC}/dots/module.dsc ${STAGEDIR}/${PREFIX}/share/ggz/dots.dsc
+ ${INSTALL_DATA} ${WRKSRC}/ggzcards/module.dsc ${STAGEDIR}/${PREFIX}/share/ggz/ggzcards.dsc
+ ${INSTALL_DATA} ${WRKSRC}/hastings/module.dsc ${STAGEDIR}/${PREFIX}/share/ggz/hastings.dsc
+ ${INSTALL_DATA} ${WRKSRC}/reversi/module.dsc ${STAGEDIR}/${PREFIX}/share/ggz/reversi.dsc
+ ${INSTALL_DATA} ${WRKSRC}/spades/module.dsc ${STAGEDIR}/${PREFIX}/share/ggz/spades.dsc
+ ${INSTALL_DATA} ${WRKSRC}/tictactoe/module.dsc ${STAGEDIR}/${PREFIX}/share/ggz/tictactoe.dsc
.include "${.CURDIR}/../libggz/bsd.ggz.mk"
.include <bsd.port.mk>
Modified: head/games/ggz-sdl-games/Makefile
==============================================================================
--- head/games/ggz-sdl-games/Makefile Thu Feb 13 13:50:45 2014 (r344108)
+++ head/games/ggz-sdl-games/Makefile Thu Feb 13 13:52:14 2014 (r344109)
@@ -6,7 +6,7 @@ PORTVERSION= ${GGZ_VERSION}
PORTREVISION= 8
CATEGORIES= games
-MAINTAINER= kde at FreeBSD.org
+MAINTAINER= ports at FreeBSD.org
COMMENT= The GGZ Gaming Zone - SDL-based games
USE_GL= gl
@@ -15,13 +15,14 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-debug
USE_GGZ= client
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+INSTALL_TARGET= install-strip
+
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -pthread
-NO_STAGE= yes
post-install:
- ${INSTALL_DATA} ${WRKSRC}/geekgame/module.dsc ${PREFIX}/share/ggz/geekgame.dsc
- ${INSTALL_DATA} ${WRKSRC}/ttt3d/module.dsc ${PREFIX}/share/ggz/ttt3d.dsc
+ ${INSTALL_DATA} ${WRKSRC}/geekgame/module.dsc ${STAGEDIR}/${PREFIX}/share/ggz/geekgame.dsc
+ ${INSTALL_DATA} ${WRKSRC}/ttt3d/module.dsc ${STAGEDIR}/${PREFIX}/share/ggz/ttt3d.dsc
.include "${.CURDIR}/../libggz/bsd.ggz.mk"
.include <bsd.port.mk>
Modified: head/games/ggz-txt-client/Makefile
==============================================================================
--- head/games/ggz-txt-client/Makefile Thu Feb 13 13:50:45 2014 (r344108)
+++ head/games/ggz-txt-client/Makefile Thu Feb 13 13:52:14 2014 (r344109)
@@ -6,32 +6,27 @@ PORTVERSION= ${GGZ_VERSION}
PORTREVISION= 2
CATEGORIES= games
-MAINTAINER= kde at FreeBSD.org
+MAINTAINER= ports at FreeBSD.org
COMMENT= The GGZ Gaming Zone - Console (Text) Frontend
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-debug
USE_GGZ= client
-MAN6= ggz-txt.6
+INSTALL_TARGET= install-strip
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -pthread
-NO_STAGE= yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE= NLS
+OPTIONS_SUB= yes
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+= --disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+NLS_USES= gettext
+NLS_CONFIGURE_ARGS= --disable-nls
post-install:
- ${MKDIR} ${PREFIX}/share/ggz
- @${INSTALL_DATA} ${WRKSRC}/tttxt/module.dsc ${PREFIX}/share/ggz/tttxt.dsc
+ ${MKDIR} ${STAGEDIR}${PREFIX}/share/ggz
+ @${INSTALL_DATA} ${WRKSRC}/tttxt/module.dsc ${STAGEDIR}/${PREFIX}/share/ggz/tttxt.dsc
.include "${.CURDIR}/../libggz/bsd.ggz.mk"
.include <bsd.port.mk>
Modified: head/games/ggz-txt-client/pkg-plist
==============================================================================
--- head/games/ggz-txt-client/pkg-plist Thu Feb 13 13:50:45 2014 (r344108)
+++ head/games/ggz-txt-client/pkg-plist Thu Feb 13 13:52:14 2014 (r344109)
@@ -1,5 +1,6 @@
bin/ggz-txt
lib/ggz/tttxt
+man/man6/ggz-txt.6.gz
share/applications/ggz-txt.desktop
@unexec ggz-config -D --remove --modfile=%D/share/ggz/tttxt.dsc --force
share/ggz/tttxt.dsc
Modified: head/games/libggz/Makefile
==============================================================================
--- head/games/libggz/Makefile Thu Feb 13 13:50:45 2014 (r344108)
+++ head/games/libggz/Makefile Thu Feb 13 13:52:14 2014 (r344109)
@@ -6,30 +6,30 @@ PORTVERSION= ${GGZ_VERSION}
PORTREVISION= 11
CATEGORIES= games
-MAINTAINER= kde at FreeBSD.org
+MAINTAINER= ports at FreeBSD.org
COMMENT= The GGZ Gaming Zone - Base Library
-LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt
-USE_AUTOTOOLS= libtool
-USES= pathfix
+USES= libtool:oldver pathfix
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-debug
USE_LDCONFIG= yes
-MAN3= ggz.h.3
+INSTALL_TARGET= install-strip
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -pthread
-.if defined(WITH_GNUTLS)
-LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls
-CONFIGURE_ARGS+= --with-tls=GnuTLS
-.else
-USE_OPENSSL= yes
-CONFIGURE_ARGS+= --with-tls=OpenSSL
-.endif
+OPTIONS_DEFAULT= OPENSSL
+OPTIONS_SINGLE= TLS
+OPTIONS_SINGLE_TLS= GNUTLS OPENSSL
+
+GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_CONFIGURE_ARGS= --with-tls=GnuTLS
+
+OPENSSL_USE= OPENSSL=yes
+OPENSSL_CONFIGURE_ARGS= --with-tls=OpenSSL
-NO_STAGE= yes
.include "${.CURDIR}/../libggz/bsd.ggz.mk"
.include <bsd.port.mk>
Modified: head/games/libggz/bsd.ggz.mk
==============================================================================
--- head/games/libggz/bsd.ggz.mk Thu Feb 13 13:50:45 2014 (r344108)
+++ head/games/libggz/bsd.ggz.mk Thu Feb 13 13:52:14 2014 (r344109)
@@ -14,9 +14,9 @@ DIST_SUBDIR= ggz
_USE_GGZ_ALL= core client
-core_LIB_DEPENDS= ggz.5:${PORTSDIR}/games/libggz
+core_LIB_DEPENDS= libggz.so:${PORTSDIR}/games/libggz
-client_LIB_DEPENDS= ggzcore.9:${PORTSDIR}/games/ggz-client-libs
+client_LIB_DEPENDS= libggzcore.so:${PORTSDIR}/games/ggz-client-libs
.for component in ${USE_GGZ}
LIB_DEPENDS+= ${${component}_LIB_DEPENDS}
Modified: head/games/libggz/pkg-plist
==============================================================================
--- head/games/libggz/pkg-plist Thu Feb 13 13:50:45 2014 (r344108)
+++ head/games/libggz/pkg-plist Thu Feb 13 13:52:14 2014 (r344109)
@@ -5,3 +5,4 @@ lib/libggz.a
lib/libggz.la
lib/libggz.so
lib/libggz.so.5
+man/man3/ggz.h.3.gz
More information about the svn-ports-all
mailing list