- update to 0.99.2 from new maintainer chris kuethe and myself

- dont clobber CFLAGS
- add BUILD_DEPENDS on pkgconfig
This commit is contained in:
jolan 2006-01-20 06:27:28 +00:00
parent c3ee8d661f
commit c743d9c482
7 changed files with 85 additions and 21 deletions

View File

@ -1,15 +1,15 @@
# $OpenBSD: Makefile,v 1.7 2006/01/17 19:32:41 steven Exp $
# $OpenBSD: Makefile,v 1.8 2006/01/20 06:27:28 jolan Exp $
COMMENT= "GTK+2 program to synchronize an Apple iPod"
DISTNAME= gtkpod-0.88.2
PKGNAME= ${DISTNAME}p1
DISTNAME= gtkpod-0.99.2
CATEGORIES= audio x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/}
HOMEPAGE= http://gtkpod.sourceforge.net/
# gpl
MAINTAINER= Chris Kuethe <ckuethe@ualberta.ca>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -17,21 +17,25 @@ PERMIT_DISTFILES_FTP= Yes
USE_X11= Yes
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
LIB_DEPENDS= atk-1.0.800.0::devel/atk \
id3tag.2::audio/libid3tag \
gpod.300.0::audio/libgpod \
gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2 \
glade-2.0.0.4::devel/libglade2 \
glib-2.0.0.0,gmodule-2.0.0.0,gobject-2.0.0.0,gthread-2.0.0.0::devel/glib2 \
pango-1.0.0.0,pangoft2-1.0.0.0,pangox-1.0.0.0,pangoxft-1.0.0.0::devel/pango \
mp4v2.0::audio/faad
WANTLIB= X11 Xext Xft Xrender c fontconfig freetype m pthread
WANTLIB= X11 Xext Xft Xrender c fontconfig freetype m pthread z \
xml2
MODULES= gettext
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE=gnu
# trampolines needed for display_playlists.c
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CFLAGS="-I${LOCALBASE}/include -ftrampolines" \
CFLAGS="${CFLAGS} -ftrampolines" \
CPPFLAGS="-I${LOCALBASE}/include"
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
MD5 (gtkpod-0.88.2.tar.gz) = 12f492d215ee4c7fb55c491f7267deb1
RMD160 (gtkpod-0.88.2.tar.gz) = 9dc720283a78977f448efdd49195e59d2dbf5653
SHA1 (gtkpod-0.88.2.tar.gz) = b2abf3bf7c800e7221fc8cf541d875f05ca49699
SIZE (gtkpod-0.88.2.tar.gz) = 850729
MD5 (gtkpod-0.99.2.tar.gz) = 73c2767100a64ac9a2ba488909bc8b3b
RMD160 (gtkpod-0.99.2.tar.gz) = 5b7a4164e21ebbffa3fc11baf759fd00c2b51801
SHA1 (gtkpod-0.99.2.tar.gz) = f91950fc22d52153f06062d746fc68f999f9625d
SIZE (gtkpod-0.99.2.tar.gz) = 975643

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_file_export_c,v 1.1 2005/03/06 18:29:08 jcs Exp $
--- src/file_export.c.orig Sun Aug 22 04:33:43 2004
+++ src/file_export.c Sun Mar 6 12:12:51 2005
@@ -77,7 +77,7 @@ const gchar *EXPORT_FILES_TPL_DFLT="%o;%
$OpenBSD: patch-src_file_export_c,v 1.2 2006/01/20 06:27:28 jolan Exp $
--- src/file_export.c.orig Sat Dec 10 10:04:28 2005
+++ src/file_export.c Fri Jan 6 15:45:20 2006
@@ -78,7 +78,7 @@ const gchar *EXPORT_FILES_TPL_DFLT="%o;%
/**
* READ_WRITE_BLOCKSIZE - how many bytes we read per fread/fwrite call
*/

View File

@ -0,0 +1,39 @@
$OpenBSD: patch-src_misc_c,v 1.1 2006/01/20 06:27:28 jolan Exp $
--- src/misc.c.orig Sat Dec 10 10:04:28 2005
+++ src/misc.c Fri Jan 6 15:45:20 2006
@@ -400,7 +400,7 @@ mount_ipod(void)
switch (pid)
{
case 0: /* child */
- execl(MOUNT_BIN, "mount", str, NULL);
+ execl(MOUNT_BIN, "mount", str, (void *)NULL);
exit (1);
break;
case -1: /* parent and error */
@@ -435,7 +435,7 @@ unmount_ipod(void)
switch (pid)
{
case 0: /* child */
- execl (UMOUNT_BIN, "umount", mp, NULL);
+ execl (UMOUNT_BIN, "umount", mp, (void *)NULL);
exit (1); /* this is only reached in case of an error */
break;
case -1: /* parent and error */
@@ -476,7 +476,7 @@ unmount_ipod(void)
switch (pid)
{
case 0: /* child */
- execl (eject_bin, "eject", ipod_device, NULL);
+ execl (eject_bin, "eject", ipod_device, (void *)NULL);
exit (1); /* this is only reached in case of an error */
break;
case -1: /* parent and error */
@@ -513,7 +513,7 @@ static void do_script (gchar *script)
switch (pid)
{
case 0: /* child */
- execl("/bin/sh", "sh", script, NULL);
+ execl("/bin/sh", "sh", script, (void *)NULL);
exit(0);
break;
case -1: /* parent and error */

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_mp3file_c,v 1.1 2006/01/20 06:27:28 jolan Exp $
--- src/mp3file.c.orig Tue Nov 22 21:16:12 2005
+++ src/mp3file.c Fri Jan 6 15:45:20 2006
@@ -1907,7 +1907,7 @@ static gboolean mp3_calc_gain (gchar *pa
execl(mp3gain_path, mp3gain_exec,
"-q", /* quiet */
"-k", /* set ReplayGain so that clipping is prevented */
- path, NULL);
+ path, (void *)NULL);
errsv = errno;
fprintf(stderr, "execl() failed: %s\n", strerror(errsv));
/* mp3gain (can) return 1 on success. So only values greater 1 can

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_mp4file_h,v 1.1.1.1 2004/12/16 16:37:14 jcs Exp $
--- src/mp4file.h.orig Sun Dec 12 23:15:03 2004
+++ src/mp4file.h Sun Dec 12 23:17:00 2004
@@ -34,3 +34,5 @@
$OpenBSD: patch-src_mp4file_h,v 1.2 2006/01/20 06:27:28 jolan Exp $
--- src/mp4file.h.orig Fri Jun 17 07:30:05 2005
+++ src/mp4file.h Fri Jan 6 15:45:20 2006
@@ -35,3 +35,5 @@
gboolean mp4_write_file_info (gchar *filename, Track *track);
Track *mp4_get_file_info (gchar *name);
#endif

View File

@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST,v 1.2 2005/04/18 23:42:00 jolan Exp $
@comment $OpenBSD: PLIST,v 1.3 2006/01/20 06:27:28 jolan Exp $
bin/gtkpod
share/gtkpod/
share/gtkpod/gtkpod.glade
share/gtkpod/gtkpod.gladep
share/gtkpod/pixmaps/
share/gtkpod/pixmaps/gtkpod-add-dirs.png
share/gtkpod/pixmaps/gtkpod-add-files.png
@ -15,14 +17,21 @@ share/gtkpod/pixmaps/gtkpod-logo.png
share/gtkpod/pixmaps/gtkpod-new-playlist.png
share/gtkpod/pixmaps/gtkpod-read.png
share/gtkpod/pixmaps/gtkpod-sync.png
share/gtkpod/pixmaps/gtkpod.glade
share/gtkpod/pixmaps/gtkpod.gladep
share/gtkpod/scripts/
share/gtkpod/scripts/mab2vcard
share/gtkpod/scripts/sync-abook.sh
share/gtkpod/scripts/sync-evocalendar.sh
share/gtkpod/scripts/sync-evolution.sh
share/gtkpod/scripts/sync-kaddressbook.sh
share/gtkpod/scripts/sync-korganizer.sh
share/gtkpod/scripts/sync-notes.sh
share/gtkpod/scripts/sync-thunderbird.sh
share/gtkpod/scripts/sync-webcalendar.sh
share/locale/de/LC_MESSAGES/gtkpod.mo
share/locale/fr/LC_MESSAGES/gtkpod.mo
share/locale/he/LC_MESSAGES/gtkpod.mo
share/locale/it/LC_MESSAGES/gtkpod.mo
share/locale/ja/LC_MESSAGES/gtkpod.mo
share/locale/sv/LC_MESSAGES/gtkpod.mo