Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
audio/libcanberra: split a gtk2 from non graphic port
there was already a slave port for gtk3, now make a slaveport for gtk2 as well. While here fix the option definition which was wrongly done making libcanberra have no options at all while libcanberra-gtk3 had and the opposite was expected Use options helpers to simplify the port. Drop the gtkdoc by default bump revision and track no package for the 2 only port requiring the gtk2 library Reduce the slave port to its bare minimal requirement This change has been made in a slaveport instead of a flavor, because flavors depending on its own origin is not supported. this is a candidate for subpackages in the futur. note that this changes also removes gtk2 from the dependency path of many gtk3 only application
- Loading branch information
Showing
8 changed files
with
67 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> | ||
# $MCom: ports/trunk/audio/libcanberra-gtk3/Makefile 19814 2014-08-15 20:17:00Z gusi $ | ||
|
||
MASTERDIR= ${.CURDIR:H}/libcanberra | ||
SLAVEPORT= gtk2 | ||
|
||
.include "${MASTERDIR}/Makefile" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,30 +1,7 @@ | ||
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> | ||
# $MCom: ports/trunk/audio/libcanberra-gtk3/Makefile 19814 2014-08-15 20:17:00Z gusi $ | ||
|
||
CATEGORIES= audio devel | ||
PKGNAMESUFFIX= -gtk3 | ||
|
||
MAINTAINER= desktop@FreeBSD.org | ||
COMMENT= Implementation of the Freedesktop sound theme spec | ||
|
||
MASTERDIR= ${.CURDIR}/../../audio/libcanberra | ||
MASTERDIR= ${.CURDIR:H}/libcanberra | ||
SLAVEPORT= gtk3 | ||
PLIST= ${.CURDIR}/pkg-plist | ||
|
||
do-build: | ||
cd ${WRKSRC} && ${GMAKE} libcanberra-gtk3.pc | ||
cd ${WRKSRC}/src && ${GMAKE} libcanberra-gtk3.la | ||
cd ${WRKSRC}/src && ${GMAKE} libcanberra-gtk3-module.la | ||
|
||
do-install: | ||
${INSTALL_DATA} ${WRKSRC}/libcanberra-gtk3.pc \ | ||
${STAGEDIR}${PREFIX}/libdata/pkgconfig/ | ||
.for i in .so .so.0 .so.0.1.9 | ||
${INSTALL_LIB} ${WRKSRC}/src/.libs/libcanberra-gtk3${i} \ | ||
${STAGEDIR}${PREFIX}/lib/ | ||
.endfor | ||
cd ${WRKSRC}/src && env DESTDIR=${STAGEDIR} ${GMAKE} install-gtk3moduleLTLIBRARIES | ||
${LN} -sf libcanberra-gtk3-module.so \ | ||
${STAGEDIR}${PREFIX}/lib/gtk-3.0/modules/libcanberra-gtk-module.so | ||
|
||
.include "${MASTERDIR}/Makefile" |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,35 +1,29 @@ | ||
bin/canberra-gtk-play | ||
include/canberra-gtk.h | ||
include/canberra.h | ||
lib/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop | ||
lib/gtk-2.0/modules/libcanberra-gtk-module.so | ||
lib/libcanberra-gtk.so | ||
lib/libcanberra-gtk.so.0 | ||
lib/libcanberra-gtk.so.0.1.9 | ||
lib/libcanberra.so | ||
lib/libcanberra.so.0 | ||
lib/libcanberra.so.0.2.5 | ||
%%GSTREAMER%%lib/libcanberra-%%VERSION%%/libcanberra-gstreamer.so | ||
lib/libcanberra-%%VERSION%%/libcanberra-multi.so | ||
lib/libcanberra-%%VERSION%%/libcanberra-null.so | ||
lib/libcanberra-%%VERSION%%/libcanberra-oss.so | ||
%%PULSE%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.so | ||
libdata/pkgconfig/libcanberra-gtk.pc | ||
libdata/pkgconfig/libcanberra.pc | ||
%%DOCSDIR%%/README | ||
%%DOCSDIR%%/ch01.html | ||
%%DOCSDIR%%/home.png | ||
%%DOCSDIR%%/index.html | ||
%%DOCSDIR%%/index.sgml | ||
%%DOCSDIR%%/left.png | ||
%%DOCSDIR%%/libcanberra-canberra-gtk.html | ||
%%DOCSDIR%%/libcanberra-canberra.html | ||
%%DOCSDIR%%/libcanberra.devhelp2 | ||
%%DOCSDIR%%/right.png | ||
%%DOCSDIR%%/style.css | ||
%%DOCSDIR%%/up.png | ||
share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop | ||
share/gnome/autostart/libcanberra-login-sound.desktop | ||
share/gnome/shutdown/libcanberra-logout-sound.sh | ||
share/vala/vapi/libcanberra-gtk.vapi | ||
share/vala/vapi/libcanberra.vapi | ||
%%GTK2%%bin/canberra-gtk-play | ||
%%GTK2%%include/canberra-gtk.h | ||
%%BASE%%include/canberra.h | ||
%%GTK2%%lib/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop | ||
%%GTK2%%lib/gtk-2.0/modules/libcanberra-gtk-module.so | ||
%%GTK3%%lib/gtk-3.0/modules/libcanberra-gtk-module.so | ||
%%GTK3%%lib/gtk-3.0/modules/libcanberra-gtk3-module.so | ||
%%GTK2%%lib/libcanberra-gtk.so | ||
%%GTK2%%lib/libcanberra-gtk.so.0 | ||
%%GTK2%%lib/libcanberra-gtk.so.0.1.9 | ||
%%GTK3%%lib/libcanberra-gtk3.so | ||
%%GTK3%%lib/libcanberra-gtk3.so.0 | ||
%%GTK3%%lib/libcanberra-gtk3.so.0.1.9 | ||
%%BASE%%lib/libcanberra.so | ||
%%BASE%%lib/libcanberra.so.0 | ||
%%BASE%%lib/libcanberra.so.0.2.5 | ||
%%BASE%%%%GSTREAMER%%lib/libcanberra-%%VERSION%%/libcanberra-gstreamer.so | ||
%%BASE%%lib/libcanberra-%%VERSION%%/libcanberra-multi.so | ||
%%BASE%%lib/libcanberra-%%VERSION%%/libcanberra-null.so | ||
%%BASE%%lib/libcanberra-%%VERSION%%/libcanberra-oss.so | ||
%%BASE%%%%PULSEAUDIO%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.so | ||
%%BASE%%libdata/pkgconfig/libcanberra.pc | ||
%%GTK2%%libdata/pkgconfig/libcanberra-gtk.pc | ||
%%GTK3%%libdata/pkgconfig/libcanberra-gtk3.pc | ||
%%GTK2%%share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop | ||
%%GTK2%%share/gnome/autostart/libcanberra-login-sound.desktop | ||
%%GTK2%%share/gnome/shutdown/libcanberra-logout-sound.sh | ||
%%GTK2%%share/vala/vapi/libcanberra-gtk.vapi | ||
%%BASE%%share/vala/vapi/libcanberra.vapi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters