diff options
| author | makc <makc@FreeBSD.org> | 2013-10-23 21:08:41 +0800 |
|---|---|---|
| committer | makc <makc@FreeBSD.org> | 2013-10-23 21:08:41 +0800 |
| commit | 257d95e619d504625a3dd72269614d7fe350704c (patch) | |
| tree | 902ae1e48303d70f1045908f9eb477d7722924c8 | |
| parent | 4db462c2d32f9526ce9940e28a4b22915d0982f5 (diff) | |
| download | freebsd-ports-graphics-257d95e619d504625a3dd72269614d7fe350704c.tar.gz freebsd-ports-graphics-257d95e619d504625a3dd72269614d7fe350704c.tar.zst freebsd-ports-graphics-257d95e619d504625a3dd72269614d7fe350704c.zip | |
- Support staging
- Use new LIB_DEPENDS syntax
- Use options helpers
- Convert to USES
- Minor changes/fixes
108 files changed, 249 insertions, 388 deletions
diff --git a/archivers/libzip/Makefile b/archivers/libzip/Makefile index 18dfa6fa2c5..13084ab4ee7 100644 --- a/archivers/libzip/Makefile +++ b/archivers/libzip/Makefile @@ -9,7 +9,6 @@ MASTER_SITES= http://www.nih.at/libzip/ MAINTAINER= makc@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> diff --git a/archivers/libzip/Makefile.man b/archivers/libzip/Makefile.man deleted file mode 100644 index 90a9327fb60..00000000000 --- a/archivers/libzip/Makefile.man +++ /dev/null @@ -1,65 +0,0 @@ -MAN1= zipcmp.1 \ - zipmerge.1 \ - ziptorrent.1 -MAN3= libzip.3 \ - zip_add.3 \ - zip_add_dir.3 \ - zip_close.3 \ - zip_delete.3 \ - zip_dir_add.3 \ - zip_discard.3 \ - zip_error_clear.3 \ - zip_error_get.3 \ - zip_error_get_sys_type.3 \ - zip_error_to_str.3 \ - zip_errors.3 \ - zip_fclose.3 \ - zip_fdopen.3 \ - zip_file_add.3 \ - zip_file_error_clear.3 \ - zip_file_error_get.3 \ - zip_file_extra_field_delete.3 \ - zip_file_extra_field_delete_by_id.3 \ - zip_file_extra_field_get.3 \ - zip_file_extra_field_get_by_id.3 \ - zip_file_extra_field_set.3 \ - zip_file_extra_fields_count.3 \ - zip_file_extra_fields_count_by_id.3 \ - zip_file_get_comment.3 \ - zip_file_rename.3 \ - zip_file_replace.3 \ - zip_file_set_comment.3 \ - zip_file_strerror.3 \ - zip_fopen.3 \ - zip_fopen_encrypted.3 \ - zip_fopen_index.3 \ - zip_fopen_index_encrypted.3 \ - zip_fread.3 \ - zip_get_archive_comment.3 \ - zip_get_archive_flag.3 \ - zip_get_file_comment.3 \ - zip_get_name.3 \ - zip_get_num_entries.3 \ - zip_get_num_files.3 \ - zip_name_locate.3 \ - zip_open.3 \ - zip_rename.3 \ - zip_replace.3 \ - zip_set_archive_comment.3 \ - zip_set_archive_flag.3 \ - zip_set_default_password.3 \ - zip_set_file_comment.3 \ - zip_set_file_compression.3 \ - zip_source_buffer.3 \ - zip_source_file.3 \ - zip_source_filep.3 \ - zip_source_free.3 \ - zip_source_function.3 \ - zip_source_zip.3 \ - zip_stat.3 \ - zip_stat_index.3 \ - zip_stat_init.3 \ - zip_strerror.3 \ - zip_unchange.3 \ - zip_unchange_all.3 \ - zip_unchange_archive.3 diff --git a/archivers/libzip/pkg-plist b/archivers/libzip/pkg-plist index 9f1ffda8fb0..3863054ca5b 100644 --- a/archivers/libzip/pkg-plist +++ b/archivers/libzip/pkg-plist @@ -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 diff --git a/audio/mp3unicode/Makefile b/audio/mp3unicode/Makefile index 65c88d7085a..1b675b6413b 100644 --- a/audio/mp3unicode/Makefile +++ b/audio/mp3unicode/Makefile @@ -9,17 +9,16 @@ MASTER_SITES= SF MAINTAINER= makc@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 diff --git a/audio/msilbc/Makefile b/audio/msilbc/Makefile index ecc448b9a78..93b0da3b120 100644 --- a/audio/msilbc/Makefile +++ b/audio/msilbc/Makefile @@ -8,13 +8,11 @@ MASTER_SITES= SAVANNAH/linphone/plugins/sources/ MAINTAINER= makc@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 \ diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile index 22003cd1d15..a2aeb729833 100644 --- a/databases/kbibtex/Makefile +++ b/databases/kbibtex/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= http://download.gna.org/${PORTNAME}/${PORTVERSION:C,(^[[:digit:]]\ MAINTAINER= makc@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 sharedmime 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 diff --git a/databases/kbibtex/pkg-plist b/databases/kbibtex/pkg-plist index 248a659d993..fa4f038abb2 100644 --- a/databases/kbibtex/pkg-plist +++ b/databases/kbibtex/pkg-plist @@ -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.png 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 diff --git a/deskutils/kchmviewer-kde4/Makefile b/deskutils/kchmviewer-kde4/Makefile index b81788e8e66..05685f5e21b 100644 --- a/deskutils/kchmviewer-kde4/Makefile +++ b/deskutils/kchmviewer-kde4/Makefile @@ -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> diff --git a/deskutils/plasma-applet-qstardict/Makefile b/deskutils/plasma-applet-qstardict/Makefile index 1da5554178a..eb903feb958 100644 --- a/deskutils/plasma-applet-qstardict/Makefile +++ b/deskutils/plasma-applet-qstardict/Makefile @@ -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 diff --git a/devel/geany-plugin-addons/Makefile b/devel/geany-plugin-addons/Makefile index eac4706994c..3a10d1ccbc9 100644 --- a/devel/geany-plugin-addons/Makefile +++ b/devel/geany-plugin-addons/Makefile @@ -7,6 +7,5 @@ CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugin-codenav/Makefile b/devel/geany-plugin-codenav/Makefile index f6816c8999a..c67f49fbf7d 100644 --- a/devel/geany-plugin-codenav/Makefile +++ b/devel/geany-plugin-codenav/Makefile @@ -7,6 +7,5 @@ CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugin-commander/Makefile b/devel/geany-plugin-commander/Makefile index 4eb320fd650..5426fe06603 100644 --- a/devel/geany-plugin-commander/Makefile +++ b/devel/geany-plugin-commander/Makefile @@ -7,6 +7,5 @@ CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugin-devhelp/Makefile b/devel/geany-plugin-devhelp/Makefile index aa0ffec8155..ee19d3939d4 100644 --- a/devel/geany-plugin-devhelp/Makefile +++ b/devel/geany-plugin-devhelp/Makefile @@ -7,11 +7,10 @@ CATEGORIES= devel MAINTAINER= makc@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> diff --git a/devel/geany-plugin-doc/Makefile b/devel/geany-plugin-doc/Makefile index a1a2b71688b..f609d8c875c 100644 --- a/devel/geany-plugin-doc/Makefile +++ b/devel/geany-plugin-doc/Makefile @@ -7,6 +7,5 @@ CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugin-extrasel/Makefile b/devel/geany-plugin-extrasel/Makefile index 0d182f72a2b..63e510ccd62 100644 --- a/devel/geany-plugin-extrasel/Makefile +++ b/devel/geany-plugin-extrasel/Makefile @@ -7,6 +7,5 @@ CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugin-gendoc/Makefile b/devel/geany-plugin-gendoc/Makefile index 08de667f095..634b4af14d7 100644 --- a/devel/geany-plugin-gendoc/Makefile +++ b/devel/geany-plugin-gendoc/Makefile @@ -7,9 +7,8 @@ CATEGORIES= devel MAINTAINER= makc@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> diff --git a/devel/geany-plugin-geniuspaste/Makefile b/devel/geany-plugin-geniuspaste/Makefile index c063dac87e2..19cc5e172e4 100644 --- a/devel/geany-plugin-geniuspaste/Makefile +++ b/devel/geany-plugin-geniuspaste/Makefile @@ -7,8 +7,7 @@ CATEGORIES= devel MAINTAINER= makc@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> diff --git a/devel/geany-plugin-gproject/Makefile b/devel/geany-plugin-gproject/Makefile index 8b9c2ce4562..bd492569804 100644 --- a/devel/geany-plugin-gproject/Makefile +++ b/devel/geany-plugin-gproject/Makefile @@ -7,6 +7,5 @@ CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugin-insertnum/Makefile b/devel/geany-plugin-insertnum/Makefile index 706b23d7b44..4db7815710f 100644 --- a/devel/geany-plugin-insertnum/Makefile +++ b/devel/geany-plugin-insertnum/Makefile @@ -7,6 +7,5 @@ CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugin-latex/Makefile b/devel/geany-plugin-latex/Makefile index 0f689b86e52..b7170d1c2f6 100644 --- a/devel/geany-plugin-latex/Makefile +++ b/devel/geany-plugin-latex/Makefile @@ -7,6 +7,5 @@ CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugin-lipsum/Makefile b/devel/geany-plugin-lipsum/Makefile index 8854cea282d..bdc6d08345f 100644 --- a/devel/geany-plugin-lipsum/Makefile +++ b/devel/geany-plugin-lipsum/Makefile @@ -7,6 +7,5 @@ CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugin-lua/Makefile b/devel/geany-plugin-lua/Makefile index f654419e695..f6834f5afd7 100644 --- a/devel/geany-plugin-lua/Makefile +++ b/devel/geany-plugin-lua/Makefile @@ -9,6 +9,5 @@ COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} USE_LUA= 5.1 -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugin-macro/Makefile b/devel/geany-plugin-macro/Makefile index f817a3fd81d..62ea8134ecb 100644 --- a/devel/geany-plugin-macro/Makefile +++ b/devel/geany-plugin-macro/Makefile @@ -7,6 +7,5 @@ CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugin-miniscript/Makefile b/devel/geany-plugin-miniscript/Makefile index 084518d68e3..67d899121c1 100644 --- a/devel/geany-plugin-miniscript/Makefile +++ b/devel/geany-plugin-miniscript/Makefile @@ -7,6 +7,5 @@ CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugin-multiterm/Makefile b/devel/geany-plugin-multiterm/Makefile index 943723498e5..d9199a261d7 100644 --- a/devel/geany-plugin-multiterm/Makefile +++ b/devel/geany-plugin-multiterm/Makefile @@ -10,6 +10,5 @@ COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala USE_GNOME= vte -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugin-numberedbookmarks/Makefile b/devel/geany-plugin-numberedbookmarks/Makefile index 22f30ff642a..c9350af74b7 100644 --- a/devel/geany-plugin-numberedbookmarks/Makefile +++ b/devel/geany-plugin-numberedbookmarks/Makefile @@ -7,6 +7,5 @@ CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugin-pg/Makefile b/devel/geany-plugin-pg/Makefile index 75b7b6cfc79..9fa5e7ceb9e 100644 --- a/devel/geany-plugin-pg/Makefile +++ b/devel/geany-plugin-pg/Makefile @@ -11,6 +11,5 @@ COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} 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> diff --git a/devel/geany-plugin-pretty-printer/Makefile b/devel/geany-plugin-pretty-printer/Makefile index fe4b4f2cc1d..0dec8f09712 100644 --- a/devel/geany-plugin-pretty-printer/Makefile +++ b/devel/geany-plugin-pretty-printer/Makefile @@ -7,6 +7,5 @@ CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugin-prj/Makefile b/devel/geany-plugin-prj/Makefile index 380b2bfe51e..4e6157fd53f 100644 --- a/devel/geany-plugin-prj/Makefile +++ b/devel/geany-plugin-prj/Makefile @@ -7,6 +7,5 @@ CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugin-scope/Makefile b/devel/geany-plugin-scope/Makefile index a97e7f9aa20..ef995c081ae 100644 --- a/devel/geany-plugin-scope/Makefile +++ b/devel/geany-plugin-scope/Makefile @@ -9,6 +9,5 @@ COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} USE_GNOME= vte -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugin-sendmail/Makefile b/devel/geany-plugin-sendmail/Makefile index 5c38ed5f05d..b168e063408 100644 --- a/devel/geany-plugin-sendmail/Makefile +++ b/devel/geany-plugin-sendmail/Makefile @@ -7,6 +7,5 @@ CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugin-shiftcolumn/Makefile b/devel/geany-plugin-shiftcolumn/Makefile index 3dfc16bffed..83aa2f7cc3d 100644 --- a/devel/geany-plugin-shiftcolumn/Makefile +++ b/devel/geany-plugin-shiftcolumn/Makefile @@ -7,6 +7,5 @@ CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugin-spellcheck/Makefile b/devel/geany-plugin-spellcheck/Makefile index 097655e119e..1b2d26b926e 100644 --- a/devel/geany-plugin-spellcheck/Makefile +++ b/devel/geany-plugin-spellcheck/Makefile @@ -7,8 +7,7 @@ CATEGORIES= devel MAINTAINER= makc@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> diff --git a/devel/geany-plugin-tableconvert/Makefile b/devel/geany-plugin-tableconvert/Makefile index bdbed68719e..607f9bbf858 100644 --- a/devel/geany-plugin-tableconvert/Makefile +++ b/devel/geany-plugin-tableconvert/Makefile @@ -7,6 +7,5 @@ CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugin-treebrowser/Makefile b/devel/geany-plugin-treebrowser/Makefile index 96541ab9c43..71543c3b8eb 100644 --- a/devel/geany-plugin-treebrowser/Makefile +++ b/devel/geany-plugin-treebrowser/Makefile @@ -7,6 +7,5 @@ CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugin-updatechecker/Makefile b/devel/geany-plugin-updatechecker/Makefile index c572e1ce423..2f934b4d23e 100644 --- a/devel/geany-plugin-updatechecker/Makefile +++ b/devel/geany-plugin-updatechecker/Makefile @@ -7,8 +7,7 @@ CATEGORIES= devel MAINTAINER= makc@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> diff --git a/devel/geany-plugin-vc/Makefile b/devel/geany-plugin-vc/Makefile index 215df2e55da..3c81b98e0c9 100644 --- a/devel/geany-plugin-vc/Makefile +++ b/devel/geany-plugin-vc/Makefile @@ -9,17 +9,10 @@ COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} 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> diff --git a/devel/geany-plugin-webhelper/Makefile b/devel/geany-plugin-webhelper/Makefile index f19d457581b..666b2b07c91 100644 --- a/devel/geany-plugin-webhelper/Makefile +++ b/devel/geany-plugin-webhelper/Makefile @@ -7,8 +7,7 @@ CATEGORIES= devel MAINTAINER= makc@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> diff --git a/devel/geany-plugin-xmlsnippets/Makefile b/devel/geany-plugin-xmlsnippets/Makefile index b72b30afddd..d87cdfb61cf 100644 --- a/devel/geany-plugin-xmlsnippets/Makefile +++ b/devel/geany-plugin-xmlsnippets/Makefile @@ -7,6 +7,5 @@ CATEGORIES= devel MAINTAINER= makc@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugins-l10n/Makefile b/devel/geany-plugins-l10n/Makefile index eaebb563436..48cad1a590c 100644 --- a/devel/geany-plugins-l10n/Makefile +++ b/devel/geany-plugins-l10n/Makefile @@ -9,6 +9,5 @@ COMMENT= Localization messages for Geany plugins USES= pathfix -NO_STAGE= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include <bsd.port.mk> diff --git a/devel/geany-plugins/Makefile b/devel/geany-plugins/Makefile index 713fb6c9176..d22c371d8fe 100644 --- a/devel/geany-plugins/Makefile +++ b/devel/geany-plugins/Makefile @@ -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> diff --git a/devel/geany-plugins/files/Makefile.common b/devel/geany-plugins/files/Makefile.common index 9a45d7d96ea..1ea2e4872a5 100644 --- a/devel/geany-plugins/files/Makefile.common +++ b/devel/geany-plugins/files/Makefile.common @@ -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 diff --git a/devel/geany/Makefile b/devel/geany/Makefile index 8abe15fb63d..8f25133974d 100644 --- a/devel/geany/Makefile +++ b/devel/geany/Makefile @@ -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} diff --git a/devel/geany/pkg-plist b/devel/geany/pkg-plist index bf0cd4c6a8f..15e9d45c296 100644 --- a/devel/geany/pkg-plist +++ b/devel/geany/pkg-plist @@ -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 diff --git a/devel/qsvn/Makefile b/devel/qsvn/Makefile index 2d87a7ab6ac..b2bb9215e6f 100644 --- a/devel/qsvn/Makefile +++ b/devel/qsvn/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= http://www.anrichter.net/projects/qsvn/chrome/site/ MAINTAINER= makc@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> diff --git a/editors/kile-kde4/Makefile b/editors/kile-kde4/Makefile index dfbb4558cd3..0c370726250 100644 --- a/editors/kile-kde4/Makefile +++ b/editors/kile-kde4/Makefile @@ -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> diff --git a/editors/kile-kde4/pkg-plist b/editors/kile-kde4/pkg-plist index 7262d7fa495..a098d225b6e 100644 --- a/editors/kile-kde4/pkg-plist +++ b/editors/kile-kde4/pkg-plist @@ -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 diff --git a/emulators/aqemu/Makefile b/emulators/aqemu/Makefile index 32fa78024da..877ca19fbaa 100644 --- a/emulators/aqemu/Makefile +++ b/emulators/aqemu/Makefile @@ -7,9 +7,9 @@ CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S,.0$,,}/ MAINTAINER= makc@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 uic_build moc_build rcc_build \ USES= cmake WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S,.0$,,} -MAN1= aqemu.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/emulators/aqemu/pkg-plist b/emulators/aqemu/pkg-plist index 49f33cca102..4dfb93eb43d 100644 --- a/emulators/aqemu/pkg-plist +++ b/emulators/aqemu/pkg-plist @@ -1,4 +1,5 @@ bin/aqemu +man/man1/aqemu.1.gz share/applications/aqemu.desktop share/aqemu/German.qm share/aqemu/Russian.qm diff --git a/ftp/plasma-applet-ftpmonitor/Makefile b/ftp/plasma-applet-ftpmonitor/Makefile index f5b1ab7d782..99971672008 100644 --- a/ftp/plasma-applet-ftpmonitor/Makefile +++ b/ftp/plasma-applet-ftpmonitor/Makefile @@ -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 diff --git a/games/darkplaces/Makefile b/games/darkplaces/Makefile index 9cc5d5b71c8..6aec214ce6a 100644 --- a/games/darkplaces/Makefile +++ b/games/darkplaces/Makefile @@ -11,8 +11,8 @@ DISTNAME= ${PORTNAME}engine${PORTVERSION} MAINTAINER= makc@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> diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile index 2849cc6fe97..7e3aee17b14 100644 --- a/games/glaxium/Makefile +++ b/games/glaxium/Makefile @@ -11,16 +11,14 @@ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= makc@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> diff --git a/games/glaxium/files/patch-Makefile.in b/games/glaxium/files/patch-Makefile.in new file mode 100644 index 00000000000..37ff8100794 --- /dev/null +++ b/games/glaxium/files/patch-Makefile.in @@ -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) diff --git a/games/glaxium/pkg-plist b/games/glaxium/pkg-plist index 2a17d327539..c8949385a61 100644 --- a/games/glaxium/pkg-plist +++ b/games/glaxium/pkg-plist @@ -1,4 +1,5 @@ bin/glaxium +man/man6/glaxium.6.gz %%DATADIR%%/samples/detection.wav %%DATADIR%%/samples/explode1.wav %%DATADIR%%/samples/explode2.wav diff --git a/games/golly/Makefile b/games/golly/Makefile index 6939c681506..85fa6493e59 100644 --- a/games/golly/Makefile +++ b/games/golly/Makefile @@ -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> diff --git a/games/hex-a-hop/Makefile b/games/hex-a-hop/Makefile index 71d9ce3da88..2c38610a884 100644 --- a/games/hex-a-hop/Makefile +++ b/games/hex-a-hop/Makefile @@ -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} diff --git a/games/hexxagon/Makefile b/games/hexxagon/Makefile index 52d789e7ea0..4482e426b55 100644 --- a/games/hexxagon/Makefile +++ b/games/hexxagon/Makefile @@ -9,15 +9,13 @@ MASTER_SITES= http://www.nesqi.se/hexxagon/hexxagon/download/ MAINTAINER= makc@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> diff --git a/games/kmancala/Makefile b/games/kmancala/Makefile index cabed15d040..b698d078cd0 100644 --- a/games/kmancala/Makefile +++ b/games/kmancala/Makefile @@ -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> diff --git a/games/supertux-devel/Makefile b/games/supertux-devel/Makefile index 926eec93c2b..20d5bac54be 100644 --- a/games/supertux-devel/Makefile +++ b/games/supertux-devel/Makefile @@ -7,12 +7,12 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} PKGNAMESUFFIX= -devel MAINTAINER= makc@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 diff --git a/games/supertux/Makefile b/games/supertux/Makefile index e1891d6fabb..343a7228a6a 100644 --- a/games/supertux/Makefile +++ b/games/supertux/Makefile @@ -3,23 +3,22 @@ PORTNAME= supertux PORTVERSION= 0.1.3 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MAINTAINER= makc@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 diff --git a/games/trigger/Makefile b/games/trigger/Makefile index 531e98bdf4f..8b7eb129f2d 100644 --- a/games/trigger/Makefile +++ b/games/trigger/Makefile @@ -13,7 +13,7 @@ MAINTAINER= makc@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> diff --git a/games/trophy/Makefile b/games/trophy/Makefile index 40b0128b897..3b824db6036 100644 --- a/games/trophy/Makefile +++ b/games/trophy/Makefile @@ -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> diff --git a/games/trophy/pkg-plist b/games/trophy/pkg-plist index 03d4b257cc1..d848b4efffb 100644 --- a/games/trophy/pkg-plist +++ b/games/trophy/pkg-plist @@ -1,4 +1,5 @@ bin/trophy +man/man6/trophy.6.gz share/applications/trophy.desktop share/pixmaps/trophy.png %%DATADIR%%/cars/dust.tga diff --git a/games/warmux/Makefile b/games/warmux/Makefile index 6faeff391f3..666eae647d7 100644 --- a/games/warmux/Makefile +++ b/games/warmux/Makefile @@ -11,8 +11,8 @@ MASTER_SITES= http://download.gna.org/${PORTNAME}/ \ MAINTAINER= makc@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} -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: @@ -63,7 +59,7 @@ PLIST_SUB+= SERVER="@comment " .endif .if ${PORT_OPTIONS:MFRIBIDI} -LIB_DEPENDS+= fribidi:${PORTSDIR}/converters/fribidi +LIB_DEPENDS+= libfribidi.so:${PORTSDIR}/converters/fribidi CONFIGURE_ARGS+= --enable-fribidi .else CONFIGURE_ARGS+= --disable-fribidi diff --git a/games/warmux/pkg-plist b/games/warmux/pkg-plist index 17a10cd25c3..a9c8fe79f71 100644 --- a/games/warmux/pkg-plist +++ b/games/warmux/pkg-plist @@ -2,6 +2,7 @@ bin/warmux %%SERVER%%bin/warmux-index-server bin/warmux-list-games %%SERVER%%bin/warmux-server +man/man6/warmux.6.gz share/applications/warmux.desktop %%NLS%%share/locale/bg/LC_MESSAGES/warmux.mo %%NLS%%share/locale/bs/LC_MESSAGES/warmux.mo diff --git a/graphics/povray-meta/Makefile b/graphics/povray-meta/Makefile index dc5890b7d77..40dfc782c2b 100644 --- a/graphics/povray-meta/Makefile +++ b/graphics/povray-meta/Makefile @@ -26,7 +26,7 @@ OPTIONS_SINGLE= DEFAULT OPTIONS_DEFAULT= POVRAY${DEFAULT_VER} DEFAULT${DEFAULT_VER} .for ver in ${POV_VERSIONS_ALL} -POVRAY${ver}_BIN= ${LOCALBASE}/bin/povray${ver} +POVRAY${ver}_BIN= povray${ver} POVRAY${ver}_PORT= graphics/povray${ver} OPTIONS_MULTI_POVRAY+= POVRAY${ver} @@ -36,7 +36,6 @@ POVRAY${ver}_DESC= Install graphics/povray${ver} DEFAULT${ver}_DESC= Create link bin/povray -> bin/povray${ver} .endfor -NO_STAGE= yes .include <bsd.port.options.mk> .for ver in ${POV_VERSIONS_ALL} @@ -45,11 +44,11 @@ PORT_OPTIONS+= POVRAY${ver} POV_VERSION= ${ver} . endif . if ${PORT_OPTIONS:MPOVRAY${ver}} -RUN_DEPENDS+= ${POVRAY${ver}_BIN}:${PORTSDIR}/${POVRAY${ver}_PORT} +RUN_DEPENDS+= ${LOCALBASE}/bin/${POVRAY${ver}_BIN}:${PORTSDIR}/${POVRAY${ver}_PORT} . endif .endfor do-install: - ${LN} -s ${POVRAY${POV_VERSION}_BIN} ${PREFIX}/bin/povray + ${LN} -s ${POVRAY${POV_VERSION}_BIN} ${STAGEDIR}${PREFIX}/bin/povray .include <bsd.port.mk> diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile index cf9f85741df..3090c301563 100644 --- a/graphics/xaos/Makefile +++ b/graphics/xaos/Makefile @@ -10,11 +10,11 @@ MASTER_SITES= SF/${PORTNAME}/XaoS/${PORTVERSION} MAINTAINER= makc@FreeBSD.org COMMENT= Real-time fractal browser -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png +USES= gmake USE_XORG= x11 xext GNU_CONFIGURE= yes -USE_GMAKE= yes OPTIONS_DEFINE= GTK2 PTHREAD NLS GTK2_DESC= GTK+ User Interface (experimental) @@ -26,14 +26,12 @@ CONFIGURE_ARGS= --with-aa-driver=no --with-dga-driver=no \ --with-ggi-driver=no --with-svga-driver=no \ --with-sffe=no -MAN6= xaos.6 INFO= xaos PLIST_SUB+= XAOSDIR="share/XaoS" DESKTOP_ENTRIES= "XaoS" "${COMMENT}" "" "xaos" "" false -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MPTHREAD} diff --git a/graphics/xaos/pkg-plist b/graphics/xaos/pkg-plist index 4318dea19b7..71fb9f2c884 100644 --- a/graphics/xaos/pkg-plist +++ b/graphics/xaos/pkg-plist @@ -1,4 +1,5 @@ bin/xaos +man/man6/xaos.6.gz %%XAOSDIR%%/catalogs/README %%XAOSDIR%%/catalogs/cesky.cat %%XAOSDIR%%/catalogs/deutsch.cat diff --git a/irc/konversation-kde4/Makefile b/irc/konversation-kde4/Makefile index e3ab0b922d0..e3a92e02554 100644 --- a/irc/konversation-kde4/Makefile +++ b/irc/konversation-kde4/Makefile @@ -18,5 +18,4 @@ USES= cmake USE_KDE4= kdeprefix pimlibs automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build -NO_STAGE= yes .include <bsd.port.mk> diff --git a/irc/kvirc-qt4/Makefile b/irc/kvirc-qt4/Makefile index 9e50d01ae95..86f7fb56424 100644 --- a/irc/kvirc-qt4/Makefile +++ b/irc/kvirc-qt4/Makefile @@ -7,5 +7,4 @@ COMMENT= Qt4 based IRC client CONFLICTS= kvirc-4.* MASTERDIR= ${.CURDIR}/../kvirc -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile index 27a55ddc23e..f4f3a85e83c 100644 --- a/irc/kvirc/Makefile +++ b/irc/kvirc/Makefile @@ -32,9 +32,6 @@ CMAKE_ARGS= -DWANT_ESD=no -DWANT_DOXYGEN=no \ INSTALLS_ICONS= yes USE_LDCONFIG= yes -MAN1= kvirc.1 -MANLANG= "" de fr it pt uk - OPTIONS_DEFINE= AUDIOFILE GSM PERL PYTHON DEBUG AUDIOFILE_DESC= Support for various audio formats @@ -50,7 +47,6 @@ WEBKIT_DESC= Build with QtWebkit support PLIST_SUB+= VER="${PORTVERSION:R}" -NO_STAGE= yes .include <bsd.port.options.mk> .if defined(PKGNAMESUFFIX) @@ -77,13 +73,13 @@ CMAKE_ARGS+= -DWITH_DEBUG=yes -DVERBOSE=yes #audio support .if ${PORT_OPTIONS:MAUDIOFILE} -LIB_DEPENDS+= audiofile.0:${PORTSDIR}/audio/libaudiofile +LIB_DEPENDS+= libaudiofile.so:${PORTSDIR}/audio/libaudiofile .else CMAKE_ARGS+= -DWITHOUT_AUDIOFILE=yes .endif .if ${PORT_OPTIONS:MGSM} -LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm +LIB_DEPENDS+= libgsm.so:${PORTSDIR}/audio/gsm .else CMAKE_ARGS+= -DWANT_GSM=no .endif diff --git a/irc/kvirc/pkg-plist b/irc/kvirc/pkg-plist index 99548663076..c605fb7f34a 100644 --- a/irc/kvirc/pkg-plist +++ b/irc/kvirc/pkg-plist @@ -74,6 +74,12 @@ lib/kvirc/%%VER%%/modules/libkviwindow.so lib/libkvilib.so lib/libkvilib.so.4 lib/libkvilib.so.4.2.0 +man/man1/kvirc.1.gz +man/de/man1/kvirc.1.gz +man/fr/man1/kvirc.1.gz +man/it/man1/kvirc.1.gz +man/pt/man1/kvirc.1.gz +man/uk/man1/kvirc.1.gz share/applications/kvirc.desktop %%KDE%%share/apps/kvirc/kvirc.notifyrc share/icons/hicolor/128x128/apps/kvirc.png diff --git a/irc/quassel/Makefile b/irc/quassel/Makefile index 807a66ed481..a78166c5ba0 100644 --- a/irc/quassel/Makefile +++ b/irc/quassel/Makefile @@ -7,9 +7,9 @@ CATEGORIES= irc MASTER_SITES= http://www.quassel-irc.org/pub/ MAINTAINER= makc@FreeBSD.org -COMMENT= Qt4 based distributed IRC client +COMMENT= Qt 4 based distributed IRC client -LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo +LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo USE_BZIP2= yes USES= cmake:outsource @@ -31,7 +31,6 @@ CMAKE_ARGS+= -DWANT_MONO=${QUASSEL_MONO} \ -DWANT_QTCLIENT=${QUASSEL_CLIENT} \ -DWITH_LIBINDICATE=OFF -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} @@ -47,7 +46,7 @@ PLIST= ${PKGDIR}/pkg-plist.kde CMAKE_ARGS+= -DWITH_KDE=OFF . endif USE_QT4+= dbus gui phonon webkit xml xmlpatterns -LIB_DEPENDS+= dbusmenu-qt:${PORTSDIR}/devel/libdbusmenu-qt +LIB_DEPENDS+= libdbusmenu-qt.so:${PORTSDIR}/devel/libdbusmenu-qt PLIST_SUB+= MONO_OR_CLIENT="" .else PLIST_SUB+= MONO_OR_CLIENT="@comment " @@ -62,7 +61,7 @@ PLIST_SUB+= MONO="@comment " .endif .if ${PORT_OPTIONS:MCORE} -LIB_DEPENDS+= qca.2:${PORTSDIR}/devel/qca +LIB_DEPENDS+= libqca.so:${PORTSDIR}/devel/qca USE_QT4+= sql-sqlite3_run QUASSEL_CORE= ON PLIST_SUB+= CORE="" @@ -92,9 +91,9 @@ pre-configure: ${REINPLACE_CMD} -e 's,knotifyconfig,$${KDE4_KNOTIFYCONFIG_LIBRARY},' \ ${WRKSRC}/CMakeLists.txt -post-install: -.if ${PORT_OPTIONS:MCORE} - @${CAT} ${PKGMESSAGE} +.if ${PORT_OPTIONS:MKDE} +pre-su-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.d .endif .include <bsd.port.mk> diff --git a/math/liborigin/Makefile b/math/liborigin/Makefile index 75ce968b4be..4d324aaabf7 100644 --- a/math/liborigin/Makefile +++ b/math/liborigin/Makefile @@ -22,7 +22,6 @@ PORTDOCS= * OPTIONS_DEFINE= DOXYGEN DOXYGEN_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen -NO_STAGE= yes .include <bsd.port.options.mk> .if ! ${PORT_OPTIONS:MDOXYGEN} diff --git a/math/qtiplot-doc/Makefile b/math/qtiplot-doc/Makefile index 677730d5585..9d8bb2c7ba4 100644 --- a/math/qtiplot-doc/Makefile +++ b/math/qtiplot-doc/Makefile @@ -19,14 +19,13 @@ USE_BZIP2= yes DATADIR= ${PREFIX}/share/qtiplot/manual WRKSRC= ${WRKDIR}/${DISTNAME}/manual -NO_STAGE= yes post-patch: cd ${WRKSRC} && ${REINPLACE_CMD} -e "s:/usr/local:${LOCALBASE}:g" \ docbook-en/index.docbook qtiplot.dsl qtiplot_html.xsl Makefile do-install: - ${MKDIR} ${DATADIR} + ${MKDIR} ${STAGEDIR}${DATADIR} ${RM} -rf ${WRKSRC}/html/pics-it - cd ${WRKSRC}/html && ${COPYTREE_SHARE} \* ${DATADIR} + cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} .include <bsd.port.mk> diff --git a/math/qtoctave/Makefile b/math/qtoctave/Makefile index 1434e2c773c..8500554c1d3 100644 --- a/math/qtoctave/Makefile +++ b/math/qtoctave/Makefile @@ -6,7 +6,7 @@ CATEGORIES= math MASTER_SITES= http://forja.rediris.es/frs/download.php/2054/ MAINTAINER= makc@FreeBSD.org -COMMENT= Qt4 frontend for Octave +COMMENT= Qt 4 frontend for Octave RUN_DEPENDS= octave:${PORTSDIR}/math/octave @@ -16,7 +16,6 @@ USE_QT4= designer gui network script svg xml \ USES= cmake CMAKE_ARGS+= -DWITH_UseRPMTools:Bool=Off -NO_STAGE= yes post-patch: ${REINPLACE_CMD} -e '/COMMAND "lrelease"/s,lrelease,$${QT_LRELEASE_EXECUTABLE},' \ ${WRKSRC}/qtoctave/src/CMakeLists.txt diff --git a/math/scilab-toolbox-sivp/Makefile b/math/scilab-toolbox-sivp/Makefile index 24e932ec2ca..ba9735a092a 100644 --- a/math/scilab-toolbox-sivp/Makefile +++ b/math/scilab-toolbox-sivp/Makefile @@ -11,11 +11,11 @@ MAINTAINER= makc@FreeBSD.org COMMENT= Scilab Image and Video Processing Toolbox BUILD_DEPENDS= ${SCILAB_CMD}:${PORTSDIR}/math/scilab -LIB_DEPENDS= opencv_legacy.2:${PORTSDIR}/graphics/opencv +LIB_DEPENDS= libopencv_legacy.so:${PORTSDIR}/graphics/opencv RUN_DEPENDS= ${SCILAB_CMD}:${PORTSDIR}/math/scilab USES= pkgconfig -USE_XZ= yes +USE_XZ= yes SCILAB_CMD= ${LOCALBASE}/bin/scilab CONTRIBDIR?= share/scilab/contrib @@ -28,7 +28,6 @@ OPTIONS_DEFINE= HELP OPTIONS_DEFAULT= ${OPTIONS_DEFINE} HELP_DESC= Build help files (requires scilab with gui support) -NO_STAGE= yes .include <bsd.port.options.mk> .if !${PORT_OPTIONS:MHELP} @@ -36,7 +35,7 @@ SCILAB_ARGS= -nogui PLIST_SUB+= HELP="@comment " EXTRA_PATCHES+= ${FILESDIR}/extrapatch-etc__SIVP.start .else -USE_DISPLAY= yes +USES+= display:build MAKE_ENV= LC_ALL="C" PLIST_SUB+= HELP="" TOOLBOX_SUBDIRS+= jar @@ -55,37 +54,21 @@ post-patch: pre-build: ${FIND} -d ${WRKSRC} \( -name '*.orig' -or -name '*.bak' \) -delete -.if ${PORT_OPTIONS:MHELP} && !defined(DISPLAY) - @if [ -f ${WRKDIR}/.Xvfb.pid ]; then \ - ${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \ - ${RM} -f ${WRKDIR}/.Xvfb.pid ; \ - fi - ${LOCALBASE}/bin/Xvfb :1001 -screen 0 800x600x24 -fp ${LOCALBASE}/lib/X11/fonts/misc > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid - @sleep 5 -.endif do-build: cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${SCILAB_CMD} ${SCILAB_ARGS} -f builder.sce -post-build: -.if ${PORT_OPTIONS:MHELP} && !defined(DISPLAY) - @if [ -f ${WRKDIR}/.Xvfb.pid ]; then \ - ${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \ - ${RM} -f ${WRKDIR}/.Xvfb.pid ; \ - fi -.endif - do-install: - ${MKDIR} ${TOOLBOXDIR}/sci_gateway/cpp - ${INSTALL_DATA} ${WRKSRC}/loader.sce ${TOOLBOXDIR} + ${MKDIR} ${STAGEDIR}${TOOLBOXDIR}/sci_gateway/cpp + ${INSTALL_DATA} ${WRKSRC}/loader.sce ${STAGEDIR}${TOOLBOXDIR} ${INSTALL_DATA} ${WRKSRC}/sci_gateway/loader_gateway.sce \ - ${TOOLBOXDIR}/sci_gateway + ${STAGEDIR}${TOOLBOXDIR}/sci_gateway cd ${WRKSRC}/sci_gateway/cpp && \ - ${INSTALL_DATA} loader.sce ${TOOLBOXDIR}/sci_gateway/cpp && \ - ${INSTALL_PROGRAM} libgw_sivp.so ${TOOLBOXDIR}/sci_gateway/cpp + ${INSTALL_DATA} loader.sce ${STAGEDIR}${TOOLBOXDIR}/sci_gateway/cpp && \ + ${INSTALL_PROGRAM} libgw_sivp.so ${STAGEDIR}${TOOLBOXDIR}/sci_gateway/cpp .for d in ${TOOLBOX_SUBDIRS} - cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${TOOLBOXDIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${TOOLBOXDIR} .endfor .include <bsd.port.mk> diff --git a/math/scilab-toolbox-swt/Makefile b/math/scilab-toolbox-swt/Makefile index e8f98e231e7..3acfc0eb386 100644 --- a/math/scilab-toolbox-swt/Makefile +++ b/math/scilab-toolbox-swt/Makefile @@ -27,7 +27,6 @@ OPTIONS_DEFAULT= HELP HELP_DESC= Build help files (requires scilab with gui support) SIVP_DESC= Enable Image and Video support -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MSIVP} @@ -61,15 +60,15 @@ do-build: ${SETENV} ${MAKE_ENV} ${SCILAB_CMD} ${SCILAB_ARGS} -f builder.sce do-install: - ${MKDIR} ${TOOLBOXDIR}/sci_gateway/c - ${INSTALL_DATA} ${WRKSRC}/loader.sce ${TOOLBOXDIR} + ${MKDIR} ${STAGEDIR}${TOOLBOXDIR}/sci_gateway/c + ${INSTALL_DATA} ${WRKSRC}/loader.sce ${STAGEDIR}${TOOLBOXDIR} ${INSTALL_DATA} ${WRKSRC}/sci_gateway/loader_gateway.sce \ - ${TOOLBOXDIR}/sci_gateway + ${STAGEDIR}${TOOLBOXDIR}/sci_gateway cd ${WRKSRC}/sci_gateway/c && \ - ${INSTALL_DATA} loader.sce ${TOOLBOXDIR}/sci_gateway/c && \ - ${INSTALL_PROGRAM} libswt_c.so ${TOOLBOXDIR}/sci_gateway/c + ${INSTALL_DATA} loader.sce ${STAGEDIR}${TOOLBOXDIR}/sci_gateway/c && \ + ${INSTALL_PROGRAM} libswt_c.so ${STAGEDIR}${TOOLBOXDIR}/sci_gateway/c .for d in ${TOOLBOX_SUBDIRS} - cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${TOOLBOXDIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${TOOLBOXDIR} .endfor .include <bsd.port.mk> diff --git a/math/speedcrunch/Makefile b/math/speedcrunch/Makefile index cc1c03e2c84..1c5037cfa7d 100644 --- a/math/speedcrunch/Makefile +++ b/math/speedcrunch/Makefile @@ -8,19 +8,17 @@ CATEGORIES= math MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MAINTAINER= makc@FreeBSD.org -COMMENT= A desktop calculator for power users +COMMENT= Desktop calculator for power users USE_QT4= qmake_build moc_build rcc_build uic_build gui xml USES= cmake CMAKE_SOURCE_PATH= src - LRELEASE_CMD= ${LOCALBASE}/bin/lrelease-qt4 LRELEASE_ARGS= -compress -silent OPTIONS_DEFINE= NLS -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} diff --git a/misc/kde-thumbnailer-chm/Makefile b/misc/kde-thumbnailer-chm/Makefile index 2efe067045a..60593b82a14 100644 --- a/misc/kde-thumbnailer-chm/Makefile +++ b/misc/kde-thumbnailer-chm/Makefile @@ -9,7 +9,7 @@ DISTNAME= 153410-${PORTNAME}-${PORTVERSION} MAINTAINER= makc@FreeBSD.org COMMENT= KDE thumbnail generator for CHM files -LIB_DEPENDS= chm.0:${PORTSDIR}/misc/chmlib +LIB_DEPENDS= libchm.so:${PORTSDIR}/misc/chmlib USES= cmake USE_KDE4= kdeprefix kdelibs automoc4 @@ -19,5 +19,4 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PLIST_FILES= lib/kde4/chmthumbnail.so \ share/kde4/services/chmthumbnail.desktop -NO_STAGE= yes .include <bsd.port.mk> diff --git a/net-im/psimedia/Makefile b/net-im/psimedia/Makefile index 71b4f92ce65..6dcf9c52bfe 100644 --- a/net-im/psimedia/Makefile +++ b/net-im/psimedia/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= http://delta.affinix.com/download/psimedia/ MAINTAINER= makc@FreeBSD.org COMMENT= Voice and video API for Psi-like IM clients -LIB_DEPENDS= oil-0.3:${PORTSDIR}/devel/liboil +LIB_DEPENDS= liboil-0.3.so:${PORTSDIR}/devel/liboil USES= pkgconfig USE_BZIP2= yes @@ -21,6 +21,7 @@ QT_NONSTANDARD= yes CONFIGURE_ARGS= --qtdir=${LOCALBASE} \ --verbose MAKE_JOBS_UNSAFE= yes +DESTDIRNAME= INSTALL_ROOT PSI_PLUGIN_DIR= lib/psi/plugins @@ -32,7 +33,6 @@ CONFIGURE_ARGS+= --debug PLIST_SUB+= DEBUG="" .endif -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ ${WRKSRC}/gstprovider/rwcontrol.h \ @@ -41,12 +41,12 @@ post-patch: ${WRKSRC}/gstprovider/gstcustomelements/gstcustomelements.h do-install: - ${MKDIR} ${PREFIX}/${PSI_PLUGIN_DIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${PSI_PLUGIN_DIR} ${INSTALL_PROGRAM} ${WRKSRC}/gstprovider/libgstprovider.so \ - ${PREFIX}/${PSI_PLUGIN_DIR} + ${STAGEDIR}${PREFIX}/${PSI_PLUGIN_DIR} .if defined(WITH_DEBUG) ${INSTALL_DATA} ${WRKSRC}/gstprovider/libgstprovider.so.debug \ - ${PREFIX}/${PSI_PLUGIN_DIR} + ${STAGEDIR}${PREFIX}/${PSI_PLUGIN_DIR} .endif .include <bsd.port.mk> diff --git a/net-p2p/ktorrent/Makefile b/net-p2p/ktorrent/Makefile index 1107ce01d02..8cd3e08ec61 100644 --- a/net-p2p/ktorrent/Makefile +++ b/net-p2p/ktorrent/Makefile @@ -11,9 +11,9 @@ MAINTAINER= makc@FreeBSD.org COMMENT= BitTorrent client for KDE BUILD_DEPENDS= ${LOCALBASE}/include/boost/bind.hpp:${PORTSDIR}/devel/boost-libs -LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib \ - gmp:${PORTSDIR}/math/gmp \ - ktorrent.5:${PORTSDIR}/net-p2p/libktorrent +LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib \ + libgmp.so:${PORTSDIR}/math/gmp \ + libktorrent.so:${PORTSDIR}/net-p2p/libktorrent USE_BZIP2= yes USE_KDE4= kdelibs kdehier kdeprefix automoc4 pimlibs workspace @@ -30,7 +30,6 @@ PLIST_SUB+= SHLIB_VER=${SHLIB_VER} \ CMAKE_ARGS+= -DENABLE_KIO_MAGNET=1 -NO_STAGE= yes post-patch: ${REINPLACE_CMD} -e 's,ktorrent,$${LIBKTORRENT_LIBRARIES},' \ ${WRKSRC}/plugins/ipfilter/tests/CMakeLists.txt diff --git a/net-p2p/libktorrent/Makefile b/net-p2p/libktorrent/Makefile index 45959dd5a8d..d18617e240e 100644 --- a/net-p2p/libktorrent/Makefile +++ b/net-p2p/libktorrent/Makefile @@ -7,12 +7,12 @@ CATEGORIES= net-p2p kde MASTER_SITES= http://ktorrent.org/downloads/${DISTVERSION:C,^1,4,:C,-.*,,}/ MAINTAINER= makc@FreeBSD.org -COMMENT= Torrent library split from KTorrent +COMMENT= Torrent library from KTorrent project BUILD_DEPENDS= ${LOCALBASE}/include/boost/concept_check.hpp:${PORTSDIR}/devel/boost-libs -LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt \ - gmp:${PORTSDIR}/math/gmp \ - qca:${PORTSDIR}/devel/qca +LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ + libgmp.so:${PORTSDIR}/math/gmp \ + libqca.so:${PORTSDIR}/devel/qca USE_BZIP2= yes USE_KDE4= kdelibs kdehier kdeprefix automoc4 @@ -24,5 +24,4 @@ SHLIB_VER= 5.0.1 PLIST_SUB+= SHLIB_VER=${SHLIB_VER} \ SHLIB_SHVER=${SHLIB_VER:R:R} -NO_STAGE= yes .include <bsd.port.mk> diff --git a/net/knemo-kde4/Makefile b/net/knemo-kde4/Makefile index eb205fe50aa..0ada2cb2e29 100644 --- a/net/knemo-kde4/Makefile +++ b/net/knemo-kde4/Makefile @@ -16,6 +16,4 @@ USE_KDE4= kdeprefix kdelibs workspace automoc4 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -NO_STAGE= yes - .include <bsd.port.mk> diff --git a/print/hplip/Makefile b/print/hplip/Makefile index 253da7bd5ca..fe2f084b8c0 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -9,11 +9,11 @@ MASTER_SITES= SF MAINTAINER= makc@FreeBSD.org COMMENT= Drivers and utilities for HP Printers and All-in-One devices -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - cupsdriver.1:${PORTSDIR}/print/cups-base \ - cups.2:${PORTSDIR}/print/cups-client \ - cupsimage.2:${PORTSDIR}/print/cups-image \ - dbus-1.3:${PORTSDIR}/devel/dbus +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libcupsdriver.so:${PORTSDIR}/print/cups-base \ + libcups.so:${PORTSDIR}/print/cups-client \ + libcupsimage.so:${PORTSDIR}/print/cups-image \ + libdbus-1.so:${PORTSDIR}/devel/dbus RUN_DEPENDS= espgs:${PORTSDIR}/print/cups-pstoraster \ foomatic-rip:${PORTSDIR}/print/foomatic-filters \ ${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus \ @@ -81,7 +81,6 @@ SNMP_DESC= Network/JetDirect support SCAN_DESC= Scanning support XSANE_DESC= Install XSane for scanning (requires SCAN) -NO_STAGE= yes .include <bsd.port.options.mk> USB_INCLUDE= /usr/include @@ -109,7 +108,7 @@ PLIST_SUB+= FAX="@comment " .if ${PORT_OPTIONS:MSNMP} USE_OPENSSL= yes -LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp +LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp CONFIGURE_ARGS+= --enable-network-build . if ${ARCH} == i386 # http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/144833 @@ -123,7 +122,7 @@ CONFIGURE_ARGS+= --disable-network-build . if ${PORT_OPTIONS:MXSANE} RUN_DEPENDS+= xsane:${PORTSDIR}/graphics/xsane . endif -LIB_DEPENDS+= sane.1:${PORTSDIR}/graphics/sane-backends +LIB_DEPENDS+= libsane.so:${PORTSDIR}/graphics/sane-backends RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/PIL/_imaging.so:${PORTSDIR}/graphics/py-imaging CONFIGURE_ARGS+= --enable-scan-build PLIST_SUB+= SCAN="" @@ -177,14 +176,10 @@ post-patch: post-install: .if ${PORT_OPTIONS:MQT} - ${INSTALL_DATA} ${WRKSRC}/hplip-systray.desktop ${PREFIX}/etc/xdg/autostart/hplip-systray.desktop + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/autostart + ${INSTALL_DATA} ${WRKSRC}/hplip-systray.desktop ${STAGEDIR}${PREFIX}/etc/xdg/autostart/hplip-systray.desktop .endif - ${MKDIR} ${PREFIX}/etc/hp - ${INSTALL_DATA} ${WRKSRC}/hplip.conf ${PREFIX}/etc/hp/hplip.conf.sample - if [ ! -f ${PREFIX}/etc/hp/hplip.conf ]; then \ - ${INSTALL_DATA} ${PREFIX}/etc/hp/hplip.conf.sample \ - ${PREFIX}/etc/hp/hplip.conf; \ - fi - @${CAT} ${PKGMESSAGE} + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/hp + ${INSTALL_DATA} ${WRKSRC}/hplip.conf ${STAGEDIR}${PREFIX}/etc/hp/hplip.conf.sample .include <bsd.port.mk> diff --git a/print/texvc/Makefile b/print/texvc/Makefile index 5fceddcadbe..23c91f23b87 100644 --- a/print/texvc/Makefile +++ b/print/texvc/Makefile @@ -10,9 +10,9 @@ DISTNAME= ${PORTNAME}-linux-x86-${PORTVERSION} MAINTAINER= makc@FreeBSD.org COMMENT= Convert latex equations to HTML, MathML, PNG +USES= gmake USE_OCAML= yes NO_OCAML_RUNDEPENDS= yes -USE_GMAKE= yes BUILD_WRKSRC= ${WRKSRC}/src PLIST_FILES= bin/texvc @@ -21,7 +21,6 @@ OPTIONS_DEFINE= RASTER OPTIONS_DEFAULT= ${OPTIONS_DEFINE} RASTER_DESC= rasterization support -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MRASTER} @@ -31,6 +30,6 @@ RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick .endif do-install: - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/texvc ${PREFIX}/bin + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/texvc ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> diff --git a/science/kst2/Makefile b/science/kst2/Makefile index fb508c7ae2c..76abe3a168c 100644 --- a/science/kst2/Makefile +++ b/science/kst2/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/Kst%20${DISTVERSION:C/-r.*//}/ MAINTAINER= makc@FreeBSD.org COMMENT= Data viewing and plotting tool -LIB_DEPENDS= gsl:${PORTSDIR}/math/gsl +LIB_DEPENDS= libgsl.so:${PORTSDIR}/math/gsl USES= cmake USE_QT4= gui xml designer svg opengl \ @@ -18,12 +18,13 @@ USE_QT4= gui xml designer svg opengl \ USE_LDCONFIG= yes CMAKE_SOURCE_PATH= ${WRKSRC}/cmake -CMAKE_ARGS+= -Dkst_install_prefix=${PREFIX} +CMAKE_ARGS+= -Dkst_install_prefix=${PREFIX} \ + -Dkst_pch=off -MAN1= kst2.1 PLIST_SUB= SHLIB_VER=${PORTVERSION} OPTIONS_DEFINE= FITS MATLAB NETCDF +OPTIONS_SUB= yes FITS_DESC= Support for data in FITS format FITS_LIB_DEPENDS= libcfitsio.so:${PORTSDIR}/astro/cfitsio @@ -34,9 +35,6 @@ MATLAB_BUILD_DEPENDS= ${LOCALBASE}/lib/libmatio.a:${PORTSDIR}/math/matio NETCDF_DESC= Support for data in NetCDF format NETCDF_LIB_DEPENDS= libnetcdf.so:${PORTSDIR}/science/netcdf -OPTIONS_SUB= yes - -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: diff --git a/science/kst2/pkg-plist b/science/kst2/pkg-plist index c887541ae05..5a4b9371e2b 100644 --- a/science/kst2/pkg-plist +++ b/science/kst2/pkg-plist @@ -61,6 +61,7 @@ lib/libkst2math.so.%%SHLIB_VER%% lib/libkst2widgets.so lib/libkst2widgets.so.2 lib/libkst2widgets.so.%%SHLIB_VER%% +man/man1/kst2.1.gz share/applications/kst2.desktop share/icons/hicolor/128x128/apps/application-x-kst.png share/icons/hicolor/128x128/apps/kst.png diff --git a/science/pyteomics.biolccc/Makefile b/science/pyteomics.biolccc/Makefile index 9dcc3e71bcf..e0ca72d7ce2 100644 --- a/science/pyteomics.biolccc/Makefile +++ b/science/pyteomics.biolccc/Makefile @@ -12,5 +12,4 @@ COMMENT= Python bindings for BioLCCC USE_PYTHON= yes USE_PYDISTUTILS= yes -NO_STAGE= yes .include <bsd.port.mk> diff --git a/science/pyteomics/Makefile b/science/pyteomics/Makefile index 5c066ea92d1..191fc79afb5 100644 --- a/science/pyteomics/Makefile +++ b/science/pyteomics/Makefile @@ -16,5 +16,4 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \ USE_PYTHON= yes USE_PYDISTUTILS= yes -NO_STAGE= yes .include <bsd.port.mk> diff --git a/security/pinentry-curses/Makefile b/security/pinentry-curses/Makefile index c38bffca673..28ccee26e8a 100644 --- a/security/pinentry-curses/Makefile +++ b/security/pinentry-curses/Makefile @@ -14,5 +14,4 @@ PORT_OPTIONS+= NCURSES MASTERDIR= ${.CURDIR}/../pinentry -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/security/pinentry-gtk/Makefile b/security/pinentry-gtk/Makefile index bab630a480c..50b52e27f10 100644 --- a/security/pinentry-gtk/Makefile +++ b/security/pinentry-gtk/Makefile @@ -14,5 +14,4 @@ PORT_OPTIONS+= GTK MASTERDIR= ${.CURDIR}/../pinentry -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/security/pinentry-gtk2/Makefile b/security/pinentry-gtk2/Makefile index 7d5d32e7edb..a0371f6ace7 100644 --- a/security/pinentry-gtk2/Makefile +++ b/security/pinentry-gtk2/Makefile @@ -14,5 +14,4 @@ PORT_OPTIONS+= GTK2 MASTERDIR= ${.CURDIR}/../pinentry -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/security/pinentry-qt4/Makefile b/security/pinentry-qt4/Makefile index 4e4c8134937..6cd5753c16e 100644 --- a/security/pinentry-qt4/Makefile +++ b/security/pinentry-qt4/Makefile @@ -13,5 +13,4 @@ PORT_OPTIONS+= QT4 MASTERDIR= ${.CURDIR}/../pinentry -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile index 32c7fac7777..3acbe733d36 100644 --- a/security/pinentry/Makefile +++ b/security/pinentry/Makefile @@ -11,8 +11,8 @@ MASTER_SITE_SUBDIR= pinentry MAINTAINER= makc@FreeBSD.org COMMENT?= Collection of simple PIN or passphrase entry dialogs -LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt \ - ksba.19:${PORTSDIR}/security/libksba +LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ + libksba.so:${PORTSDIR}/security/libksba CONFLICTS_INSTALL?= pinentry-[a-z]* @@ -38,7 +38,6 @@ QT4_DESC= Qt 4 frontend PKGNAMESUFFIX= ${PINENTRY_SLAVE} .endif -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MQT4} diff --git a/sysutils/krename-kde4/Makefile b/sysutils/krename-kde4/Makefile index a8481c29f90..575d10a299b 100644 --- a/sysutils/krename-kde4/Makefile +++ b/sysutils/krename-kde4/Makefile @@ -18,7 +18,6 @@ USES= cmake:outsource USE_KDE4= kdeprefix kdelibs automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build -NO_STAGE= yes post-patch: ${REINPLACE_CMD} 's,FREETYPE_INCLUDE_DIR,FREETYPE_INCLUDE_DIR_freetype2,' \ ${WRKSRC}/src/CMakeLists.txt diff --git a/sysutils/plasma-applet-apcups/Makefile b/sysutils/plasma-applet-apcups/Makefile index 4b8f2819c38..1e7cbcb6a59 100644 --- a/sysutils/plasma-applet-apcups/Makefile +++ b/sysutils/plasma-applet-apcups/Makefile @@ -16,5 +16,4 @@ USES= cmake USE_KDE4= automoc4 kdeprefix kdelibs USE_QT4= qmake_build moc_build rcc_build uic_build -NO_STAGE= yes .include <bsd.port.mk> diff --git a/textproc/ctpl/Makefile b/textproc/ctpl/Makefile index 468dc874469..e97030d3ebc 100644 --- a/textproc/ctpl/Makefile +++ b/textproc/ctpl/Makefile @@ -9,11 +9,8 @@ MAINTAINER= makc@FreeBSD.org COMMENT= C Template (Parser) Library GNU_CONFIGURE= yes -USE_GNOME= glib20 gnomehack -USES= pkgconfig +USE_GNOME= glib20 +USES= pathfix pkgconfig USE_LDCONFIG= yes -MAN1= ctpl.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/textproc/ctpl/pkg-plist b/textproc/ctpl/pkg-plist index 501fbb34b04..dd829d9fca4 100644 --- a/textproc/ctpl/pkg-plist +++ b/textproc/ctpl/pkg-plist @@ -16,6 +16,7 @@ lib/libctpl.la lib/libctpl.so lib/libctpl.so.4 libdata/pkgconfig/ctpl.pc +man/man1/ctpl.1.gz share/gtk-doc/html/ctpl/annotation-glossary.html share/gtk-doc/html/ctpl/api-index-deprecated.html share/gtk-doc/html/ctpl/api-index-full.html diff --git a/textproc/stardict-rptts/Makefile b/textproc/stardict-rptts/Makefile index a26ade4c720..b4e635d0b94 100644 --- a/textproc/stardict-rptts/Makefile +++ b/textproc/stardict-rptts/Makefile @@ -16,8 +16,7 @@ PROJECTHOST= stardict-3 NO_BUILD= yes USE_BZIP2= yes -NO_STAGE= yes do-install: - ${TAR} jxvf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} -C ${PREFIX}/share + ${TAR} jxvf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} -C ${STAGEDIR}${PREFIX}/share .include <bsd.port.mk> diff --git a/www/rekonq/Makefile b/www/rekonq/Makefile index 4ccf30e8467..c7813721d25 100644 --- a/www/rekonq/Makefile +++ b/www/rekonq/Makefile @@ -16,29 +16,20 @@ USE_QT4= script webkit \ OPTIONS_DEFINE= OPERA NEPOMUK OPTIONS_DEFAULT= NEPOMUK + OPERA_DESC= Support for Opera Sync service -NEPOMUK_DESC= Bookmarks tagging via Nepomuk +OPERA_LIB_DEPENDS= libqca.so:${PORTSDIR}/devel/qca \ + libqoauth.so:${PORTSDIR}/net/qoauth +OPERA_CMAKE_OFF= -DWITH_QCA2=off \ + -DWITH_QtOAuth=off -NO_STAGE= yes -.include <bsd.port.options.mk> +NEPOMUK_DESC= Bookmarks tagging via Nepomuk +NEPOMUK_USE= KDE4=nepomuk-core +NEPOMUK_CMAKE_OFF= -DWITH_NepomukCore=off post-patch: ${REINPLACE_CMD} -e \ 's,FIND_PACKAGE(NepomukCore,MACRO_OPTIONAL_FIND_PACKAGE(NepomukCore,' \ ${WRKSRC}/CMakeLists.txt -.if ${PORT_OPTIONS:MNEPOMUK} -USE_KDE4+= nepomuk-core -.else -CMAKE_ARGS+= -DWITH_NepomukCore=off -.endif - -.if ${PORT_OPTIONS:MOPERA} -LIB_DEPENDS+= qca.2:${PORTSDIR}/devel/qca \ - qoauth.1:${PORTSDIR}/net/qoauth -.else -CMAKE_ARGS+= -DWITH_QCA2=off \ - -DWITH_QtOAuth=off -.endif - .include <bsd.port.mk> diff --git a/x11-fonts/fontmatrix/Makefile b/x11-fonts/fontmatrix/Makefile index 27fd36a91e2..671d243ae1a 100644 --- a/x11-fonts/fontmatrix/Makefile +++ b/x11-fonts/fontmatrix/Makefile @@ -8,25 +8,17 @@ CATEGORIES= x11-fonts MASTER_SITES= http://www.fontmatrix.net/archives/ MAINTAINER= makc@FreeBSD.org -COMMENT= A graphical font manager +COMMENT= Graphical font manager RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme +USES= cmake USE_QT4= gui svg network moc_build uic_build rcc_build qmake_build linguist_build INSTALLS_ICONS= yes -USES= cmake - OPTIONS_DEFINE= FONTFORGE -OPTIONS_DEFAULT= ${OPTIONS_DEFINE} -FONTFORGE_DESC= With FontForge editor - -NO_STAGE= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MFONTFORGE} -RUN_DEPENDS+= ${LOCALBASE}/bin/fontforge:${PORTSDIR}/print/fontforge -.endif +FONTFORGE_DESC= Install FontForge editor +FONTFORGE_RUN_DEPENDS= ${LOCALBASE}/bin/fontforge:${PORTSDIR}/print/fontforge post-patch: cd ${WRKSRC}/src && \ diff --git a/x11-themes/gtk-qt4-engine/Makefile b/x11-themes/gtk-qt4-engine/Makefile index 922b05c6959..12fe65d7fa5 100644 --- a/x11-themes/gtk-qt4-engine/Makefile +++ b/x11-themes/gtk-qt4-engine/Makefile @@ -20,7 +20,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME} OPTIONS_DEFINE= BONOBO BONOBO_DESC= Better support for Bonobo (GNOME) framework -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MBONOBO} diff --git a/x11-themes/kde4-style-polyester/Makefile b/x11-themes/kde4-style-polyester/Makefile index f8f7ff9644a..d1ae93dc623 100644 --- a/x11-themes/kde4-style-polyester/Makefile +++ b/x11-themes/kde4-style-polyester/Makefile @@ -13,8 +13,7 @@ COMMENT= KDE style and window decoration USE_BZIP2= yes USE_KDE4= kdelibs kdehier kdeprefix automoc4 -USE_QT4= corelib qmake_build moc_build rcc_build uic_build +USE_QT4= qmake_build moc_build rcc_build uic_build USES= cmake -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-themes/linux-f10-qtcurve-gtk2/Makefile b/x11-themes/linux-f10-qtcurve-gtk2/Makefile index 65645a5b0bb..9bea84afb5e 100644 --- a/x11-themes/linux-f10-qtcurve-gtk2/Makefile +++ b/x11-themes/linux-f10-qtcurve-gtk2/Makefile @@ -16,5 +16,4 @@ USE_LINUX_APPS= gtk2 LINUX_DIST_VER= 10 RPMVERSION= 1.fc10 -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-themes/qtcurve-kde4/Makefile b/x11-themes/qtcurve-kde4/Makefile index 18c68144a95..1f2043d0ace 100644 --- a/x11-themes/qtcurve-kde4/Makefile +++ b/x11-themes/qtcurve-kde4/Makefile @@ -12,8 +12,7 @@ COMMENT= QtCurve KDE4 widget style USE_BZIP2= yes USES= cmake -USE_QT4= corelib qmake_build uic_build moc_build rcc_build +USE_QT4= qmake_build uic_build moc_build rcc_build USE_KDE4= kdelibs workspace kdehier kdeprefix automoc4 -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-themes/qtcurve-qt4/Makefile b/x11-themes/qtcurve-qt4/Makefile index 041f28ff2c6..8bd8e70f907 100644 --- a/x11-themes/qtcurve-qt4/Makefile +++ b/x11-themes/qtcurve-qt4/Makefile @@ -10,10 +10,7 @@ DISTNAME= QtCurve-KDE4-${PORTVERSION} MAINTAINER= makc@FreeBSD.org COMMENT= QtCurve Qt4 widget style -CONFLICTS_BUILD= qt-3.* qt-copy-3.* - USE_BZIP2= yes -USE_GCC= 4.2+ USES= cmake USE_QT4= dbus gui svg imageformats_run \ qmake_build uic_build moc_build rcc_build @@ -24,5 +21,4 @@ CMAKE_ARGS+= -DQTC_QT_ONLY:BOOL=ON \ PLIST_FILES= ${QT_PLUGINDIR_REL}/styles/qtcurve.so PLIST_DIRSTRY= ${QT_PLUGINDIR_REL}/styles -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/gtkchtheme/Makefile b/x11/gtkchtheme/Makefile index 29131df08d4..3a2c6c05643 100644 --- a/x11/gtkchtheme/Makefile +++ b/x11/gtkchtheme/Makefile @@ -13,14 +13,13 @@ COMMENT= GTK2 theme changer USE_BZIP2= yes USES= gmake pkgconfig -USE_GNOME= gnomehack gnomeprefix gtk20 +USE_GNOME= gtk20 -PLIST_FILES= bin/gtk-chtheme -MAN1= gtk-chtheme.1 +PLIST_FILES= bin/gtk-chtheme \ + man/man1/gtk-chtheme.1.gz -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/gtk-chtheme ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/gtk-chtheme.1 ${PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/gtk-chtheme ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/gtk-chtheme.1 ${STAGEDIR}${PREFIX}/man/man1 .include <bsd.port.mk> |