diff options
-rw-r--r-- | audio/gqmpeg-devel/Makefile | 12 | ||||
-rw-r--r-- | audio/gqmpeg-devel/distinfo | 2 | ||||
-rw-r--r-- | audio/gqmpeg-devel/files/patch-ad | 16 | ||||
-rw-r--r-- | audio/gqmpeg-devel/files/patch-configure.in | 11 | ||||
-rw-r--r-- | audio/gqmpeg/Makefile | 12 | ||||
-rw-r--r-- | audio/gqmpeg/distinfo | 2 | ||||
-rw-r--r-- | audio/gqmpeg/files/patch-ad | 16 | ||||
-rw-r--r-- | audio/gqmpeg/files/patch-configure.in | 11 |
8 files changed, 60 insertions, 22 deletions
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile index 13f240d86fac..8ba42fb375f6 100644 --- a/audio/gqmpeg-devel/Makefile +++ b/audio/gqmpeg-devel/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gqmpeg -PORTVERSION= 0.9.0 -PORTREVISION= 2 +PORTVERSION= 0.11.0 CATEGORIES+= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -20,8 +19,13 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 USE_X_PREFIX= yes USE_GTK= yes USE_LIBTOOL= yes +USE_AUTOCONF= yes WANT_GNOME= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" \ + USE_GNOME="${USE_GNOME}" + MAN1= gqmpeg.1 .include <bsd.port.pre.mk> @@ -30,4 +34,8 @@ MAN1= gqmpeg.1 USE_GNOME= yes .endif +post-patch: + @find ${WRKSRC} -name 'Makefile.in*' | xargs ${PERL} -pi.orig -e \ + 's|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + .include <bsd.port.post.mk> diff --git a/audio/gqmpeg-devel/distinfo b/audio/gqmpeg-devel/distinfo index da76472e846d..4c4aeac9edd2 100644 --- a/audio/gqmpeg-devel/distinfo +++ b/audio/gqmpeg-devel/distinfo @@ -1 +1 @@ -MD5 (gqmpeg-0.9.0.tar.gz) = 78e30f5ff2fa7af0d2501fe6bd373f1b +MD5 (gqmpeg-0.11.0.tar.gz) = a6b1f35c47afc5e5c67ad801dffb93ae diff --git a/audio/gqmpeg-devel/files/patch-ad b/audio/gqmpeg-devel/files/patch-ad index f2e37223f825..7ede7cab680c 100644 --- a/audio/gqmpeg-devel/files/patch-ad +++ b/audio/gqmpeg-devel/files/patch-ad @@ -1,11 +1,11 @@ ---- Makefile.in.orig Sun Dec 24 13:03:03 2000 -+++ Makefile.in Sun Dec 24 13:03:15 2000 -@@ -109,7 +109,7 @@ +--- Makefile.in.orig Sat Nov 10 18:39:44 2001 ++++ Makefile.in Sat Nov 10 18:40:14 2001 +@@ -116,7 +116,7 @@ skindir = $(prefix)/share/gqmpeg/skins - skin_DATA = + skin_DATA = SKIN-SPECS --@HAVE_GNOME_TRUE@desktopdir = $(GNOME_DATADIR)/gnome/apps/Multimedia -+@HAVE_GNOME_TRUE@desktopdir = $(GNOME_DATADIR)/apps/Multimedia - @HAVE_GNOME_TRUE@desktop_DATA = gqmpeg.desktop +-@HAVE_GNOME_TRUE@desktopdir = @HAVE_GNOME_TRUE@$(GNOME_DATADIR)/gnome/apps/Multimedia ++@HAVE_GNOME_TRUE@desktopdir = @HAVE_GNOME_TRUE@$(GNOME_DATADIR)/apps/Multimedia + @HAVE_GNOME_TRUE@desktop_DATA = @HAVE_GNOME_TRUE@gqmpeg.desktop - @HAVE_GNOME_TRUE@icondir = $(GNOME_DATADIR)/pixmaps + @HAVE_GNOME_TRUE@icondir = @HAVE_GNOME_TRUE@$(GNOME_DATADIR)/pixmaps diff --git a/audio/gqmpeg-devel/files/patch-configure.in b/audio/gqmpeg-devel/files/patch-configure.in new file mode 100644 index 000000000000..590accd546bf --- /dev/null +++ b/audio/gqmpeg-devel/files/patch-configure.in @@ -0,0 +1,11 @@ +--- configure.in.orig Fri Nov 9 14:42:36 2001 ++++ configure.in Sun Nov 11 22:13:39 2001 +@@ -81,7 +81,7 @@ + dnl CHECK_GNOME + AC_PATH_PROG(GNOME_CONFIG,gnome-config,no) + AM_CONDITIONAL(HAVE_GNOME, test $GNOME_CONFIG != no) +- if test "$GNOME_CONFIG" = no; then ++ if test "$GNOME_CONFIG" = no -o "$USE_GNOME" != yes; then + AC_MSG_RESULT(GNOME icon and menu entry will NOT be installed) + else + AC_MSG_RESULT(will install a GNOME icon and menu entry) diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile index 13f240d86fac..8ba42fb375f6 100644 --- a/audio/gqmpeg/Makefile +++ b/audio/gqmpeg/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gqmpeg -PORTVERSION= 0.9.0 -PORTREVISION= 2 +PORTVERSION= 0.11.0 CATEGORIES+= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -20,8 +19,13 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 USE_X_PREFIX= yes USE_GTK= yes USE_LIBTOOL= yes +USE_AUTOCONF= yes WANT_GNOME= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" \ + USE_GNOME="${USE_GNOME}" + MAN1= gqmpeg.1 .include <bsd.port.pre.mk> @@ -30,4 +34,8 @@ MAN1= gqmpeg.1 USE_GNOME= yes .endif +post-patch: + @find ${WRKSRC} -name 'Makefile.in*' | xargs ${PERL} -pi.orig -e \ + 's|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + .include <bsd.port.post.mk> diff --git a/audio/gqmpeg/distinfo b/audio/gqmpeg/distinfo index da76472e846d..4c4aeac9edd2 100644 --- a/audio/gqmpeg/distinfo +++ b/audio/gqmpeg/distinfo @@ -1 +1 @@ -MD5 (gqmpeg-0.9.0.tar.gz) = 78e30f5ff2fa7af0d2501fe6bd373f1b +MD5 (gqmpeg-0.11.0.tar.gz) = a6b1f35c47afc5e5c67ad801dffb93ae diff --git a/audio/gqmpeg/files/patch-ad b/audio/gqmpeg/files/patch-ad index f2e37223f825..7ede7cab680c 100644 --- a/audio/gqmpeg/files/patch-ad +++ b/audio/gqmpeg/files/patch-ad @@ -1,11 +1,11 @@ ---- Makefile.in.orig Sun Dec 24 13:03:03 2000 -+++ Makefile.in Sun Dec 24 13:03:15 2000 -@@ -109,7 +109,7 @@ +--- Makefile.in.orig Sat Nov 10 18:39:44 2001 ++++ Makefile.in Sat Nov 10 18:40:14 2001 +@@ -116,7 +116,7 @@ skindir = $(prefix)/share/gqmpeg/skins - skin_DATA = + skin_DATA = SKIN-SPECS --@HAVE_GNOME_TRUE@desktopdir = $(GNOME_DATADIR)/gnome/apps/Multimedia -+@HAVE_GNOME_TRUE@desktopdir = $(GNOME_DATADIR)/apps/Multimedia - @HAVE_GNOME_TRUE@desktop_DATA = gqmpeg.desktop +-@HAVE_GNOME_TRUE@desktopdir = @HAVE_GNOME_TRUE@$(GNOME_DATADIR)/gnome/apps/Multimedia ++@HAVE_GNOME_TRUE@desktopdir = @HAVE_GNOME_TRUE@$(GNOME_DATADIR)/apps/Multimedia + @HAVE_GNOME_TRUE@desktop_DATA = @HAVE_GNOME_TRUE@gqmpeg.desktop - @HAVE_GNOME_TRUE@icondir = $(GNOME_DATADIR)/pixmaps + @HAVE_GNOME_TRUE@icondir = @HAVE_GNOME_TRUE@$(GNOME_DATADIR)/pixmaps diff --git a/audio/gqmpeg/files/patch-configure.in b/audio/gqmpeg/files/patch-configure.in new file mode 100644 index 000000000000..590accd546bf --- /dev/null +++ b/audio/gqmpeg/files/patch-configure.in @@ -0,0 +1,11 @@ +--- configure.in.orig Fri Nov 9 14:42:36 2001 ++++ configure.in Sun Nov 11 22:13:39 2001 +@@ -81,7 +81,7 @@ + dnl CHECK_GNOME + AC_PATH_PROG(GNOME_CONFIG,gnome-config,no) + AM_CONDITIONAL(HAVE_GNOME, test $GNOME_CONFIG != no) +- if test "$GNOME_CONFIG" = no; then ++ if test "$GNOME_CONFIG" = no -o "$USE_GNOME" != yes; then + AC_MSG_RESULT(GNOME icon and menu entry will NOT be installed) + else + AC_MSG_RESULT(will install a GNOME icon and menu entry) |