aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--x11/Makefile1
-rw-r--r--x11/trayer-srg/Makefile43
-rw-r--r--x11/trayer-srg/distinfo2
-rw-r--r--x11/trayer-srg/pkg-descr12
5 files changed, 1 insertions, 58 deletions
diff --git a/MOVED b/MOVED
index 63bf78cfa11d..bc4bd4f928ad 100644
--- a/MOVED
+++ b/MOVED
@@ -3462,3 +3462,4 @@ sysutils/pwgen2|sysutils/pwgen|2012-06-07|pwgen2 is a continuation of pwgen that
x11-toolkits/xforms-i18n||2012-06-08|Has expired: BROKEN for more than 6 month
security/ifd-devkit||2012-06-08|Conflicts with dependency, not useful
www/kazehakase||2012-06-10|Has expired: BROKEN for more than 6 month
+x11/trayer-srg|x11/trayer|2012-06-11|Merged into x11/trayer
diff --git a/x11/Makefile b/x11/Makefile
index 79e9da371b42..38c4a7b66635 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -283,7 +283,6 @@
SUBDIR += tkXwin
SUBDIR += trapproto
SUBDIR += trayer
- SUBDIR += trayer-srg
SUBDIR += tycoon
SUBDIR += vdesk
SUBDIR += videoproto
diff --git a/x11/trayer-srg/Makefile b/x11/trayer-srg/Makefile
deleted file mode 100644
index 83a147f9c91e..000000000000
--- a/x11/trayer-srg/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# New ports collection makefile for: trayer-srg
-# Date created: Jun 21, 2011
-# Whom: Guido Falsi <mad@madpilot.net>
-# Based on the x11/trayer port Makefile from Alexey Mikhailov <karma@ez.pereslavl.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME= trayer
-PORTVERSION= 1.1.4
-PORTREVISION= 1
-CATEGORIES= x11
-MASTER_SITES= http://github.com/sargon/${PORTNAME}${PKGNAMESUFFIX}/tarball/${PORTNAME}-${PORTVERSION}/
-PKGNAMESUFFIX= -srg
-DISTNAME= sargon-${PORTNAME}${PKGNAMESUFFIX}-${PORTNAME}-${PORTVERSION}-${GITVERSION}
-
-MAINTAINER= madpilot@FreeBSD.org
-COMMENT= Lightweight GTK2-based systray for UNIX desktop - sargon fork
-
-CONFLICTS_INSTALL= trayer-[0-9]*
-GITVERSION= 0-g412ad31
-FETCH_ARGS= -pRr
-WRKSRC= ${WRKDIR}/sargon-${PORTNAME}${PKGNAMESUFFIX}-${GITVERSION:S/^0-g//}
-USE_GNOME= gtk20 glib20 pango atk
-USE_ICONV= yes
-USE_XORG= xmu
-USE_GMAKE= yes
-MAKE_ARGS= "PREFIX=${PREFIX}"
-
-PORTDOCS= README CREDITS CHANGELOG
-PLIST_FILES= bin/trayer
-
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
- ${MKDIR} ${DOCSDIR}
-. for f in ${PORTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-. endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/x11/trayer-srg/distinfo b/x11/trayer-srg/distinfo
deleted file mode 100644
index 34b4536d5061..000000000000
--- a/x11/trayer-srg/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (sargon-trayer-srg-trayer-1.1.4-0-g412ad31.tar.gz) = 9f0c484838342fbbd817e356e876c94af0702c8639182a40701ca3a2ca97ca5b
-SIZE (sargon-trayer-srg-trayer-1.1.4-0-g412ad31.tar.gz) = 24792
diff --git a/x11/trayer-srg/pkg-descr b/x11/trayer-srg/pkg-descr
deleted file mode 100644
index c55c223f7d57..000000000000
--- a/x11/trayer-srg/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-trayer-srg was forked from trayer in january 2010 to add some
-fancy features and clean up code.
-
-trayer is small program designed to provide systray functionality
-present in GNOME/KDE desktop enviroments for window managers
-which doesn't support that function. It's similar to other
-applications such as 'peksystray' and 'docker'.
-
-trayer code was extracted from fbpanel application, you can find more
-about it on it's homepage
-
-WWW: http://github.com/sargon/trayer-srg