aboutsummaryrefslogtreecommitdiffstats
path: root/deskutils
diff options
context:
space:
mode:
authorjgh <jgh@FreeBSD.org>2014-12-31 02:36:31 +0800
committerjgh <jgh@FreeBSD.org>2014-12-31 02:36:31 +0800
commit577ea7a231b9ccd822b046d671f3063832cfe88c (patch)
tree541987426b7e7d80f6273acec6184b0563c8ba49 /deskutils
parent63cbe2fe265c081dc427466844b82c84829a9c21 (diff)
downloadfreebsd-ports-gnome-577ea7a231b9ccd822b046d671f3063832cfe88c.tar.gz
freebsd-ports-gnome-577ea7a231b9ccd822b046d671f3063832cfe88c.tar.zst
freebsd-ports-gnome-577ea7a231b9ccd822b046d671f3063832cfe88c.zip
- rename deskutils/xpad-current to deskutils/xpad
- update xpad to 4.5.0 - add documentation to installation - lessen dependency count by using smaller icon package - remove patches, as they were committed upstream (see Changelog) - adjust conflicts for deskutils/xpad3
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/Makefile2
-rw-r--r--deskutils/xpad-current/distinfo2
-rw-r--r--deskutils/xpad-current/files/patch-doc_Makefile.am14
-rw-r--r--deskutils/xpad/Makefile (renamed from deskutils/xpad-current/Makefile)19
-rw-r--r--deskutils/xpad/distinfo2
-rw-r--r--deskutils/xpad/pkg-descr (renamed from deskutils/xpad-current/pkg-descr)0
-rw-r--r--deskutils/xpad/pkg-plist (renamed from deskutils/xpad-current/pkg-plist)2
-rw-r--r--deskutils/xpad3/Makefile2
8 files changed, 17 insertions, 26 deletions
diff --git a/deskutils/Makefile b/deskutils/Makefile
index c0d55e12de64..77f846763acc 100644
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@@ -275,7 +275,7 @@
SUBDIR += xmdiary
SUBDIR += xneur
SUBDIR += xpad3
- SUBDIR += xpad-current
+ SUBDIR += xpad
SUBDIR += xpostit
SUBDIR += xpostitPlus
SUBDIR += xrolo
diff --git a/deskutils/xpad-current/distinfo b/deskutils/xpad-current/distinfo
deleted file mode 100644
index f7886df7afc8..000000000000
--- a/deskutils/xpad-current/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xpad-4.4.0.tar.bz2) = 969a76c983af7b3e96ba70a78cb6bcb8c95ea6c687ec20c638cf3adc57b2904a
-SIZE (xpad-4.4.0.tar.bz2) = 230308
diff --git a/deskutils/xpad-current/files/patch-doc_Makefile.am b/deskutils/xpad-current/files/patch-doc_Makefile.am
deleted file mode 100644
index cc42cb30984a..000000000000
--- a/deskutils/xpad-current/files/patch-doc_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
---- doc/Makefile.am.orig 2014-12-17 16:24:43 UTC
-+++ doc/Makefile.am
-@@ -5,9 +5,9 @@ uninstall-man: uninstall-man1
-
- install-data-local:
- @echo "Create help directory"
-- $(MKDIR_P) $(helpdir)
-+ $(MKDIR_P) $(DESTDIR)$(helpdir)
- @echo "Copying help file"
-- cp xpad-user-help.txt $(helpdir)
-+ cp xpad-user-help.txt $(DESTDIR)$(helpdir)
-
- uninstall-local:
- @echo "Delete help directory"
diff --git a/deskutils/xpad-current/Makefile b/deskutils/xpad/Makefile
index 89d3a60d6ccf..ddaf4ea70d2e 100644
--- a/deskutils/xpad-current/Makefile
+++ b/deskutils/xpad/Makefile
@@ -2,23 +2,21 @@
# $FreeBSD$
PORTNAME= xpad
-PORTVERSION= 4.4.0
-PORTREVISION= 1
+PORTVERSION= 4.5.0
CATEGORIES= deskutils
-MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/4.4/+download/
-PKGNAMESUFFIX= -current
+MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/4.5/+download/
MAINTAINER= jgh@FreeBSD.org
COMMENT= Virtual note-pad system for your X11 desktop
LICENSE= GPLv3
-RUN_DEPENDS= gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme
+RUN_DEPENDS= icons-tango>=0:${PORTSDIR}/x11-themes/icons-tango
-OPTIONS_DEFINE= NLS
+OPTIONS_DEFINE= NLS DOCS
OPTIONS_SUB= yes
-CONFLICTS_INSTALL= xpad-[0-9]*
+CONFLICTS_INSTALL= xpad3-[0-9]*
USE_XORG= x11 sm
USE_GNOME= gtk30 intltool gtksourceview3
USES= pkgconfig gmake tar:bzip2 autoreconf
@@ -26,6 +24,7 @@ INSTALLS_ICONS= yes
CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
GNU_CONFIGURE= yes
+PORTDOCS= *
NLS_USES= gettext
NLS_CONFIGURE_ENABLE= nls
@@ -36,4 +35,10 @@ post-patch:
@${REINPLACE_CMD} -e 's|glib/glist.h|glib.h|g' \
${WRKSRC}/src/xpad-undo.c
+post-install:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for doc in AUTHORS ChangeLog INSTALL NEWS README TODO THANKS
+ ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
+.endfor
+
.include <bsd.port.mk>
diff --git a/deskutils/xpad/distinfo b/deskutils/xpad/distinfo
new file mode 100644
index 000000000000..aebb9cec4bb2
--- /dev/null
+++ b/deskutils/xpad/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xpad-4.5.0.tar.bz2) = f870cefc92593febf266bb0f90ceb0feeb4af7eb1033625fca50933701a7b9e8
+SIZE (xpad-4.5.0.tar.bz2) = 1907957
diff --git a/deskutils/xpad-current/pkg-descr b/deskutils/xpad/pkg-descr
index e53f99d7be90..e53f99d7be90 100644
--- a/deskutils/xpad-current/pkg-descr
+++ b/deskutils/xpad/pkg-descr
diff --git a/deskutils/xpad-current/pkg-plist b/deskutils/xpad/pkg-plist
index 254ab8c06653..df6735a1ac66 100644
--- a/deskutils/xpad-current/pkg-plist
+++ b/deskutils/xpad/pkg-plist
@@ -1,8 +1,8 @@
bin/xpad
-lib/xpad/help/xpad-user-help.txt
man/man1/xpad.1.gz
share/applications/xpad.desktop
share/icons/hicolor/scalable/apps/xpad.svg
+%%DATADIR%%/help/xpad-user-help.txt
%%NLS%%share/locale/af/LC_MESSAGES/xpad.mo
%%NLS%%share/locale/bg/LC_MESSAGES/xpad.mo
%%NLS%%share/locale/cs/LC_MESSAGES/xpad.mo
diff --git a/deskutils/xpad3/Makefile b/deskutils/xpad3/Makefile
index d1e241c3d31c..ef6109127b96 100644
--- a/deskutils/xpad3/Makefile
+++ b/deskutils/xpad3/Makefile
@@ -16,7 +16,7 @@ LICENSE= GPLv3
OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes
-CONFLICTS_INSTALL= xpad-current-[0-9]*
+CONFLICTS_INSTALL= xpad-[0-9]*
USE_XORG= x11 sm
USE_GNOME= gtk20 intltool