Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv15089
Modified Files:
gnotepad+.info gnotepad+.patch
Log Message:
fix putting files into /sw/lib/locale,
fix putting files directly into /sw/lib/locale,
fix putting files directly into /sw/lib/locale and failing silently when unable
to do so
Index: gnotepad+.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/gnotepad+.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gnotepad+.patch 25 May 2010 23:01:59 -0000 1.2
+++ gnotepad+.patch 1 Aug 2010 12:52:43 -0000 1.3
@@ -49,6 +49,15 @@
$gtk_config_major_version, $gtk_config_minor_version,
$gtk_config_micro_version,
gtk_major_version, gtk_minor_version, gtk_micro_version);
printf ("*** was found! If gtk-config was correct, then it is best\n");
+@@ -5159,7 +5159,7 @@
+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e
"\$s/\(.*\) \\\\/\1/" \
+ < $srcdir/po/POTFILES.in > po/POTFILES
+
+-gnplocaledir='${prefix}/${DATADIRNAME}/locale'
++gnplocaledir='${datadir}/locale'
+
+
+
diff -Nurd -x'*~' gnotepad+-1.3.3.orig/src/Makefile.in
gnotepad+-1.3.3/src/Makefile.in
--- gnotepad+-1.3.3.orig/src/Makefile.in 2001-01-01 13:39:30.000000000
-0500
+++ gnotepad+-1.3.3/src/Makefile.in 2010-05-25 18:50:47.000000000 -0400
@@ -372,3 +381,41 @@
}
while (tbdp->text != NULL) {
+diff -Nurd -x'*~' gnotepad+-1.3.3.orig/po/Makefile.in.in
gnotepad+-1.3.3/po/Makefile.in.in
+--- gnotepad+-1.3.3.orig/po/Makefile.in.in 1999-10-27 23:17:09.000000000
-0400
++++ gnotepad+-1.3.3/po/Makefile.in.in 2010-07-31 22:28:51.000000000 -0400
+@@ -19,7 +19,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
+@@ -111,7 +111,7 @@
+ install-data-no: all
+ install-data-yes: all
+ if test -r "$(MKINSTALLDIRS)"; then \
+- $(MKINSTALLDIRS) $(datadir); \
++ $(MKINSTALLDIRS) ${DESTDIR}$(datadir); \
+ else \
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
+ fi
+@@ -125,13 +126,13 @@
+ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ dir=$$destdir/$$lang/LC_MESSAGES; \
+ if test -r "$(MKINSTALLDIRS)"; then \
+- $(MKINSTALLDIRS) $$dir; \
++ $(MKINSTALLDIRS) ${DESTDIR}$$dir; \
+ else \
+ $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
+ fi; \
+ if test -r $$cat; then \
+- $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
+- echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
++ $(INSTALL_DATA) $$cat ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT); \
++ echo "installing $$cat as ${DESTDIR}$$dir/$(PACKAGE)$(INSTOBJEXT)";
\
+ else \
+ $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
+ echo "installing $(srcdir)/$$cat as" \
Index: gnotepad+.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/gnotepad+.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gnotepad+.info 25 May 2010 23:01:59 -0000 1.5
+++ gnotepad+.info 1 Aug 2010 12:52:43 -0000 1.6
@@ -1,6 +1,6 @@
Package: gnotepad+
Version: 1.3.3
-Revision: 5
+Revision: 6
Source: http://download.sourceforge.net/gnotepad/%n-%v.tar.gz
Source-MD5: 00f1de16e84cbbe65d85acc542b2791f
BuildDepends: <<
@@ -32,7 +32,7 @@
pango1-xft2-ft219-shlibs (>= 1.24.5-4)
<<
PatchFile: %n.patch
-PatchFile-MD5: 55569e2e012db84c2e4131a40bb1ce37
+PatchFile-MD5: 268f20078efd63d11fdbf2b88d0b06e0
ConfigureParams: --mandir=%p/share/man --disable-gnome --disable-gtkhtml
--disable-gtk-xmhtml
SetCPPFLAGS: -DGTK_HAVE_FEATURES_1_1_0 -DGTK_ENABLE_BROKEN -MD
CompileScript: <<
@@ -41,10 +41,10 @@
export GTK_CONFIG="%p/bin/pkg-config gtk+-2.0"
export GNOME_CONFIG="/usr/bin/true"
./configure %c
- make INTLLIBS=-lintl
+ make -w INTLLIBS=-lintl
fink-package-precedence --depfile-ext='\.d' .
<<
-InstallScript: make install DESTDIR=%d
+InstallScript: make -w install DESTDIR=%d
DocFiles: AUTHORS COPYING ChangeLog HACKING NEWS README TODO
Description: Simple and feature-rich HTML/text editor
DescDetail: <<
@@ -67,3 +67,4 @@
Recent glib doesn't publish -lintl, so pass it directly.
<<
Homepage: http://gnotepad.sourceforge.net
+
------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://p.sf.net/sfu/dev2dev-palm
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
