aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2006-05-08 12:15:49 +0000
committerPav Lucistnik <pav@FreeBSD.org>2006-05-08 12:15:49 +0000
commite6503f9d1c203a13d058538e0a393718cc2a5fe8 (patch)
tree198474dcd6662905a95a633a011a9756b0648f2e
parent1e54999864d8e2105798cdca3d6fcd80d7ebbe16 (diff)
downloadports-e6503f9d1c203a13d058538e0a393718cc2a5fe8.tar.gz
ports-e6503f9d1c203a13d058538e0a393718cc2a5fe8.zip
Notes
-rw-r--r--MOVED1
-rw-r--r--multimedia/Makefile1
-rw-r--r--multimedia/gnonlin/Makefile32
-rw-r--r--multimedia/gnonlin/distinfo2
-rw-r--r--multimedia/gnonlin/pkg-descr5
-rw-r--r--multimedia/gnonlin/pkg-plist19
6 files changed, 1 insertions, 59 deletions
diff --git a/MOVED b/MOVED
index 413475950042..a88353c6b5a5 100644
--- a/MOVED
+++ b/MOVED
@@ -2296,3 +2296,4 @@ www/mod_php4|lang/php4|2006-05-06|Unification of php slave ports
www/mod_php5|lang/php5|2006-05-06|Unification of php slave ports
www/php4-cgi|lang/php4|2006-05-06|Unification of php slave ports
www/php5-cgi|lang/php5|2006-05-06|Unification of php slave ports
+multimedia/gnonlin|multimedia/gstreamer-plugins-gnonlin|2006-05-08|Merge duplicite ports
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 2fb95645a217..42745924dceb 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -38,7 +38,6 @@
SUBDIR += gdvrecv
SUBDIR += ggrab
SUBDIR += gmencoder
- SUBDIR += gnonlin
SUBDIR += goggles
SUBDIR += gopchop
SUBDIR += gpac-libgpac
diff --git a/multimedia/gnonlin/Makefile b/multimedia/gnonlin/Makefile
deleted file mode 100644
index 0b92c9b5bcde..000000000000
--- a/multimedia/gnonlin/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# New ports collection makefile for: gnonlin
-# Date created: 2 June 2005
-# Whom: Koop Mast <kwm@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= gnonlin
-PORTVERSION= 0.2.2
-PORTREVISION= 2
-CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= GStreamer extension library for non-linear editing
-
-LIB_DEPENDS= gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer80
-
-CONFLICTS= pitivi-0.1.1*
-
-USE_BZIP2= yes
-USE_X_PREFIX= yes
-USE_GNOME= gnomehack gnometarget
-USE_GMAKE= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-
-MAN1= gnonlin-config.1
-
-.include <bsd.port.mk>
diff --git a/multimedia/gnonlin/distinfo b/multimedia/gnonlin/distinfo
deleted file mode 100644
index f7af041573da..000000000000
--- a/multimedia/gnonlin/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnonlin-0.2.2.tar.bz2) = 7ff9f2e58463a3bb783a1c77445e9863
-SIZE (gnonlin-0.2.2.tar.bz2) = 284397
diff --git a/multimedia/gnonlin/pkg-descr b/multimedia/gnonlin/pkg-descr
deleted file mode 100644
index 21da31bd3b1c..000000000000
--- a/multimedia/gnonlin/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Gnonlin is a library built on top of GStreamer (http://gstreamer.net) which
-provides support for writing non-linear audio and video editing applications.
-It introduces the concept of a timeline.
-
-WWW: http://gnonlin.sf.net/
diff --git a/multimedia/gnonlin/pkg-plist b/multimedia/gnonlin/pkg-plist
deleted file mode 100644
index 10841c907278..000000000000
--- a/multimedia/gnonlin/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-bin/gnonlin-config
-include/gnl/gnl.h
-include/gnl/gnlcomposition.h
-include/gnl/gnlmarshal.h
-include/gnl/gnlobject.h
-include/gnl/gnloperation.h
-include/gnl/gnlsource.h
-include/gnl/gnltimeline.h
-include/gnl/gnltypes.h
-include/gnl/gnlversion.h
-lib/gstreamer-0.8/libgnl.a
-lib/gstreamer-0.8/libgnl.la
-lib/gstreamer-0.8/libgnl.so
-lib/gstreamer-0.8/libgnl.so.0
-libdata/pkgconfig/gnonlin.pc
-@dirrm include/gnl
-@dirrmtry share/gtk-doc/html/gnonlin
-@dirrmtry share/gtk-doc/html
-@dirrmtry share/gtk-doc