aboutsummaryrefslogtreecommitdiffstats
path: root/deskutils
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2004-01-05 23:48:15 +0800
committermarcus <marcus@FreeBSD.org>2004-01-05 23:48:15 +0800
commit9b79941ef821ce4e90890358927fc7f78c42205e (patch)
treed6550b164de6ef6330d20deffd1c65d1320a0e75 /deskutils
parent67d7c5f89f939daff297f639d753670c5e6ba396 (diff)
downloadfreebsd-ports-gnome-9b79941ef821ce4e90890358927fc7f78c42205e.tar.gz
freebsd-ports-gnome-9b79941ef821ce4e90890358927fc7f78c42205e.tar.zst
freebsd-ports-gnome-9b79941ef821ce4e90890358927fc7f78c42205e.zip
Update to 1.93.2.
PR: 60927 Submitted by: KATO Tsuguru <tkato@prontomail.com>
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/glabels/Makefile11
-rw-r--r--deskutils/glabels/distinfo2
-rw-r--r--deskutils/glabels/files/patch-barcode-0.98_Makefile.in17
-rw-r--r--deskutils/glabels/files/patch-configure10
-rw-r--r--deskutils/glabels/pkg-plist8
5 files changed, 21 insertions, 27 deletions
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index 22e46d048c55..712bcdb6c67c 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= glabels
-PORTVERSION= 1.93.1
+PORTVERSION= 1.93.2
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,16 +14,11 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= A programm to create labels and business cards
-LIB_DEPENDS= paper.2:${PORTSDIR}/print/libpaper
-
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnometarget libgnomeui libgnomeprintui
-USE_GETOPT_LONG= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
diff --git a/deskutils/glabels/distinfo b/deskutils/glabels/distinfo
index 9a54c70a8ed8..25f7cea9f946 100644
--- a/deskutils/glabels/distinfo
+++ b/deskutils/glabels/distinfo
@@ -1 +1 @@
-MD5 (glabels-1.93.1.tar.gz) = aefbfabda808c145e306c385a110cb93
+MD5 (glabels-1.93.2.tar.gz) = f748f43805763b03567c5a2c2505ab1b
diff --git a/deskutils/glabels/files/patch-barcode-0.98_Makefile.in b/deskutils/glabels/files/patch-barcode-0.98_Makefile.in
deleted file mode 100644
index d1f5a29a98bf..000000000000
--- a/deskutils/glabels/files/patch-barcode-0.98_Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- barcode-0.98/Makefile.in.orig Wed Dec 24 10:39:07 2003
-+++ barcode-0.98/Makefile.in Wed Dec 24 10:49:04 2003
-@@ -3,12 +3,12 @@
- #
-
- CC = @CC@
--CFLAGS = @CFLAGS@ @DEFS@ @NO_GETOPT@ @NO_LIBPAPER@ @NO_STRERROR@
-+CFLAGS = @CFLAGS@ @DEFS@ @NO_GETOPT@ @NO_LIBPAPER@ @NO_STRERROR@ @CPPFLAGS@
- RANLIB = @RANLIB@
-
- INSTALL = @INSTALL@
-
--LDFLAGS = -L. -l$(TARGET) @LIBPAPER@
-+LDFLAGS = -L. -l$(TARGET) @LIBPAPER@ @LDFLAGS@
-
- prefix = @prefix@
- BINDIR = $(prefix)/bin
diff --git a/deskutils/glabels/files/patch-configure b/deskutils/glabels/files/patch-configure
new file mode 100644
index 000000000000..890bcb65910f
--- /dev/null
+++ b/deskutils/glabels/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig Sun Jan 4 13:27:53 2004
++++ configure Mon Jan 5 00:47:16 2004
+@@ -7674,6 +7674,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/deskutils/glabels/pkg-plist b/deskutils/glabels/pkg-plist
index 03d70adf2c5c..72950a8def1a 100644
--- a/deskutils/glabels/pkg-plist
+++ b/deskutils/glabels/pkg-plist
@@ -7,6 +7,7 @@ share/gnome/glabels/avery-us-templates.xml
share/gnome/glabels/glabels-2.0.dtd
share/gnome/glabels/glade/object-editor.glade
share/gnome/glabels/glade/prefs-dialog.glade
+share/gnome/glabels/glade/template-designer.glade
share/gnome/glabels/misc-iso-templates.xml
share/gnome/glabels/misc-us-templates.xml
share/gnome/glabels/paper-sizes.xml
@@ -23,9 +24,13 @@ share/gnome/help/glabels/C/glabels.xml
share/gnome/help/glabels/C/legal.xml
share/gnome/mime-info/glabels.keys
share/gnome/mime-info/glabels.mime
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/glabels/glabels-C.omf 2>/dev/null || true
share/gnome/omf/glabels/glabels-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/glabels/glabels-C.omf 2>/dev/null || true
+share/gnome/pixmaps/glabels/ex-1layout.png
+share/gnome/pixmaps/glabels/ex-2layouts.png
+share/gnome/pixmaps/glabels/ex-cd-size.png
+share/gnome/pixmaps/glabels/ex-rect-size.png
+share/gnome/pixmaps/glabels/ex-round-size.png
share/gnome/pixmaps/glabels/glabels-about-logo.png
share/gnome/pixmaps/glabels/glabels-icon.png
share/gnome/pixmaps/glabels/glabels-logo.png
@@ -48,3 +53,4 @@ share/locale/zh_TW.Big5/LC_MESSAGES/glabels.mo
@dirrm share/gnome/glabels/ui
@dirrm share/gnome/glabels/glade
@dirrm share/gnome/glabels
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/glabels/glabels-C.omf 2>/dev/null || true