Page MenuHomeFreeBSD

D14699.id43348.diff
No OneTemporary

D14699.id43348.diff

Index: net-p2p/Makefile
===================================================================
--- net-p2p/Makefile
+++ net-p2p/Makefile
@@ -93,8 +93,7 @@
SUBDIR += transmission-cli
SUBDIR += transmission-daemon
SUBDIR += transmission-gtk
- SUBDIR += transmission-qt4
- SUBDIR += transmission-qt5
+ SUBDIR += transmission-qt
SUBDIR += transmission-remote-gui
SUBDIR += tribler
SUBDIR += twister
Index: net-p2p/transmission-qt/Makefile
===================================================================
--- /dev/null
+++ net-p2p/transmission-qt/Makefile
@@ -0,0 +1,70 @@
+# $FreeBSD$
+
+PKGNAMESUFFIX= -${FLAVOR}
+
+MAINTAINER= crees@FreeBSD.org
+COMMENT= Fast and lightweight Qt4 BitTorrent client
+
+LIB_DEPENDS= ${GEN_LIB_DEPENDS} \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
+RUN_DEPENDS= ${GEN_RUN_DEPENDS}
+
+FLAVORS= qt4 qt5
+FLAVOR?= ${FLAVORS:[1]}
+
+qt4_CONFLICTS_INSTALL= transmission-qt5
+qt5_CONFLICTS_INSTALL= transmission-qt4
+
+USES= gettext-runtime:run desktop-file-utils
+
+.if ${FLAVOR} == qt4
+USE_QT4= moc_build qmake_build uic_build rcc_build \
+ corelib gui dbus network xml
+.endif
+
+.if ${FLAVOR} == qt5
+USE_QT5= buildtools_build linguisttools_build qmake_build \
+ core dbus gui network widgets
+.endif
+
+QT_NONSTANDARD= yes
+
+EXTRA_CONF_ARGS=--disable-cli \
+ --disable-daemon \
+ --without-gtk \
+ --disable-mac \
+ --disable-nls
+
+PLIST_SUB= QT_SUFFIX=${_QT_RELNAME}
+
+MASTERDIR= ${.CURDIR}/../transmission-cli
+DESCR= ${.CURDIR}/pkg-descr
+PLIST= ${.CURDIR}/pkg-plist
+
+SLAVEPORT= qt
+
+post-patch: general-patch
+ @${REINPLACE_CMD} -e 's|/share/man|/man|g ; /PKGCONFIG/s| openssl||g' \
+ ${WRKSRC}/qt/qtr.pro
+ @${ECHO_CMD} 'LIBS += -l${PORT_OPTIONS:M*SSL:tl:S/openssl/crypto/}' \
+ >>${WRKSRC}/qt/qtr.pro
+
+post-build:
+ @(cd ${WRKSRC}/qt && ${QMAKE} ${QMAKE_ARGS} qtr.pro && ${MAKE_CMD})
+
+do-install:
+ @(cd ${WRKSRC}/qt && \
+ ${SETENV} INSTALL_ROOT=${STAGEDIR}${PREFIX} ${MAKE_CMD} install)
+
+post-install: general-install
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/transmission-qt
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/qt/README.txt \
+ ${STAGEDIR}${DOCSDIR}/README-${FLAVOR}
+ ${INSTALL_DATA} ${WRKSRC}/qt/transmission-qt.desktop \
+ ${STAGEDIR}${PREFIX}/share/applications/
+ ${INSTALL_DATA} ${WRKSRC}/qt/icons/transmission.png \
+ ${STAGEDIR}${PREFIX}/share/pixmaps/transmission-qt.png
+
+.include "${MASTERDIR}/Makefile"
Index: net-p2p/transmission-qt/pkg-descr
===================================================================
--- /dev/null
+++ net-p2p/transmission-qt/pkg-descr
@@ -0,0 +1,13 @@
+A fast and lightweight Qt BitTorrent client, loosely based on the GTK+ client.
+
+This is the only Transmission client that can act as its own self-contained
+session (as the GTK+ and Mac clients do), and can also connect to a remote
+session (as the web client and transmission-remote terminal client do).
+
+Transmission has been built from the ground up to be a lightweight, yet
+powerful BitTorrent client. Its simple, intuitive interface is designed
+to integrate tightly with whatever computing environment you choose to
+use. Transmission strikes a balance between providing useful functionality
+without feature bloat. Furthermore, it is free for anyone to use or modify.
+
+WWW: http://www.transmissionbt.com/
Index: net-p2p/transmission-qt/pkg-plist
===================================================================
--- /dev/null
+++ net-p2p/transmission-qt/pkg-plist
@@ -0,0 +1,8 @@
+bin/transmission-qt
+man/man1/transmission-qt.1.gz
+share/applications/transmission-qt.desktop
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README-%%QT_SUFFIX%%
+share/pixmaps/transmission-qt.png
Index: net-p2p/transmission-qt4/Makefile
===================================================================
--- net-p2p/transmission-qt4/Makefile
+++ net-p2p/transmission-qt4/Makefile
@@ -1,53 +0,0 @@
-# $FreeBSD$
-
-PKGNAMESUFFIX= -qt4
-
-MAINTAINER= crees@FreeBSD.org
-COMMENT= Fast and lightweight Qt4 BitTorrent client
-
-LIB_DEPENDS= ${GEN_LIB_DEPENDS} \
- libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
-RUN_DEPENDS= ${GEN_RUN_DEPENDS}
-
-CONFLICTS_INSTALL= transmission-qt5-[0-9]*
-
-DESCR= ${.CURDIR}/pkg-descr
-MASTERDIR= ${.CURDIR}/../transmission-cli
-PLIST= ${.CURDIR}/pkg-plist
-SLAVEPORT= qt4
-
-QT_NONSTANDARD= yes
-USE_QT4= moc_build qmake_build uic_build rcc_build \
- corelib gui dbus network xml
-USES= compiler:c++11-lib desktop-file-utils
-
-EXTRA_CONF_ARGS=--disable-cli \
- --disable-daemon \
- --without-gtk \
- --disable-mac \
- --disable-nls
-
-post-patch: general-patch
- @${REINPLACE_CMD} -e 's|/share/man|/man|g ; /PKGCONFIG/s| openssl||g' \
- ${WRKSRC}/qt/qtr.pro
- @${ECHO_CMD} 'LIBS += -l${PORT_OPTIONS:M*SSL:tl:S/openssl/crypto/}' \
- >>${WRKSRC}/qt/qtr.pro
-
-post-build:
- @(cd ${WRKSRC}/qt && ${QMAKE} ${QMAKE_ARGS} qtr.pro && ${MAKE_CMD})
-
-do-install:
- @(cd ${WRKSRC}/qt && \
- ${SETENV} INSTALL_ROOT=${STAGEDIR}${PREFIX} ${MAKE_CMD} install)
-
-post-install: general-install
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/qt/README.txt \
- ${STAGEDIR}${DOCSDIR}/README-qt4
- @${INSTALL_DATA} ${WRKSRC}/qt/transmission-qt.desktop \
- ${STAGEDIR}${PREFIX}/share/applications/
- @${INSTALL_DATA} ${WRKSRC}/qt/icons/transmission.png \
- ${STAGEDIR}${PREFIX}/share/pixmaps/transmission-qt.png
-
-.include "${MASTERDIR}/Makefile"
Index: net-p2p/transmission-qt4/pkg-descr
===================================================================
--- net-p2p/transmission-qt4/pkg-descr
+++ net-p2p/transmission-qt4/pkg-descr
@@ -1,13 +0,0 @@
-A fast and lightweight Qt4 BitTorrent client, loosely based on the GTK+ client.
-
-This is the only Transmission client that can act as its own self-contained
-session (as the GTK+ and Mac clients do), and can also connect to a remote
-session (as the web client and transmission-remote terminal client do).
-
-Transmission has been built from the ground up to be a lightweight, yet
-powerful BitTorrent client. Its simple, intuitive interface is designed
-to integrate tightly with whatever computing environment you choose to
-use. Transmission strikes a balance between providing useful functionality
-without feature bloat. Furthermore, it is free for anyone to use or modify.
-
-WWW: http://www.transmissionbt.com/
Index: net-p2p/transmission-qt4/pkg-plist
===================================================================
--- net-p2p/transmission-qt4/pkg-plist
+++ net-p2p/transmission-qt4/pkg-plist
@@ -1,8 +0,0 @@
-bin/transmission-qt
-man/man1/transmission-qt.1.gz
-share/applications/transmission-qt.desktop
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README-qt4
-share/pixmaps/transmission-qt.png
Index: net-p2p/transmission-qt5/Makefile
===================================================================
--- net-p2p/transmission-qt5/Makefile
+++ net-p2p/transmission-qt5/Makefile
@@ -1,53 +0,0 @@
-# $FreeBSD$
-
-PKGNAMESUFFIX= -qt5
-
-MAINTAINER= crees@FreeBSD.org
-COMMENT= Fast and lightweight Qt5 BitTorrent client
-
-LIB_DEPENDS= ${GEN_LIB_DEPENDS} \
- libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
-RUN_DEPENDS= ${GEN_RUN_DEPENDS}
-
-CONFLICTS_INSTALL= transmission-qt4-[0-9]*
-
-DESCR= ${.CURDIR}/pkg-descr
-MASTERDIR= ${.CURDIR}/../transmission-cli
-PLIST= ${.CURDIR}/pkg-plist
-SLAVEPORT= qt5
-
-QT_NONSTANDARD= yes
-USE_QT5= buildtools_build qmake_build core dbus gui network widgets
-USES= compiler:c++11-lib desktop-file-utils
-
-EXTRA_CONF_ARGS=--disable-cli \
- --disable-daemon \
- --without-gtk \
- --disable-mac \
- --disable-nls
-
-post-patch: general-patch
- @${REINPLACE_CMD} -e 's|/share/man|/man|g ; /PKGCONFIG/s| openssl||g' \
- ${WRKSRC}/qt/qtr.pro
- @${ECHO_CMD} 'LIBS += -l${PORT_OPTIONS:M*SSL:tl:S/openssl/crypto/}' \
- >>${WRKSRC}/qt/qtr.pro
-
-post-build:
- @(cd ${WRKSRC}/qt && ${QMAKE} ${QMAKE_ARGS} qtr.pro && ${MAKE_CMD})
-
-do-install:
- @(cd ${WRKSRC}/qt && \
- ${SETENV} INSTALL_ROOT=${STAGEDIR}${PREFIX} ${MAKE_CMD} install)
-
-post-install: general-install
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/transmission-qt
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/qt/README.txt \
- ${STAGEDIR}${DOCSDIR}/README-qt5
- @${INSTALL_DATA} ${WRKSRC}/qt/transmission-qt.desktop \
- ${STAGEDIR}${PREFIX}/share/applications/
- @${INSTALL_DATA} ${WRKSRC}/qt/icons/transmission.png \
- ${STAGEDIR}${PREFIX}/share/pixmaps/transmission-qt.png
-
-.include "${MASTERDIR}/Makefile"
Index: net-p2p/transmission-qt5/pkg-descr
===================================================================
--- net-p2p/transmission-qt5/pkg-descr
+++ net-p2p/transmission-qt5/pkg-descr
@@ -1,13 +0,0 @@
-A fast and lightweight Qt5 BitTorrent client, loosely based on the GTK+ client.
-
-This is the only Transmission client that can act as its own self-contained
-session (as the GTK+ and Mac clients do), and can also connect to a remote
-session (as the web client and transmission-remote terminal client do).
-
-Transmission has been built from the ground up to be a lightweight, yet
-powerful BitTorrent client. Its simple, intuitive interface is designed
-to integrate tightly with whatever computing environment you choose to
-use. Transmission strikes a balance between providing useful functionality
-without feature bloat. Furthermore, it is free for anyone to use or modify.
-
-WWW: http://www.transmissionbt.com/
Index: net-p2p/transmission-qt5/pkg-plist
===================================================================
--- net-p2p/transmission-qt5/pkg-plist
+++ net-p2p/transmission-qt5/pkg-plist
@@ -1,8 +0,0 @@
-bin/transmission-qt
-man/man1/transmission-qt.1.gz
-share/applications/transmission-qt.desktop
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README-qt5
-share/pixmaps/transmission-qt.png

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 23, 10:33 PM (16 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24106073
Default Alt Text
D14699.id43348.diff (9 KB)

Event Timeline