ports/184518: audio/gmtp: Convert to staging
Guido Falsi
madpilot at FreeBSD.org
Thu Dec 5 15:10:01 UTC 2013
>Number: 184518
>Category: ports
>Synopsis: audio/gmtp: Convert to staging
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Dec 05 15:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Guido Falsi
>Release: FreeBSD 9.2-STABLE amd64
>Organization:
None
>Environment:
System: FreeBSD micro.madpilot.net 9.2-STABLE FreeBSD 9.2-STABLE #22 r255995: Wed Oct 2 22:15:55 CEST 2013 root at micro.madpilot.net:/usr/obj/usr/src/sys/MICRO amd64
>Description:
Convert port to support staging:
http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/special.html#staging
To allow this a few changes had to be made, mainly I'm now using
the normal install targets, because the updating of the gconf/gsettings
schemas is automatically performed by the pkg system.
In the gtk3 case I had to fix the install target to actually install
the schema file without updating the system schemas, which, again,
is automatically performed by the pkg system when actually installing
the resulting binary package.
Maintainer is CCed.
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
--- Makefile (revision 335660)
+++ Makefile (working copy)
@@ -12,10 +12,10 @@
LICENSE= BSD
-LIB_DEPENDS= mtp:${PORTSDIR}/audio/libmtp \
- id3tag:${PORTSDIR}/audio/libid3tag \
- FLAC:${PORTSDIR}/audio/flac \
- vorbis:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS= libmtp.so:${PORTSDIR}/audio/libmtp \
+ libid3tag.so:${PORTSDIR}/audio/libid3tag \
+ libFLAC.so:${PORTSDIR}/audio/flac \
+ libvorbis.so:${PORTSDIR}/audio/libvorbis
WRKSRC= ${WRKDIR}/gMTP
@@ -22,7 +22,6 @@
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USES= gettext gmake pkgconfig
-NO_STAGE= yes
USE_GNOME= glib20
PORTDOCS= *
@@ -38,7 +37,6 @@
USE_GNOME+= gtk20 gconf2
GCONF_SCHEMAS= gmtp.schemas
ALL_TARGET= gtk2
-INSTALL_TARGET= register-gconf-schemas
.endif
.if ${PORT_OPTIONS:MGTK3}
@@ -45,12 +43,10 @@
USE_GNOME+= gtk30
GLIB_SCHEMAS= org.gnome.gmtp.gschema.xml
ALL_TARGET= gtk3
-INSTALL_TARGET= register-gsettings-schemas
+INSTALL_TARGET= install-gtk3
.endif
post-install:
-.if ${PORT_OPTIONS:MDOCS}
- cd ${WRKSRC} && ${GMAKE} install-doc
-.endif
+ @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install-doc)
.include <bsd.port.mk>
Index: files/patch-Makefile
===================================================================
--- files/patch-Makefile (revision 335660)
+++ files/patch-Makefile (working copy)
@@ -1,5 +1,5 @@
--- Makefile.orig 2012-08-06 13:24:43.000000000 +0200
-+++ Makefile 2013-02-16 17:52:04.062614859 +0100
++++ Makefile 2013-12-05 14:23:50.881516874 +0100
@@ -27,7 +27,7 @@
LDFLAGS += -L/usr/sfw/lib -R/usr/sfw/lib
endif
@@ -51,14 +51,23 @@
$(INSTALL) -m 644 images/audio-x-mp3-playlist.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
$(INSTALL) -m 644 images/audio-x-mpeg.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
$(INSTALL) -m 644 images/folder.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
-@@ -203,7 +201,6 @@
+@@ -203,7 +201,7 @@
$(INSTALL) -m 644 images/video-x-generic.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
$(INSTALL) -m 644 images/empty.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
$(INSTALL) -m 644 images/view-refresh.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
- mv $(DESTDIR)$(PREFIX)/share/pixmaps/icon.png $(DESTDIR)$(PREFIX)/share/pixmaps/gMTPicon.png
++ $(INSTALL) -m 644 misc/org.gnome.gmtp.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
cp po/es.mo $(DESTDIR)$(PREFIX)/share/locale/es/LC_MESSAGES/gmtp.mo
cp po/fr.mo $(DESTDIR)$(PREFIX)/share/locale/fr/LC_MESSAGES/gmtp.mo
cp po/it.mo $(DESTDIR)$(PREFIX)/share/locale/it/LC_MESSAGES/gmtp.mo
+@@ -211,7 +209,6 @@
+ cp po/de.mo $(DESTDIR)$(PREFIX)/share/locale/de/LC_MESSAGES/gmtp.mo
+
+ register-gsettings-schemas: install-gtk3
+- $(INSTALL) -m 644 misc/org.gnome.gmtp.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
+ glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
+
+ install-doc:
@@ -227,7 +224,7 @@
rm -f $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)/*
rm -f $(DESTDIR)$(PREFIX)/share/applications/gMTP.desktop
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list