summaryrefslogtreecommitdiffstats
path: root/x11/gnomeapplets2/files
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-01-16 13:38:43 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-01-16 13:38:43 +0800
commit02bc68e249a2ee7b89847b77af9edcc40e592873 (patch)
treeabe5fb63491f02a673116aae751777f0f727ef57 /x11/gnomeapplets2/files
parent8f4ee81788c8eefdf11136e9e7f858dd59d56ef5 (diff)
downloadmarcuscom-ports-02bc68e249a2ee7b89847b77af9edcc40e592873.tar
marcuscom-ports-02bc68e249a2ee7b89847b77af9edcc40e592873.tar.gz
marcuscom-ports-02bc68e249a2ee7b89847b77af9edcc40e592873.tar.bz2
marcuscom-ports-02bc68e249a2ee7b89847b77af9edcc40e592873.tar.lz
marcuscom-ports-02bc68e249a2ee7b89847b77af9edcc40e592873.tar.xz
marcuscom-ports-02bc68e249a2ee7b89847b77af9edcc40e592873.tar.zst
marcuscom-ports-02bc68e249a2ee7b89847b77af9edcc40e592873.zip
Update to 2.5.4.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1678 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gnomeapplets2/files')
-rw-r--r--x11/gnomeapplets2/files/patch-battstat_Makefile.in38
-rw-r--r--x11/gnomeapplets2/files/patch-stickynotes_Makefile.in16
2 files changed, 27 insertions, 27 deletions
diff --git a/x11/gnomeapplets2/files/patch-battstat_Makefile.in b/x11/gnomeapplets2/files/patch-battstat_Makefile.in
index 6ddfc03c3..55d76e74c 100644
--- a/x11/gnomeapplets2/files/patch-battstat_Makefile.in
+++ b/x11/gnomeapplets2/files/patch-battstat_Makefile.in
@@ -1,27 +1,27 @@
---- battstat/Makefile.in.orig Tue Sep 23 00:11:20 2003
-+++ battstat/Makefile.in Tue Sep 23 00:14:03 2003
-@@ -154,11 +154,11 @@
- pixmapsdir = $(datadir)/pixmaps
+--- battstat/Makefile.in.orig Thu Jan 15 23:31:49 2004
++++ battstat/Makefile.in Thu Jan 15 23:33:58 2004
+@@ -243,11 +243,11 @@
pixmaps_DATA = battstat.png
- @HAVE_LIBAPM_TRUE@APMLIB = @HAVE_LIBAPM_TRUE@-lapm
--@HAVE_LIBAPM_FALSE@APMLIB = @HAVE_LIBAPM_FALSE@apmlib/libapm.a
-+@HAVE_LIBAPM_FALSE@APMLIB =
+
+ @HAVE_LIBAPM_TRUE@APMLIB = -lapm
+-@HAVE_LIBAPM_FALSE@APMLIB = apmlib/libapm.a
++@HAVE_LIBAPM_FALSE@APMLIB =
@HAVE_LIBAPM_TRUE@APMDIR =
--@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_FALSE@apmlib
+-@HAVE_LIBAPM_FALSE@APMDIR = apmlib
+@HAVE_LIBAPM_FALSE@APMDIR =
@HAVE_LIBAPM_TRUE@APMINC =
--@HAVE_LIBAPM_FALSE@APMINC = @HAVE_LIBAPM_FALSE@-Iapmlib/
+-@HAVE_LIBAPM_FALSE@APMINC = -Iapmlib/
+@HAVE_LIBAPM_FALSE@APMINC =
SUBDIRS = docs sounds $(APMDIR)
-@@ -230,8 +230,7 @@
- @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = \
- @HAVE_LIBAPM_TRUE@$(top_builddir)/screen-exec/libscreen-exec.la
- @HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES = \
--@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la \
--@HAVE_LIBAPM_FALSE@apmlib/libapm.a
-+@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la
- battstat_applet_2_LDFLAGS =
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@@ -314,8 +314,7 @@
+ @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = \
+ @HAVE_LIBAPM_TRUE@ $(top_builddir)/screen-exec/libscreen-exec.la
+ @HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES = \
+-@HAVE_LIBAPM_FALSE@ $(top_builddir)/screen-exec/libscreen-exec.la \
+-@HAVE_LIBAPM_FALSE@ apmlib/libapm.a
++@HAVE_LIBAPM_FALSE@ $(top_builddir)/screen-exec/libscreen-exec.la
+ battstat_applet_2_LDFLAGS =
+
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
diff --git a/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in b/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in
index 973b7e342..5ac5380e0 100644
--- a/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in
+++ b/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in
@@ -1,11 +1,11 @@
---- stickynotes/Makefile.in.orig Thu Aug 28 01:00:09 2003
-+++ stickynotes/Makefile.in Thu Aug 28 01:00:26 2003
-@@ -142,7 +142,7 @@
-
- SUBDIRS = pixmaps docs
+--- stickynotes/Makefile.in.orig Thu Jan 15 23:34:48 2004
++++ stickynotes/Makefile.in Thu Jan 15 23:35:09 2004
+@@ -70,7 +70,7 @@
+ CDROM_HOST = @CDROM_HOST@
+ CDROM_LIBS = @CDROM_LIBS@
-CFLAGS = -Wall -g
+CFLAGS += -Wall -g
-
- INCLUDES = -I. -I$(srcdir) $(GNOME_APPLETS_CFLAGS) $(LIBGLADE_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DSTICKYNOTES_GLADEDIR=\"$(gladedir)\" -DSTICKYNOTES_ICONDIR=\"$(icondir)\"
-
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@