diff --git a/audio/clementine/Makefile b/audio/clementine/Makefile index e047b1de080..226b4bdfc38 100644 --- a/audio/clementine/Makefile +++ b/audio/clementine/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.43 2021/01/19 06:54:01 rsadowski Exp $ +# $OpenBSD: Makefile,v 1.44 2021/01/28 15:02:54 sthen Exp $ COMMENT = music player @@ -6,7 +6,7 @@ GH_ACCOUNT = clementine-player GH_PROJECT = Clementine GH_TAGNAME = 1.4.0rc1 PKGNAME = clementine-${GH_TAGNAME} -REVISION= 1 +REVISION= 2 CATEGORIES = audio x11 diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile index 3ae36889166..9794ef25f08 100644 --- a/audio/gtkpod/Makefile +++ b/audio/gtkpod/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.55 2019/07/12 20:43:34 sthen Exp $ +# $OpenBSD: Makefile,v 1.56 2021/01/28 15:02:54 sthen Exp $ COMMENT= GTK+2 program to synchronize an Apple iPod DISTNAME= gtkpod-1.0.0 -REVISION= 10 +REVISION= 11 CATEGORIES= audio x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/} diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile index ba3b5492a15..d83e46f685d 100644 --- a/audio/libgpod/Makefile +++ b/audio/libgpod/Makefile @@ -1,65 +1,44 @@ -# $OpenBSD: Makefile,v 1.52 2020/03/20 16:44:21 naddy Exp $ +# $OpenBSD: Makefile,v 1.53 2021/01/28 15:02:54 sthen Exp $ -COMMENT-main= library to access the contents of an iPod -COMMENT-python= python bindings for libgpod +COMMENT= library to access the contents of an iPod + +DISTNAME= libgpod-0.8.0 +REVISION= 11 -VERSION= 0.8.0 -DISTNAME= libgpod-${VERSION} -PKGNAME-main= ${DISTNAME} -PKGNAME-python= py-gpod-${VERSION} SHARED_LIBS= gpod 721.0 # 7.1 -CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/} -REVISION-main= 10 -REVISION-python= 9 +CATEGORIES= audio + +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/} HOMEPAGE= http://www.gtkpod.org/libgpod/ # LGPLv2 PERMIT_PACKAGE= Yes -MULTI_PACKAGES= -main -python +WANTLIB += c ffi gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 +WANTLIB += iconv intl lzma m pcre plist pthread sqlite3 usb-1.0 +WANTLIB += xml2 z USE_GMAKE= Yes -MODULES= lang/python \ - textproc/intltool +MODULES= textproc/intltool -BUILD_DEPENDS= ${RUN_DEPENDS-python} \ - devel/swig -RUN_DEPENDS-python= audio/py-mutagen \ - devel/py-gobject -LIB_DEPENDS-python= ${BUILD_PKGPATH},-main -LIB_DEPENDS= databases/sqlite3 \ - devel/gettext,-runtime \ - devel/glib2 \ - devel/libplist \ - graphics/gdk-pixbuf2 \ - textproc/libxml \ - devel/libusb1 +LIB_DEPENDS= databases/sqlite3 \ + devel/gettext,-runtime \ + devel/glib2 \ + devel/libplist \ + graphics/gdk-pixbuf2 \ + textproc/libxml \ + devel/libusb1 -WANTLIB += ffi gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 -WANTLIB += iconv intl lzma m pcre plist png sqlite3 xml2 z -WANTLIB-main += ${WANTLIB} c pthread usb-1.0 -WANTLIB-python += ${WANTLIB} gpod pthread - -CONFIGURE_STYLE=gnu -CONFIGURE_ARGS+=--enable-gdk-pixbuf \ +CONFIGURE_STYLE= gnu +CONFIGURE_ARGS+= --enable-gdk-pixbuf \ --enable-pygobject \ --without-hal \ --without-libimobiledevice \ --without-mono \ - --with-python="${MODPY_BIN}" \ + --without-python \ --localedir=${TRUEPREFIX}/share/locale -pre-configure: - @find ${WRKDIST} -name \*.py \ - -exec sed -i 's,/usr/bin/python,${MODPY_BIN},g' {} + - -post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-gpod - ${INSTALL_DATA} ${WRKSRC}/bindings/python/examples/*.py \ - ${PREFIX}/share/examples/py-gpod - .include diff --git a/audio/libgpod/pkg/DESCR-main b/audio/libgpod/pkg/DESCR similarity index 100% rename from audio/libgpod/pkg/DESCR-main rename to audio/libgpod/pkg/DESCR diff --git a/audio/libgpod/pkg/DESCR-python b/audio/libgpod/pkg/DESCR-python deleted file mode 100644 index 2a4d2d0fb19..00000000000 --- a/audio/libgpod/pkg/DESCR-python +++ /dev/null @@ -1 +0,0 @@ -Python bindings for libgpod. diff --git a/audio/libgpod/pkg/PLIST-main b/audio/libgpod/pkg/PLIST similarity index 92% rename from audio/libgpod/pkg/PLIST-main rename to audio/libgpod/pkg/PLIST index a9a08459b56..8d00d3a4948 100644 --- a/audio/libgpod/pkg/PLIST-main +++ b/audio/libgpod/pkg/PLIST @@ -1,5 +1,7 @@ -@comment $OpenBSD: PLIST-main,v 1.3 2015/03/19 20:25:26 naddy Exp $ -@pkgpath audio/libgpod +@comment $OpenBSD: PLIST,v 1.8 2021/01/28 15:02:54 sthen Exp $ +@conflict py-gpod-* +@pkgpath audio/libgpod,-main +@pkgpath audio/libgpod,-python @bin bin/ipod-read-sysinfo-extended include/gpod-1.0/ include/gpod-1.0/gpod/ diff --git a/audio/libgpod/pkg/PLIST-python b/audio/libgpod/pkg/PLIST-python deleted file mode 100644 index 3c48eb46bd5..00000000000 --- a/audio/libgpod/pkg/PLIST-python +++ /dev/null @@ -1,27 +0,0 @@ -@comment $OpenBSD: PLIST-python,v 1.1 2009/04/24 09:45:48 jasper Exp $ -lib/python${MODPY_VERSION}/site-packages/gpod/ -lib/python${MODPY_VERSION}/site-packages/gpod/__init__.py -lib/python${MODPY_VERSION}/site-packages/gpod/__init__.pyc -lib/python${MODPY_VERSION}/site-packages/gpod/__init__.pyo -lib/python${MODPY_VERSION}/site-packages/gpod/_gpod.a -lib/python${MODPY_VERSION}/site-packages/gpod/_gpod.la -lib/python${MODPY_VERSION}/site-packages/gpod/_gpod.so -lib/python${MODPY_VERSION}/site-packages/gpod/gpod.py -lib/python${MODPY_VERSION}/site-packages/gpod/gpod.pyc -lib/python${MODPY_VERSION}/site-packages/gpod/gpod.pyo -lib/python${MODPY_VERSION}/site-packages/gpod/gtkpod.py -lib/python${MODPY_VERSION}/site-packages/gpod/gtkpod.pyc -lib/python${MODPY_VERSION}/site-packages/gpod/gtkpod.pyo -lib/python${MODPY_VERSION}/site-packages/gpod/ipod.py -lib/python${MODPY_VERSION}/site-packages/gpod/ipod.pyc -lib/python${MODPY_VERSION}/site-packages/gpod/ipod.pyo -share/examples/py-gpod/ -share/examples/py-gpod/add_song.py -share/examples/py-gpod/coverart_fetch.py -share/examples/py-gpod/create_mp3_tags_from_itdb.py -share/examples/py-gpod/fix_empty_artist_field.py -share/examples/py-gpod/play_with_ipod_api.py -share/examples/py-gpod/play_with_smart_playlists.py -share/examples/py-gpod/save_photos.py -share/examples/py-gpod/tag_genre_from_audioscrobber.py -share/examples/py-gpod/toy_around.py diff --git a/x11/gnome-mplayer/Makefile b/x11/gnome-mplayer/Makefile index 432ae9b3f04..d8cfd8bcbb2 100644 --- a/x11/gnome-mplayer/Makefile +++ b/x11/gnome-mplayer/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.94 2019/07/12 20:51:11 sthen Exp $ +# $OpenBSD: Makefile,v 1.95 2021/01/28 15:02:54 sthen Exp $ COMMENT = GTK+/GNOME frontend for MPlayer @@ -6,7 +6,7 @@ V = 1.0.9 DISTNAME = gnome-mplayer-${V} EPOCH = 0 CATEGORIES = x11 multimedia -REVISION = 7 +REVISION = 8 HOMEPAGE = http://kdekorte.googlepages.com/gnomemplayer/