Update to 0.18.

Submitted by:	John Merryweather Cooper <johnmary@adelphia.net>
This commit is contained in:
Joe Marcus Clarke 2004-06-09 04:54:52 +00:00
parent 62ed1df86e
commit 672903815b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=111127
7 changed files with 66 additions and 56 deletions

View File

@ -5,11 +5,10 @@
# $FreeBSD$
PORTNAME= gnome-cups-manager
PORTVERSION= 0.17
PORTREVISION= 2
PORTVERSION= 0.18
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.17
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.18
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@ -23,6 +22,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeprintui libgnomeui
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@ -35,6 +35,6 @@ post-patch:
post-install:
${INSTALL_DATA} ${WRKSRC}/gnome-cups-manager.desktop \
${PREFIX}/share/gnome/applications
${PREFIX}/share/gnome/applications
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
MD5 (gnome2/gnome-cups-manager-0.17.tar.bz2) = 1aa72f8318a7ccb795cdfd2676d6346c
SIZE (gnome2/gnome-cups-manager-0.17.tar.bz2) = 316581
MD5 (gnome2/gnome-cups-manager-0.18.tar.bz2) = d8508654ed956de73fa62a72b4358a1a
SIZE (gnome2/gnome-cups-manager-0.18.tar.bz2) = 472324

View File

@ -2,7 +2,7 @@
Encoding=UTF-8
Type=Application
Exec=gnome-cups-manager
Icon=%%PREFIX%%/share/icons/gnome/48x48/devices/gnome-dev-printer.png
Icon=%%PREFIX%%/share/icons/hicolor/48x48/devices/gnome-dev-printer.png
Terminal=false
Name=CUPS manager
Comment=Printer manager

View File

@ -1,11 +0,0 @@
--- gnome-cups-add/printerconf.c.orig Fri Mar 7 14:48:48 2003
+++ gnome-cups-add/printerconf.c Tue Jul 15 11:20:00 2003
@@ -12,7 +12,7 @@
#include "snmpinter.h"
#define IOCNR_GET_DEVICE_ID 1
-#define LPIOC_GET_DEVICE_ID(len) _IOC(_IOC_READ, 'P', IOCNR_GET_DEVICE_ID, len) /* get device_id string */
+#define LPIOC_GET_DEVICE_ID(len) _IOC(IOC_OUT, 'P', IOCNR_GET_DEVICE_ID, len) /* get device_id string */
/*----------------------------------------------------------------
libprinterconf - a function library for detecting and setting up

View File

@ -1,15 +1,15 @@
--- icons/Makefile.in.orig Tue Jul 15 13:57:05 2003
+++ icons/Makefile.in Tue Jul 15 13:58:07 2003
@@ -118,10 +118,10 @@
--- 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@
cxxflags_set = @cxxflags_set@
WARN_CXXFLAGS = @WARN_CXXFLAGS@
-devicedir = $(datadir)/icons/gnome/48x48/devices
+devicedir = $(prefix)/$(DATADIRNAME)/icons/gnome/48x48/devices
device_DATA = gnome-dev-printer-network.png gnome-dev-printer-new.png
-devicedir = $(datadir)/icons/hicolor/48x48/devices
+devicedir = $(prefix)/$(DATADIRNAME)/icons/hicolor/48x48/devices
device_DATA = gnome-dev-printer.png gnome-dev-printer-network.png gnome-dev-printer-new.png
-emblemdir = $(datadir)/icons/gnome/48x48/emblems
+emblemdir = $(prefix)/$(DATADIRNAME)/icons/gnome/48x48/emblems
-emblemdir = $(datadir)/icons/hicolor/48x48/emblems
+emblemdir = $(prefix/$(DATADIRNAME)/icons/hicolor/48x48/emblems
emblem_DATA = emblem-default.png emblem-paused.png
pixmapdir = $(datadir)/pixmaps/gnome-cups-manager

View File

@ -1,51 +1,51 @@
--- ltmain.sh.orig Sat Feb 8 08:47:44 2003
+++ ltmain.sh Tue Jul 15 13:06:35 2003
@@ -1075,7 +1075,7 @@
--- ltmain.sh.old Tue Jun 8 19:21:45 2004
+++ ltmain.sh Tue Jun 8 19:40:03 2004
@@ -1356,7 +1356,7 @@
esac
elif test "X$arg" = "X-lc_r"; then
case $host in
elif test "X$arg" = "X-lc_r"; then
case $host in
- *-*-openbsd* | *-*-freebsd*)
+ *-*-openbsd* | *-*-freebsd4*)
# Do not include libc_r directly, use -pthread flag.
continue
;;
@@ -1085,8 +1085,16 @@
# Do not include libc_r directly, use -pthread flag.
continue
;;
@@ -1371,8 +1371,16 @@
continue
;;
+ -pthread)
+ compile_command="$compile_command -pthread"
+ finalize_command="$finalize_command -pthread"
+ compiler_flags="$compiler_flags -pthread"
+ continue
+ ;;
+ compile_command="$compile_command -pthread"
+ finalize_command="$finalize_command -pthread"
+ compiler_flags="$compiler_flags -pthread"
+ continue
+ ;;
+
-module)
module=yes
+ build_old_libs=no
+ build_old_libs=no
continue
;;
@@ -2503,6 +2511,9 @@
*-*-openbsd* | *-*-freebsd*)
@@ -3200,6 +3208,9 @@
# Do not include libc due to us having libc/libc_r.
test "X$arg" = "X-lc" && continue
;;
+ *-*-freebsd*)
+ # FreeBSD doesn't need this...
+ ;;
*)
+ *-*-freebsd*)
+ # FreeBSD doesn't need this . . .
+ ;;
*)
# Add libc to deplibs on all other systems if necessary.
if test $build_libtool_need_lc = "yes"; then
@@ -4330,10 +4341,12 @@
if test "$build_libtool_need_lc" = "yes"; then
@@ -5550,10 +5561,12 @@
fi
# Install the pseudo-library for information purposes.
+ if /usr/bin/false; then
+ if /usr/bin/false; then
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
$show "$install_prog $instname $destdir/$name"
$run eval "$install_prog $instname $destdir/$name" || exit $?
+ fi
+ fi
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

View File

@ -16,11 +16,32 @@ 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
share/gnome/pixmaps/gnome-cups-manager/printer-tray-stopped.png
share/icons/gnome/48x48/devices/gnome-dev-printer-network.png
share/icons/gnome/48x48/devices/gnome-dev-printer-new.png
share/icons/gnome/48x48/emblems/emblem-default.png
share/icons/gnome/48x48/emblems/emblem-paused.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/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
share/locale/el/LC_MESSAGES/gnome-cups-manager.mo
share/locale/en_CA/LC_MESSAGES/gnome-cups-manager.mo
share/locale/en_GB/LC_MESSAGES/gnome-cups-manager.mo
share/locale/es/LC_MESSAGES/gnome-cups-manager.mo
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/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/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/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
@dirrm share/gnome/pixmaps/gnome-cups-manager
@dirrm share/gnome/gnome-cups-manager