* move -sub variables out of .if sections; reminded by espie@

* clean up some copy-and-paste accident in WANTLIB-gtk
* switch to .tar.xz distfile
This commit is contained in:
naddy 2011-09-25 21:55:49 +00:00
parent 0b78f2cdd8
commit d3b34bf2a9
2 changed files with 35 additions and 33 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.69 2011/09/25 20:18:44 naddy Exp $
# $OpenBSD: Makefile,v 1.70 2011/09/25 21:55:49 naddy Exp $
COMMENT-main= lightweight BitTorrent command line and daemon client
COMMENT-gtk= lightweight BitTorrent client with GTK+ interface
@ -22,7 +22,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://download.m0k.org/transmission/files/
EXTRACT_SUFX= .tar.bz2
EXTRACT_SUFX= .tar.xz
MULTI_PACKAGES= -main -gtk -qt
@ -31,12 +31,36 @@ ONLY_FOR_ARCHS-qt=${GCC4_ARCHS}
PSEUDO_FLAVORS= no_gtk no_qt
FLAVOR?=
# Reminder:
# MODULES adds to WANTLIB and LIB_DEPENDS
# WANTLIB-main and LIB_DEPENDS-main default to WANTLIB and LIB_DEPENDS
WANTLIB= c crypto curl event_core event_extra idn m pthread ssl z
WANTLIB-main= ${WANTLIB}
WANTLIB-gtk= ${WANTLIB} X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
Xfixes Xi Xinerama Xrandr Xrender Xxf86vm GL atk-1.0 cairo \
dbus-1 dbus-glib-1 drm expat ffi fontconfig freetype \
gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
gobject-2.0 gthread-2.0 gtk-x11-2.0 pango-1.0 pangoft2-1.0 \
pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
xcb-render xcb-shm
WANTLIB-qt= ${WANTLIB} QtCore QtDBus QtGui QtNetwork QtXml \
expat fontconfig freetype stdc++
MODULES= devel/gettext textproc/intltool
LIB_DEPENDS= net/curl \
devel/libevent2
LIB_DEPENDS= devel/libevent2 \
net/curl
LIB_DEPENDS-gtk=${LIB_DEPENDS} \
x11/gtk+2 \
x11/dbus-glib
LIB_DEPENDS-qt= ${LIB_DEPENDS} \
x11/qt4
RUN_DEPENDS-gtk=${PKGNAME-main}:net/transmission,-main \
devel/desktop-file-utils \
sysutils/gamin,-server,no_python
RUN_DEPENDS-qt= ${PKGNAME-main}:net/transmission,-main \
devel/desktop-file-utils
BUILD_DEPENDS= archivers/gtar
TAR= ${LOCALBASE}/bin/gtar
@ -56,33 +80,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
.include <bsd.port.arch.mk>
.if ${BUILD_PACKAGES:M-gtk}
WANTLIB-gtk= ${WANTLIB} X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
Xfixes Xi Xinerama Xrandr Xrender Xxf86vm GL atk-1.0 cairo \
dbus-1 dbus-glib-1 drm expat ffi fontconfig freetype \
gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
gobject-2.0 gthread-2.0 gtk-x11-2.0 pango-1.0 pangoft2-1.0 \
Xfixes Xi Xinerama Xrandr Xrender atk-1.0 cairo dbus-1 \
expat fontconfig freetype gio-2.0 glib-2.0 \
gmodule-2.0 gobject-2.0 gthread-2.0 pango-1.0 pangoft2-1.0 \
pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
xcb-render xcb-shm
LIB_DEPENDS+= x11/gtk+2 \
x11/dbus-glib
RUN_DEPENDS-gtk=${PKGNAME-main}:net/transmission,-main \
devel/desktop-file-utils \
sysutils/gamin,-server,no_python
.else
.if !${BUILD_PACKAGES:M-gtk}
CONFIGURE_ARGS+=--disable-gtk
.endif
.if ${BUILD_PACKAGES:M-qt}
LIB_DEPENDS+= x11/qt4
WANTLIB-qt= ${WANTLIB} QtCore QtDBus QtGui QtNetwork QtXml \
expat fontconfig freetype stdc++
RUN_DEPENDS-qt= ${PKGNAME-main}:net/transmission,-main \
devel/desktop-file-utils
post-build:
cd ${WRKSRC}/qt; qmake4 qtr.pro; make ${MAKE_FLAGS}

View File

@ -1,5 +1,5 @@
MD5 (transmission-2.33.tar.bz2) = CCIXplcTrIeUEMYiy+brJg==
RMD160 (transmission-2.33.tar.bz2) = 3TDHz3MvoKYhSdqL4mYxLeZbWqY=
SHA1 (transmission-2.33.tar.bz2) = 690L3qk35LkOzt38uzy78Hnz5wE=
SHA256 (transmission-2.33.tar.bz2) = AlxIW1FbQeo5ivAyZAzsCHbRU5Mv+1728hYe+O43DHA=
SIZE (transmission-2.33.tar.bz2) = 3858044
MD5 (transmission-2.33.tar.xz) = dt8rAC6eJD8uRge0DAGZdA==
RMD160 (transmission-2.33.tar.xz) = i4IoovrVWmTUYxTxv4eai4n6FQ0=
SHA1 (transmission-2.33.tar.xz) = pVAnI+m4/cmCzE08BS5IOctFsag=
SHA256 (transmission-2.33.tar.xz) = wVp/nYJ0P7Mp7hLkG/JCBw3bqoxnQdp84LuR2NOZoHI=
SIZE (transmission-2.33.tar.xz) = 2583032