svn commit: r331383 - in head: archivers/libzip audio/mp3unicode audio/msilbc databases/kbibtex deskutils/kchmviewer-kde4 deskutils/plasma-applet-qstardict devel/geany devel/geany-plugin-addons dev...

Max Brazhnikov makc at FreeBSD.org
Wed Oct 23 13:08:55 UTC 2013 

Author: makc
Date: Wed Oct 23 13:08:41 2013
New Revision: 331383
URL: http://svnweb.freebsd.org/changeset/ports/331383

Log:
  - Support staging
  - Use new LIB_DEPENDS syntax
  - Use options helpers
  - Convert to USES
  - Minor changes/fixes

Added:
  head/games/glaxium/files/patch-Makefile.in   (contents, props changed)
Deleted:
  head/archivers/libzip/Makefile.man
Modified:
  head/archivers/libzip/Makefile
  head/archivers/libzip/pkg-plist   (contents, props changed)
  head/audio/mp3unicode/Makefile
  head/audio/msilbc/Makefile
  head/databases/kbibtex/Makefile
  head/databases/kbibtex/pkg-plist
  head/deskutils/kchmviewer-kde4/Makefile
  head/deskutils/plasma-applet-qstardict/Makefile
  head/devel/geany-plugin-addons/Makefile
  head/devel/geany-plugin-codenav/Makefile
  head/devel/geany-plugin-commander/Makefile
  head/devel/geany-plugin-devhelp/Makefile
  head/devel/geany-plugin-doc/Makefile
  head/devel/geany-plugin-extrasel/Makefile
  head/devel/geany-plugin-gendoc/Makefile
  head/devel/geany-plugin-geniuspaste/Makefile
  head/devel/geany-plugin-gproject/Makefile
  head/devel/geany-plugin-insertnum/Makefile
  head/devel/geany-plugin-latex/Makefile
  head/devel/geany-plugin-lipsum/Makefile
  head/devel/geany-plugin-lua/Makefile
  head/devel/geany-plugin-macro/Makefile
  head/devel/geany-plugin-miniscript/Makefile
  head/devel/geany-plugin-multiterm/Makefile
  head/devel/geany-plugin-numberedbookmarks/Makefile
  head/devel/geany-plugin-pg/Makefile
  head/devel/geany-plugin-pretty-printer/Makefile
  head/devel/geany-plugin-prj/Makefile
  head/devel/geany-plugin-scope/Makefile
  head/devel/geany-plugin-sendmail/Makefile
  head/devel/geany-plugin-shiftcolumn/Makefile
  head/devel/geany-plugin-spellcheck/Makefile
  head/devel/geany-plugin-tableconvert/Makefile
  head/devel/geany-plugin-treebrowser/Makefile
  head/devel/geany-plugin-updatechecker/Makefile
  head/devel/geany-plugin-vc/Makefile
  head/devel/geany-plugin-webhelper/Makefile
  head/devel/geany-plugin-xmlsnippets/Makefile
  head/devel/geany-plugins-l10n/Makefile
  head/devel/geany-plugins/Makefile
  head/devel/geany-plugins/files/Makefile.common
  head/devel/geany/Makefile
  head/devel/geany/pkg-plist
  head/devel/qsvn/Makefile
  head/editors/kile-kde4/Makefile
  head/editors/kile-kde4/pkg-plist
  head/emulators/aqemu/Makefile
  head/emulators/aqemu/pkg-plist   (contents, props changed)
  head/ftp/plasma-applet-ftpmonitor/Makefile
  head/games/darkplaces/Makefile
  head/games/glaxium/Makefile
  head/games/glaxium/pkg-plist   (contents, props changed)
  head/games/golly/Makefile
  head/games/hex-a-hop/Makefile
  head/games/hexxagon/Makefile
  head/games/kmancala/Makefile
  head/games/supertux-devel/Makefile
  head/games/supertux/Makefile
  head/games/trigger/Makefile
  head/games/trophy/Makefile
  head/games/trophy/pkg-plist   (contents, props changed)
  head/games/warmux/Makefile
  head/games/warmux/pkg-plist   (contents, props changed)
  head/graphics/povray-meta/Makefile
  head/graphics/xaos/Makefile
  head/graphics/xaos/pkg-plist   (contents, props changed)
  head/irc/konversation-kde4/Makefile
  head/irc/kvirc-qt4/Makefile   (contents, props changed)
  head/irc/kvirc/Makefile
  head/irc/kvirc/pkg-plist
  head/irc/quassel/Makefile
  head/math/liborigin/Makefile
  head/math/qtiplot-doc/Makefile   (contents, props changed)
  head/math/qtoctave/Makefile
  head/math/scilab-toolbox-sivp/Makefile
  head/math/scilab-toolbox-swt/Makefile
  head/math/speedcrunch/Makefile
  head/misc/kde-thumbnailer-chm/Makefile
  head/net-im/psimedia/Makefile
  head/net-p2p/ktorrent/Makefile
  head/net-p2p/libktorrent/Makefile
  head/net/knemo-kde4/Makefile
  head/print/hplip/Makefile
  head/print/texvc/Makefile
  head/science/kst2/Makefile
  head/science/kst2/pkg-plist
  head/science/pyteomics.biolccc/Makefile
  head/science/pyteomics/Makefile
  head/security/pinentry-curses/Makefile
  head/security/pinentry-gtk/Makefile
  head/security/pinentry-gtk2/Makefile
  head/security/pinentry-qt4/Makefile
  head/security/pinentry/Makefile
  head/sysutils/krename-kde4/Makefile
  head/sysutils/plasma-applet-apcups/Makefile
  head/textproc/ctpl/Makefile
  head/textproc/ctpl/pkg-plist
  head/textproc/stardict-rptts/Makefile
  head/www/rekonq/Makefile
  head/x11-fonts/fontmatrix/Makefile
  head/x11-themes/gtk-qt4-engine/Makefile
  head/x11-themes/kde4-style-polyester/Makefile
  head/x11-themes/linux-f10-qtcurve-gtk2/Makefile   (contents, props changed)
  head/x11-themes/qtcurve-kde4/Makefile
  head/x11-themes/qtcurve-qt4/Makefile
  head/x11/gtkchtheme/Makefile   (contents, props changed)

Modified: head/archivers/libzip/Makefile
==============================================================================
--- head/archivers/libzip/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/archivers/libzip/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -9,7 +9,6 @@ MASTER_SITES=	http://www.nih.at/libzip/
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	C library for reading, creating, and modifying ZIP archives
 
-NO_STAGE=	yes
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
 MAKE_ENV=	LC_ALL="C"
@@ -17,5 +16,4 @@ USE_AUTOTOOLS=	libtool
 USES=		pathfix
 USE_LDCONFIG=	yes
 
-.include <${.CURDIR}/Makefile.man>
 .include <bsd.port.mk>

Modified: head/archivers/libzip/pkg-plist
==============================================================================
--- head/archivers/libzip/pkg-plist	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/archivers/libzip/pkg-plist	Wed Oct 23 13:08:41 2013	(r331383)
@@ -8,3 +8,68 @@ lib/libzip.la
 lib/libzip.so
 lib/libzip.so.3
 libdata/pkgconfig/libzip.pc
+man/man1/zipcmp.1.gz
+man/man1/zipmerge.1.gz
+man/man1/ziptorrent.1.gz
+man/man3/libzip.3.gz
+man/man3/zip_add.3.gz
+man/man3/zip_add_dir.3.gz
+man/man3/zip_close.3.gz
+man/man3/zip_delete.3.gz
+man/man3/zip_dir_add.3.gz
+man/man3/zip_discard.3.gz
+man/man3/zip_error_clear.3.gz
+man/man3/zip_error_get.3.gz
+man/man3/zip_error_get_sys_type.3.gz
+man/man3/zip_error_to_str.3.gz
+man/man3/zip_errors.3.gz
+man/man3/zip_fclose.3.gz
+man/man3/zip_fdopen.3.gz
+man/man3/zip_file_add.3.gz
+man/man3/zip_file_error_clear.3.gz
+man/man3/zip_file_error_get.3.gz
+man/man3/zip_file_extra_field_delete.3.gz
+man/man3/zip_file_extra_field_delete_by_id.3.gz
+man/man3/zip_file_extra_field_get.3.gz
+man/man3/zip_file_extra_field_get_by_id.3.gz
+man/man3/zip_file_extra_field_set.3.gz
+man/man3/zip_file_extra_fields_count.3.gz
+man/man3/zip_file_extra_fields_count_by_id.3.gz
+man/man3/zip_file_get_comment.3.gz
+man/man3/zip_file_rename.3.gz
+man/man3/zip_file_replace.3.gz
+man/man3/zip_file_set_comment.3.gz
+man/man3/zip_file_strerror.3.gz
+man/man3/zip_fopen.3.gz
+man/man3/zip_fopen_encrypted.3.gz
+man/man3/zip_fopen_index.3.gz
+man/man3/zip_fopen_index_encrypted.3.gz
+man/man3/zip_fread.3.gz
+man/man3/zip_get_archive_comment.3.gz
+man/man3/zip_get_archive_flag.3.gz
+man/man3/zip_get_file_comment.3.gz
+man/man3/zip_get_name.3.gz
+man/man3/zip_get_num_entries.3.gz
+man/man3/zip_get_num_files.3.gz
+man/man3/zip_name_locate.3.gz
+man/man3/zip_open.3.gz
+man/man3/zip_rename.3.gz
+man/man3/zip_replace.3.gz
+man/man3/zip_set_archive_comment.3.gz
+man/man3/zip_set_archive_flag.3.gz
+man/man3/zip_set_default_password.3.gz
+man/man3/zip_set_file_comment.3.gz
+man/man3/zip_set_file_compression.3.gz
+man/man3/zip_source_buffer.3.gz
+man/man3/zip_source_file.3.gz
+man/man3/zip_source_filep.3.gz
+man/man3/zip_source_free.3.gz
+man/man3/zip_source_function.3.gz
+man/man3/zip_source_zip.3.gz
+man/man3/zip_stat.3.gz
+man/man3/zip_stat_index.3.gz
+man/man3/zip_stat_init.3.gz
+man/man3/zip_strerror.3.gz
+man/man3/zip_unchange.3.gz
+man/man3/zip_unchange_all.3.gz
+man/man3/zip_unchange_archive.3.gz

Modified: head/audio/mp3unicode/Makefile
==============================================================================
--- head/audio/mp3unicode/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/audio/mp3unicode/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -9,17 +9,16 @@ MASTER_SITES=	SF
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	ID3 tags charset converter
 
-LIB_DEPENDS=	tag.1:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
 
 USE_BZIP2=	yes
-NO_STAGE=	yes
 USES=		iconv pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ICONV_CFLAGS="-I${LOCALBASE}/include" \
 		ICONV_LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}"
 
-MAN1=		mp3unicode.1
-PLIST_FILES=	bin/mp3unicode
+PLIST_FILES=	bin/mp3unicode \
+		man/man1/mp3unicode.1.gz
 PORTDOCS=	COPYING README
 
 OPTIONS_DEFINE=	DOCS

Modified: head/audio/msilbc/Makefile
==============================================================================
--- head/audio/msilbc/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/audio/msilbc/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -8,13 +8,11 @@ MASTER_SITES=	SAVANNAH/linphone/plugins/
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Mediastreamer plugin for the iLBC audio codec
 
-LIB_DEPENDS=	ortp.8:${PORTSDIR}/net/linphone-base \
-		mediastreamer.0:${PORTSDIR}/net/linphone-base \
-		ilbc.0:${PORTSDIR}/net/ilbc
+LIB_DEPENDS=	libortp.so:${PORTSDIR}/net/linphone-base \
+		libmediastreamer.so:${PORTSDIR}/net/linphone-base \
+		libilbc.so:${PORTSDIR}/net/ilbc
 
-NO_STAGE=	yes
 USES=		pkgconfig
-
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	ILBC_CFLAGS=-I${LOCALBASE}/include/ilbc \

Modified: head/databases/kbibtex/Makefile
==============================================================================
--- head/databases/kbibtex/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/databases/kbibtex/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.gna.org/${
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Bibliography editor for KDE
 
-LIB_DEPENDS=	poppler-qt4:${PORTSDIR}/graphics/poppler-qt4
+LIB_DEPENDS=	libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
 
 USE_BZIP2=	yes
 USES=		cmake
@@ -19,9 +19,6 @@ USE_KDE4=	kdelibs kdeprefix automoc4 sha
 USE_QT4=	qmake_build moc_build uic_build rcc_build \
 		webkit
 
-MAN1=		kbibtex.1
-
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e 's,share/man,man,' ${WRKSRC}/CMakeLists.txt
 

Modified: head/databases/kbibtex/pkg-plist
==============================================================================
--- head/databases/kbibtex/pkg-plist	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/databases/kbibtex/pkg-plist	Wed Oct 23 13:08:41 2013	(r331383)
@@ -4,6 +4,7 @@ lib/libkbibtexgui.so
 lib/libkbibtexio.so
 lib/libkbibtexproc.so
 lib/libkbibtexws.so
+man/man1/kbibtex.1.gz
 share/applications/kde4/kbibtex.desktop
 share/apps/kbibtex/abstractonly.xsl
 share/apps/kbibtex/arxiv2bibtex.xsl
@@ -23,8 +24,6 @@ share/icons/hicolor/32x32/apps/kbibtex.p
 share/icons/hicolor/48x48/apps/kbibtex.png
 share/icons/hicolor/64x64/apps/kbibtex.png
 share/kde4/services/kbibtexpart.desktop
-share/mime/application/x-endnote-refer.xml
-share/mime/application/x-research-info-systems.xml
 share/mime/packages/bibliography.xml
 @dirrm share/apps/kbibtexpart
 @dirrm share/apps/kbibtex

Modified: head/deskutils/kchmviewer-kde4/Makefile
==============================================================================
--- head/deskutils/kchmviewer-kde4/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/deskutils/kchmviewer-kde4/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -16,8 +16,7 @@ USES=		cmake
 USE_KDE4=	kdeprefix kdelibs automoc4
 USE_QT4=	webkit qmake_build moc_build rcc_build uic_build
 
-NO_STAGE=	yes
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/packages/kchmviewer.png ${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/packages/kchmviewer.png ${STAGEDIR}${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>

Modified: head/deskutils/plasma-applet-qstardict/Makefile
==============================================================================
--- head/deskutils/plasma-applet-qstardict/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/deskutils/plasma-applet-qstardict/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -19,7 +19,6 @@ CMAKE_SOURCE_PATH=	${WRKSRC}/kdeplasma
 
 QSTARDICT_PLUGIN_PATH=	${LOCALBASE}/lib/qstardict/plugins
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/lib/qstardict/plugins|${QSTARDICT_PLUGIN_PATH}|g' \
 		${WRKSRC}/kdeplasma/dataengine/config.h.cmake

Modified: head/devel/geany-plugin-addons/Makefile
==============================================================================
--- head/devel/geany-plugin-addons/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-addons/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-codenav/Makefile
==============================================================================
--- head/devel/geany-plugin-codenav/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-codenav/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-commander/Makefile
==============================================================================
--- head/devel/geany-plugin-commander/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-commander/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-devhelp/Makefile
==============================================================================
--- head/devel/geany-plugin-devhelp/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-devhelp/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,11 +7,10 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	wnck-1:${PORTSDIR}/x11-toolkits/libwnck \
-		webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck \
+		libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
 
 USE_GNOME=	gconf2
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-doc/Makefile
==============================================================================
--- head/devel/geany-plugin-doc/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-doc/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-extrasel/Makefile
==============================================================================
--- head/devel/geany-plugin-extrasel/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-extrasel/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-gendoc/Makefile
==============================================================================
--- head/devel/geany-plugin-gendoc/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-gendoc/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,9 +7,8 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	ctpl:${PORTSDIR}/textproc/ctpl
+LIB_DEPENDS=	libctpl.so:${PORTSDIR}/textproc/ctpl
 RUN_DEPENDS=	${LOCALBASE}/bin/rst2html:${PORTSDIR}/textproc/py-docutils
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-geniuspaste/Makefile
==============================================================================
--- head/devel/geany-plugin-geniuspaste/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-geniuspaste/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,8 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	soup-2.4:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-gproject/Makefile
==============================================================================
--- head/devel/geany-plugin-gproject/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-gproject/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-insertnum/Makefile
==============================================================================
--- head/devel/geany-plugin-insertnum/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-insertnum/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-latex/Makefile
==============================================================================
--- head/devel/geany-plugin-latex/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-latex/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-lipsum/Makefile
==============================================================================
--- head/devel/geany-plugin-lipsum/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-lipsum/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-lua/Makefile
==============================================================================
--- head/devel/geany-plugin-lua/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-lua/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -9,6 +9,5 @@ COMMENT=	Geany plugin: ${${GEANY_PLUGIN}
 
 USE_LUA=	5.1
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-macro/Makefile
==============================================================================
--- head/devel/geany-plugin-macro/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-macro/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-miniscript/Makefile
==============================================================================
--- head/devel/geany-plugin-miniscript/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-miniscript/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-multiterm/Makefile
==============================================================================
--- head/devel/geany-plugin-multiterm/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-multiterm/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -10,6 +10,5 @@ COMMENT=	Geany plugin: ${${GEANY_PLUGIN}
 BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
 USE_GNOME=	vte
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-numberedbookmarks/Makefile
==============================================================================
--- head/devel/geany-plugin-numberedbookmarks/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-numberedbookmarks/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-pg/Makefile
==============================================================================
--- head/devel/geany-plugin-pg/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-pg/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -11,6 +11,5 @@ COMMENT=	Geany plugin: ${${GEANY_PLUGIN}
 LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
 RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-pretty-printer/Makefile
==============================================================================
--- head/devel/geany-plugin-pretty-printer/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-pretty-printer/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-prj/Makefile
==============================================================================
--- head/devel/geany-plugin-prj/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-prj/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-scope/Makefile
==============================================================================
--- head/devel/geany-plugin-scope/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-scope/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -9,6 +9,5 @@ COMMENT=	Geany plugin: ${${GEANY_PLUGIN}
 
 USE_GNOME=	vte
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-sendmail/Makefile
==============================================================================
--- head/devel/geany-plugin-sendmail/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-sendmail/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-shiftcolumn/Makefile
==============================================================================
--- head/devel/geany-plugin-shiftcolumn/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-shiftcolumn/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-spellcheck/Makefile
==============================================================================
--- head/devel/geany-plugin-spellcheck/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-spellcheck/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,8 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	enchant.1:${PORTSDIR}/textproc/enchant
+LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-tableconvert/Makefile
==============================================================================
--- head/devel/geany-plugin-tableconvert/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-tableconvert/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-treebrowser/Makefile
==============================================================================
--- head/devel/geany-plugin-treebrowser/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-treebrowser/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-updatechecker/Makefile
==============================================================================
--- head/devel/geany-plugin-updatechecker/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-updatechecker/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,8 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	soup-2.4:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-vc/Makefile
==============================================================================
--- head/devel/geany-plugin-vc/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-vc/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -9,17 +9,10 @@ COMMENT=	Geany plugin: ${${GEANY_PLUGIN}
 
 OPTIONS_DEFINE=	GTKSPELL
 OPTIONS_DEFAULT=	GTKSPELL
+
 GTKSPELL_DESC=	Spell checking support via GtkSpell
+GTKSPELL_LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+GTKSPELL_CONFIGURE_ENABLE=	gtkspell
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
-# bsd.port.options.mk is already included
-
-.if ${PORT_OPTIONS:MGTKSPELL}
-LIB_DEPENDS+=	gtkspell:${PORTSDIR}/textproc/gtkspell
-CONFIGURE_ARGS+=	--enable-gtkspell
-.else
-CONFIGURE_ARGS+=	--disable-gtkspell
-.endif
-
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-webhelper/Makefile
==============================================================================
--- head/devel/geany-plugin-webhelper/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-webhelper/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,8 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugin-xmlsnippets/Makefile
==============================================================================
--- head/devel/geany-plugin-xmlsnippets/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugin-xmlsnippets/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,6 +7,5 @@ CATEGORIES=	devel
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugins-l10n/Makefile
==============================================================================
--- head/devel/geany-plugins-l10n/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugins-l10n/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -9,6 +9,5 @@ COMMENT=	Localization messages for Geany
 
 USES=		pathfix
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>

Modified: head/devel/geany-plugins/Makefile
==============================================================================
--- head/devel/geany-plugins/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugins/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -11,8 +11,9 @@ COMMENT=	Geany plugins (meta port)
 
 .MAKE.FreeBSD_UL=	yes
 NO_BUILD=	yes
+NO_INSTALL=	yes
+NO_MTREE=	yes
 
-NO_STAGE=	yes
 .include "${.CURDIR}/files/bsd.geany-plugins.mk"
 
 OPTIONS_DEFINE=		NLS
@@ -37,7 +38,4 @@ RUN_DEPENDS+=	${${opt}_DEP}
 . endif
 .endfor
 
-do-install:
-	${DO_NADA}
-
 .include <bsd.port.mk>

Modified: head/devel/geany-plugins/files/Makefile.common
==============================================================================
--- head/devel/geany-plugins/files/Makefile.common	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany-plugins/files/Makefile.common	Wed Oct 23 13:08:41 2013	(r331383)
@@ -14,10 +14,9 @@ CONFLICTS_INSTALL=	geany-plugins-0.*
 EXTRA_PATCHES=  ${.CURDIR}/../../devel/geany-plugins/files/extrapatch-configure
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS+=	libtool
-USES+=		pkgconfig
+USES+=		gmake pkgconfig
 USE_GNOME+=	gtk20
 
 # geany-plugins-l10n is not a plugin, thus special treatment

Modified: head/devel/geany/Makefile
==============================================================================
--- head/devel/geany/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -14,9 +14,8 @@ LICENSE=	GPLv2
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gtk20
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -24,9 +23,6 @@ OPTIONS_DEFINE=	VTE NLS DOCS
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 VTE_DESC=	Embedded virtual terminal
 
-MAN1=		geany.1
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}

Modified: head/devel/geany/pkg-plist
==============================================================================
--- head/devel/geany/pkg-plist	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/geany/pkg-plist	Wed Oct 23 13:08:41 2013	(r331383)
@@ -45,6 +45,7 @@ lib/geany/saveactions.so
 lib/geany/splitwindow.la
 lib/geany/splitwindow.so
 libdata/pkgconfig/geany.pc
+man/man1/geany.1.gz
 share/applications/geany.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING

Modified: head/devel/qsvn/Makefile
==============================================================================
--- head/devel/qsvn/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/devel/qsvn/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.anrichter.net/p
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Qt based GUI frontend for Subversion
 
-LIB_DEPENDS+=	svn_client-1:${PORTSDIR}/devel/subversion
+LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion
 
 USE_QT4=	gui sql moc_build uic_build rcc_build qmake_build
 USE_LDCONFIG=	yes
@@ -19,12 +19,11 @@ USES=		cmake
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
 DESKTOP_ENTRIES="QSvn" "SVN client" "${PREFIX}/share/pixmaps/qsvn.png" \
-		"qsvn" "Development;RevisionControl;Qt;" false
+		"qsvn" "Development;RevisionControl;Qt;" true
 
 SVNQT_INCLUDE_DIR=	include/svnqt4
 PLIST_SUB=	SVNQT_INCLUDE_DIR="${SVNQT_INCLUDE_DIR}"
 
-NO_STAGE=	yes
 pre-configure:
 	${REINPLACE_CMD} -e 's,include/svnqt,${SVNQT_INCLUDE_DIR},g' \
 		${WRKSRC}/svnqt/CMakeLists.txt
@@ -32,6 +31,6 @@ pre-configure:
 		${WRKSRC}/svnqt/cmakemodules/FindSubversion.cmake
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/images/qsvn.png ${PREFIX}/share/pixmaps/
+	${INSTALL_DATA} ${WRKSRC}/images/qsvn.png ${STAGEDIR}${PREFIX}/share/pixmaps/
 
 .include <bsd.port.mk>

Modified: head/editors/kile-kde4/Makefile
==============================================================================
--- head/editors/kile-kde4/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/editors/kile-kde4/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -21,6 +21,4 @@ OPTIONS_DEFINE=	OKULAR
 OKULAR_DESC=	Use Okular for viewing
 OKULAR_USE=	KDE4=okular_run
 
-NO_STAGE=	yes
-
 .include <bsd.port.mk>

Modified: head/editors/kile-kde4/pkg-plist
==============================================================================
--- head/editors/kile-kde4/pkg-plist	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/editors/kile-kde4/pkg-plist	Wed Oct 23 13:08:41 2013	(r331383)
@@ -1605,7 +1605,6 @@ share/locale/x-test/LC_MESSAGES/kile.mo
 share/locale/zh_CN/LC_MESSAGES/kile.mo
 share/locale/zh_TW/LC_MESSAGES/kile.mo
 share/mime/packages/kile.xml
-share/mime/text/x-kilepr.xml
 @dirrmtry share/locale/x-test/LC_MESSAGES
 @dirrmtry share/locale/x-test
 @dirrm share/doc/kile

Modified: head/emulators/aqemu/Makefile
==============================================================================
--- head/emulators/aqemu/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/emulators/aqemu/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,9 +7,9 @@ CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S,.0$,,}/
 
 MAINTAINER=	makc at FreeBSD.org
-COMMENT=	Qt4 based Qemu frontend
+COMMENT=	Qt 4 based Qemu frontend
 
-LIB_DEPENDS=	vncclient.0:${PORTSDIR}/net/libvncserver
+LIB_DEPENDS=	libvncclient.so:${PORTSDIR}/net/libvncserver
 
 USE_BZIP2=	yes
 USE_QT4=	gui qtestlib xml qmake_build uic_build moc_build rcc_build \
@@ -17,7 +17,4 @@ USE_QT4=	gui qtestlib xml qmake_build ui
 USES=		cmake
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S,.0$,,}
 
-MAN1=		aqemu.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/emulators/aqemu/pkg-plist
==============================================================================
--- head/emulators/aqemu/pkg-plist	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/emulators/aqemu/pkg-plist	Wed Oct 23 13:08:41 2013	(r331383)
@@ -1,4 +1,5 @@
 bin/aqemu
+man/man1/aqemu.1.gz
 share/applications/aqemu.desktop
 share/aqemu/German.qm
 share/aqemu/Russian.qm

Modified: head/ftp/plasma-applet-ftpmonitor/Makefile
==============================================================================
--- head/ftp/plasma-applet-ftpmonitor/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/ftp/plasma-applet-ftpmonitor/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -14,9 +14,7 @@ USE_BZIP2=	yes
 USES=		cmake
 USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	qmake_build moc_build uic_build rcc_build
-MAKE_JOS_SAFE=	yes
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
 		${WRKSRC}/src/ftpserver/*.h

Modified: head/games/darkplaces/Makefile
==============================================================================
--- head/games/darkplaces/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/games/darkplaces/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}engine${PORTVERSION
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Quake engine modification
 
+USES=		gmake
 USE_ZIP=	yes
-USE_GMAKE=	yes
 USE_XORG=	xxf86dga xpm
 USE_DOS2UNIX=	darkplaces.txt
 MAKE_ENV=	DP_FS_BASEDIR="${Q1DIR}"
@@ -34,7 +34,6 @@ PLIST_FILES=	%%DATADIR%%/dummy
 PLIST_DIRS=	%%DATADIR%%
 PORTDOCS=	darkplaces.txt
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../quake-data/Makefile.include"
 
 .include <bsd.port.options.mk>
@@ -76,20 +75,16 @@ post-extract:
 		-d ${WRKDIR}
 
 do-install:
-.for f in ${EXE_TARGETS}
-	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin
-.endfor
-	@${MKDIR} ${DATADIR}
-	@${TOUCH} ${DATADIR}/dummy
+	${INSTALL_PROGRAM} ${EXE_TARGETS:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	@${TOUCH} ${STAGEDIR}${DATADIR}/dummy
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/darkplaces.txt ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/darkplaces.txt ${STAGEDIR}${DOCSDIR}
 .endif
 
-.include <bsd.port.pre.mk>
+BROKEN_ia64=	does not compile: unrecognized command line option "-msse2"
+BROKEN_powerpc=	${BROKEN_ia64}
+BROKEN_sparc64=	${BROKEN_ia64}
 
-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile on ia64, powerpc, or sparc64: unrecognized command line option "-msse2"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/games/glaxium/Makefile
==============================================================================
--- head/games/glaxium/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/games/glaxium/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -11,16 +11,14 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	OpenGL based space-ship "shoot-em-up" game
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 
+USES=		gmake
 USE_SDL=	sdl mixer
 USE_GL=		glut
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 ALL_TARGET=	${PORTNAME}
 
-MAN6=		glaxium.6
-
 USE_DOS2UNIX=	variables.cpp scene.cpp
 
 DESKTOP_ENTRIES=	"Glaxium" \
@@ -30,7 +28,6 @@ DESKTOP_ENTRIES=	"Glaxium" \
 			"Game;ArcadeGame;" \
 			false
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g; \
 		 s|/games/glaxium|/glaxium|g' ${WRKSRC}/configure
@@ -41,4 +38,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|TankFire::TankFire|TankFire|g' \
 		${WRKSRC}/tank.hpp
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+
 .include <bsd.port.mk>

Added: head/games/glaxium/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/glaxium/files/patch-Makefile.in	Wed Oct 23 13:08:41 2013	(r331383)
@@ -0,0 +1,16 @@
+--- ./Makefile.in.orig	2002-10-20 18:30:12.000000000 +0000
++++ ./Makefile.in	2013-10-22 22:38:44.900225905 +0000
+@@ -13,10 +13,10 @@
+ bindir=@bindir@
+ mandir=@mandir@
+ 
+-GLAXIUM_INSTALLDIR=$(bindir)
++GLAXIUM_INSTALLDIR=$(DESTDIR)$(bindir)
+ DATA_DIRS=samples textures
+-GLAXIUM_HOME=$(datadir)/games/glaxium
+-MAN_DIR=$(mandir)
++GLAXIUM_HOME=$(DESTDIR)$(datadir)/games/glaxium
++MAN_DIR=$(DESTDIR)$(mandir)
+ 
+ glaxium : $(OBJ)
+ 	gcc -g -o glaxium $(OBJ) $(LIB)

Modified: head/games/glaxium/pkg-plist
==============================================================================
--- head/games/glaxium/pkg-plist	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/games/glaxium/pkg-plist	Wed Oct 23 13:08:41 2013	(r331383)
@@ -1,4 +1,5 @@
 bin/glaxium
+man/man6/glaxium.6.gz
 %%DATADIR%%/samples/detection.wav
 %%DATADIR%%/samples/explode1.wav
 %%DATADIR%%/samples/explode2.wav

Modified: head/games/golly/Makefile
==============================================================================
--- head/games/golly/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/games/golly/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -17,5 +17,4 @@ USE_WX=		2.8+
 DESKTOP_ENTRIES=	"Golly" "${COMMENT}" "${PREFIX}/share/pixmaps/golly.xpm" \
 			"${PREFIX}/bin/golly" "Education;" "true"
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/games/hex-a-hop/Makefile
==============================================================================
--- head/games/hex-a-hop/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/games/hex-a-hop/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -26,7 +26,6 @@ DESKTOP_ENTRIES="Hex-a-Hop" "${COMMENT}"
 		"${DATADIR}/icon.bmp" \
 		"hex-a-hop" "LogicGame;Game;" false
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MDEBUG}

Modified: head/games/hexxagon/Makefile
==============================================================================
--- head/games/hexxagon/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/games/hexxagon/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -9,15 +9,13 @@ MASTER_SITES=	http://www.nesqi.se/hexxag
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Strategy hexagon game
 
-LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
+LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
 
-USES=		pkgconfig
+USES=		gmake pkgconfig
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 DESKTOP_ENTRIES="Hexxagon" "Strategy Game" "" \
 		"hexxagon" "Game;StrategyGame;" false
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/games/kmancala/Makefile
==============================================================================
--- head/games/kmancala/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/games/kmancala/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -16,5 +16,4 @@ USES=		cmake:outsource
 USE_KDE4=	kdelibs kdeprefix automoc4 libkdegames
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/games/supertux-devel/Makefile
==============================================================================
--- head/games/supertux-devel/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/games/supertux-devel/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -7,12 +7,12 @@ MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	makc at FreeBSD.org
-COMMENT=	SuperTux is a side-scroller similar to Super Mario Brothers
+COMMENT=	Side-scroller game similar to Super Mario Brothers
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/smart_ptr.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	physfs.1:${PORTSDIR}/devel/physfs \
-		curl:${PORTSDIR}/ftp/curl \
-		vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libphysfs.so:${PORTSDIR}/devel/physfs \
+		libcurl.so:${PORTSDIR}/ftp/curl \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis
 
 USE_BZIP2=	yes
 USE_SDL=	image
@@ -21,7 +21,6 @@ USE_GL=		glew
 USES=		cmake:outsource iconv
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e '/^Icon=/s,supertux.png,supertux2.png,' \
 		${WRKSRC}/supertux2.desktop

Modified: head/games/supertux/Makefile
==============================================================================
--- head/games/supertux/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/games/supertux/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -3,23 +3,22 @@
 
 PORTNAME=	supertux
 PORTVERSION=	0.1.3
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
 MAINTAINER=	makc at FreeBSD.org
-COMMENT=	Super Tux is a side-scroller similar to Super Mario Brothers
+COMMENT=	Side-scroller game similar to Super Mario Brothers
 
+USES=		gmake
 USE_BZIP2=	yes
 USE_SDL=	image mixer
-USE_GL=		yes
-USE_GMAKE=	yes
+USE_GL=		gl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=		--disable-debug
 
 PORTSCOUT=	limit:^0\.1
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's,Menu::,,' ${WRKSRC}/src/menu.h
 

Modified: head/games/trigger/Makefile
==============================================================================
--- head/games/trigger/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/games/trigger/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -13,7 +13,7 @@ MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Rally car racing game
 
 BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
-LIB_DEPENDS=	physfs.1:${PORTSDIR}/devel/physfs
+LIB_DEPENDS=	libphysfs.so:${PORTSDIR}/devel/physfs
 
 USE_OPENAL=	al alut
 USE_SDL=	sdl image
@@ -35,7 +35,6 @@ PORTDOCS=	README-stereo.txt README.txt
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -51,18 +50,18 @@ do-build:
 	@cd ${BUILD_WRKSRC} && ${LOCALBASE}/bin/jam
 
 do-install:
-	${MKDIR} ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/trigger ${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/trigger ${STAGEDIR}${PREFIX}/bin
 
-	${MKDIR} ${DATADIR}
+	${MKDIR} ${STAGEDIR}${DATADIR}
 .for d in events fonts maps plugins sounds textures vehicles
-	cd ${DATASRC} && ${COPYTREE_SHARE} ${d} ${DATADIR}
+	cd ${DATASRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}
 .endfor
-	${INSTALL_DATA} ${DATASRC}/trigger.config.defs ${DATADIR}
+	${INSTALL_DATA} ${DATASRC}/trigger.config.defs ${STAGEDIR}${DATADIR}
 
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Modified: head/games/trophy/Makefile
==============================================================================
--- head/games/trophy/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/games/trophy/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -12,7 +12,7 @@ COMMENT=	Single player racing game
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	clanCore:${PORTSDIR}/devel/clanlib1
+LIB_DEPENDS=	libclanCore.so:${PORTSDIR}/devel/clanlib1
 
 USES=		pkgconfig
 
@@ -21,13 +21,10 @@ CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
 
-MAN6=	trophy.6
-
 PORTDOCS=	AUTHORS COPYING ChangeLog README TODO
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 pre-configure:
@@ -36,8 +33,8 @@ pre-configure:
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR} && \
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR} && \
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Modified: head/games/trophy/pkg-plist
==============================================================================
--- head/games/trophy/pkg-plist	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/games/trophy/pkg-plist	Wed Oct 23 13:08:41 2013	(r331383)
@@ -1,4 +1,5 @@
 bin/trophy
+man/man6/trophy.6.gz
 share/applications/trophy.desktop
 share/pixmaps/trophy.png
 %%DATADIR%%/cars/dust.tga

Modified: head/games/warmux/Makefile
==============================================================================
--- head/games/warmux/Makefile	Wed Oct 23 12:48:10 2013	(r331382)
+++ head/games/warmux/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
@@ -11,8 +11,8 @@ MASTER_SITES=	http://download.gna.org/${
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Turn-based artillery game with free software mascots
 
-LIB_DEPENDS=	xml++-2.6.2:${PORTSDIR}/textproc/libxml++26 \
-		curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26 \
+		libcurl.so:${PORTSDIR}/ftp/curl
 
 CONFLICTS_INSTALL=	wormux-*
 
@@ -22,16 +22,12 @@ USES=		gmake pkgconfig
 USE_SDL=	sdl image mixer ttf gfx net
 USE_DOS2UNIX=	fixed_class.h
 
-MANCOMPRESSED=	no
-MAN6=		warmux.6
-
 OPTIONS_DEFINE=	FRIBIDI SERVER NLS DEBUG
 FRIBIDI_DESC=	Enable bi-directional unicode support
 SERVER_DESC=	Enable dedicated server
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:R}

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-head mailing list