Update to 0.27.

5 files changed, 32 insertions, 28 deletions

diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile
index 11784d7..ccd72e3 100644
--- a/print/gnome-cups-manager/Makefile
+++ b/print/gnome-cups-manager/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Glenn Johnson <glennpj@charter.net>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	gnome-cups-manager
-PORTVERSION=	0.18
-PORTREVISION=	1
+PORTVERSION=	0.27
 PORTEPOCH=	1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.18
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -21,7 +21,8 @@ LIB_DEPENDS=	gnomecups-1.0.1:${PORTSDIR}/print/libgnomecups
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeprintui libgnomeui
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeprintui libgnomeui \
+		desktopfileutils
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
@@ -36,6 +37,7 @@ post-patch:
 		"s|-D.*_DISABLE_DEPRECATED||g"
 
 post-install:
+	${MKDIR} ${PREFIX}/share/gnome/applications
 	${INSTALL_DATA} ${WRKSRC}/gnome-cups-manager.desktop \
 		${PREFIX}/share/gnome/applications
 
diff --git a/print/gnome-cups-manager/distinfo b/print/gnome-cups-manager/distinfo
index 6bb50b3..2d81e04 100644
--- a/print/gnome-cups-manager/distinfo
+++ b/print/gnome-cups-manager/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-cups-manager-0.18.tar.bz2) = d8508654ed956de73fa62a72b4358a1a
-SIZE (gnome2/gnome-cups-manager-0.18.tar.bz2) = 472324
+MD5 (gnome2/gnome-cups-manager-0.27.tar.bz2) = 5b544fd5d70bfa5081f996b74ffefe45
+SIZE (gnome2/gnome-cups-manager-0.27.tar.bz2) = 534628
diff --git a/print/gnome-cups-manager/files/patch-gnome-cups-add_snmpkit_snmpkit_interface.C b/print/gnome-cups-manager/files/patch-gnome-cups-add_snmpkit_snmpkit_interface.C
deleted file mode 100644
index 3fae7e5..0000000
--- a/print/gnome-cups-manager/files/patch-gnome-cups-add_snmpkit_snmpkit_interface.C
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-cups-add/snmpkit/snmpkit_interface.C.orig	Fri Aug  6 23:58:14 2004
-+++ gnome-cups-add/snmpkit/snmpkit_interface.C	Fri Aug  6 23:58:36 2004
-@@ -508,7 +508,7 @@
- void **sk_table_get(SNMPTABLE *st){
-   std::list<void*> vals;
-   from_c(st)->get(vals);
--  void **retval=new (void*)[vals.size()+1];
-+  void **retval=new void* [vals.size()+1];
-   retval[vals.size()]=NULL;
-   int i=0;
-   for(std::list<void*>::iterator cur=vals.begin();cur!=vals.end();cur++,i++)
diff --git a/print/gnome-cups-manager/files/patch-icons_Makefile.in b/print/gnome-cups-manager/files/patch-icons_Makefile.in
index 137cfc9..dcbf0e2 100644
--- a/print/gnome-cups-manager/files/patch-icons_Makefile.in
+++ b/print/gnome-cups-manager/files/patch-icons_Makefile.in
@@ -1,15 +1,15 @@
---- icons/Makefile.in.old	Tue Jun  8 18:54:16 2004
-+++ icons/Makefile.in	Tue Jun  8 19:00:42 2004
-@@ -131,10 +131,10 @@
- WARN_CFLAGS = @WARN_CFLAGS@
- WARN_CXXFLAGS = @WARN_CXXFLAGS@
- 
+--- icons/Makefile.in.orig	Tue Oct  5 14:58:36 2004
++++ icons/Makefile.in	Tue Oct  5 15:00:21 2004
+@@ -179,10 +179,10 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
 -devicedir = $(datadir)/icons/hicolor/48x48/devices
-+devicedir = $(prefix)/$(DATADIRNAME)/icons/hicolor/48x48/devices
++devicedir = $(prefix)/share/icons/hicolor/48x48/devices
  device_DATA = gnome-dev-printer.png gnome-dev-printer-network.png gnome-dev-printer-new.png
  
--emblemdir = $(datadir)/icons/hicolor/48x48/emblems
-+emblemdir = $(prefix)/$(DATADIRNAME)/icons/hicolor/48x48/emblems
+-emblemdir = $(datadir)/icons/hicolor/48x48/stock/data
++emblemdir = $(prefix)/share/icons/hicolor/48x48/stock/data
  emblem_DATA = emblem-default.png emblem-paused.png
  
  pixmapdir = $(datadir)/pixmaps/gnome-cups-manager
diff --git a/print/gnome-cups-manager/pkg-plist b/print/gnome-cups-manager/pkg-plist
index 9856fd7..5941d94 100644
--- a/print/gnome-cups-manager/pkg-plist
+++ b/print/gnome-cups-manager/pkg-plist
@@ -1,8 +1,12 @@
 bin/gnome-cups-add
 bin/gnome-cups-icon
 bin/gnome-cups-manager
+include/libgnomecups-1/libgnomecups/gnome-cups-permission.h
+include/libgnomecups-1/libgnomecups/gnome-cups-ui-connection.h
+include/libgnomecups-1/libgnomecups/gnome-cups-ui-driver.h
 include/libgnomecups-1/libgnomecups/gnome-cups-ui-init.h
 include/libgnomecups-1/libgnomecups/gnome-cups-ui-print.h
+include/libgnomecups-1/libgnomecups/gnome-cups-ui-util.h
 lib/libgnomecupsui-1.0.a
 lib/libgnomecupsui-1.0.so
 lib/libgnomecupsui-1.0.so.1
@@ -11,7 +15,10 @@ libdata/pkgconfig/libgnomecupsui-1.0.pc
 sbin/gnome-cups-switch
 share/gnome/applications/gnome-cups-manager.desktop
 share/gnome/gnome-cups-manager/gnome-cups-add.glade
+share/gnome/gnome-cups-manager/gnome-cups-add-druid.png
 share/gnome/gnome-cups-manager/gnome-cups-manager.glade
+share/gnome/gnome-cups-manager/gnome-cups-ui-connection.glade
+share/gnome/gnome-cups-manager/gnome-cups-ui-driver.glade
 share/gnome/gnome-cups-manager/xd2-testpage-a4.eps
 share/gnome/gnome-cups-manager/xd2-testpage-letter.eps
 share/gnome/pixmaps/gnome-cups-manager/printer-tray-normal.png
@@ -19,8 +26,9 @@ share/gnome/pixmaps/gnome-cups-manager/printer-tray-stopped.png
 share/icons/hicolor/48x48/devices/gnome-dev-printer-network.png
 share/icons/hicolor/48x48/devices/gnome-dev-printer-new.png
 share/icons/hicolor/48x48/devices/gnome-dev-printer.png
-share/icons/hicolor/48x48/emblems/emblem-default.png
-share/icons/hicolor/48x48/emblems/emblem-paused.png
+share/icons/hicolor/48x48/stock/data/emblem-default.png
+share/icons/hicolor/48x48/stock/data/emblem-paused.png
+share/locale/bg/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/ca/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/cs/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/de/LC_MESSAGES/gnome-cups-manager.mo
@@ -32,18 +40,23 @@ share/locale/fi/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/fr/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/he/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/hr/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/hu/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/it/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/ja/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/ko/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/nb/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/nl/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/no/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/pa/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/pt/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/sq/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/sr/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/sv/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/tr/LC_MESSAGES/gnome-cups-manager.mo
 share/locale/uk/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-cups-manager.mo
 @dirrm share/gnome/pixmaps/gnome-cups-manager
 @dirrm share/gnome/gnome-cups-manager