Update to 0.9.80.

This commit is contained in:
Roman Bogorodskiy 2005-12-22 19:30:59 +00:00
parent fbacc233e5
commit 0f42c53c5e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=151871
7 changed files with 53 additions and 124 deletions

View File

@ -6,8 +6,7 @@
#
PORTNAME= gphpedit
PORTVERSION= 0.9.50
PORTREVISION= 2
PORTVERSION= 0.9.80
CATEGORIES= editors gnome
MASTER_SITES= http://www.gphpedit.org/download/store/ \
http://ftp.ceid.upatras.gr/pub/linux/gentoo/distfiles/ \
@ -44,6 +43,9 @@ pre-everything::
@${ECHO_MSG} "WITHOUT_PHPDOC=yes to not install php_doc, help will be disable."
.endif
post-extract:
cd ${WRKSRC}/src/gtkscintilla2 && ${GMAKE} clean
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local/share|${PREFIX}/share/gnome|g' \
${WRKSRC}/src/main.h

View File

@ -1,2 +1,3 @@
MD5 (gphpedit-0.9.50.tar.gz) = 5683f1f196d8c80bdad587a043423046
SIZE (gphpedit-0.9.50.tar.gz) = 829535
MD5 (gphpedit-0.9.80.tar.gz) = f05e6354ea64c73dd7bfe020ae15ac71
SHA256 (gphpedit-0.9.80.tar.gz) = 607a36e51d8d2e60f2747d672efe780c96e18a451ff3f82bff93ecb171306849
SIZE (gphpedit-0.9.80.tar.gz) = 2369130

View File

@ -1,5 +1,5 @@
--- gphpedit.desktop.in.orig Sat Dec 18 14:14:16 2004
+++ gphpedit.desktop.in Sat Dec 18 14:14:39 2004
--- gphpedit.desktop.in.orig Thu Dec 22 22:01:19 2005
+++ gphpedit.desktop.in Thu Dec 22 22:01:42 2005
@@ -5,5 +5,5 @@
Terminal=false
MultipleArgs=true

View File

@ -1,11 +1,11 @@
--- src/Makefile.in.orig Sun Nov 21 17:31:35 2004
+++ src/Makefile.in Sun Nov 21 17:32:14 2004
@@ -495,7 +495,7 @@
--- src/Makefile.in.orig Thu Dec 22 20:56:32 2005
+++ src/Makefile.in Thu Dec 22 20:56:51 2005
@@ -499,7 +499,7 @@
-g -Wall -DGTK -DSCI_LEXER
gtkscintilla2/libgtkscintilla2.a:
- cd gtkscintilla2 && make libgtkscintilla2.a && cd ..
+ @cd gtkscintilla2 && $(MAKE) libgtkscintilla2.a && cd ..
+ cd gtkscintilla2 && $(MAKE) libgtkscintilla2.a && cd ..
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -1,5 +1,5 @@
--- src/gtkscintilla2/Makefile.orig Wed Nov 3 07:27:52 2004
+++ src/gtkscintilla2/Makefile Sat Dec 18 14:10:04 2004
--- src/gtkscintilla2/Makefile.orig Thu Dec 22 22:02:47 2005
+++ src/gtkscintilla2/Makefile Thu Dec 22 22:04:02 2005
@@ -2,7 +2,7 @@
NAME = GtkScintilla2
@ -13,16 +13,16 @@
SCINTILLA_LIB = $(SCINTILLA_DIR)/bin/scintilla.a
SCINTILLA_IFACE = $(SCINTILLA_INCLUDE)/Scintilla.iface
LEXERS = $(wildcard $(SCINTILLA_DIR)/gtk/Lex*.o)
-CFLAGS = $(shell pkg-config --cflags gtk+-2.0) -g -Wall -DGTK -DSCI_LEXER
-CFLAGS = $(shell pkg-config --cflags gtk+-2.0) -g -Wall -DGTK -DSCI_LEXER -fPIC
-LDFLAGS_PRE = $(shell pkg-config --libs gtk+-2.0) -DGTK2
+CFLAGS += $(shell pkg-config --cflags gtk+-2.0 gthread-2.0) -Wall -DGTK -DSCI_LEXER -DPIC -fpic
+CFLAGS = $(shell pkg-config --cflags gtk+-2.0 gthread-2.0) -g -Wall -DGTK -DSCI_LEXER -fPIC
+LDFLAGS_PRE = $(shell pkg-config --libs gtk+-2.0 gthread-2.0) -DGTK2
LDFLAGS_POST = $(LEXERS) $(SCINTILLA_LIB) -lstdc++
-CC = gcc
-LD = gcc
+CC ?= gcc
+LD = $(CC)
+LD ?= $(CC)
AR = ar
STATIC_LIB = lib$(LIB_NAME).a

View File

@ -1,48 +0,0 @@
--- src/gtkscintilla2/scintilla/gtk/makefile.orig Wed Nov 3 07:44:13 2004
+++ src/gtkscintilla2/scintilla/gtk/makefile Sat Dec 18 14:06:07 2004
@@ -8,7 +8,7 @@
# To force GTK+ 1 build, define GTK1 on the make command line.
.SUFFIXES: .cxx .o .h .a
-CC = g++
+CC ?= g++
AR = ar
RANLIB = touch
@@ -31,29 +31,29 @@
endif
ifdef DEBUG
-CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
+CXXFLAGS+=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
else
-CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
+CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)
endif
# If explicit setting of GTK1 or GTK2 then use that else look for
# pkg-config which is an OK indication that GTK2 is available
ifdef GTK2
-CONFIGFLAGS=pkg-config --cflags gtk+-2.0
+CONFIGFLAGS=pkg-config --cflags gtk+-2.0 gthread-2.0
else
ifdef GTK1
-CONFIGFLAGS=gtk-config --cflags
+CONFIGFLAGS=gtk-config --cflags gthread
else
ifneq (,$(findstring /,$(shell whereis pkg-config)))
-CONFIGFLAGS=pkg-config --cflags gtk+-2.0
+CONFIGFLAGS=pkg-config --cflags gtk+-2.0 gthread-2.0
else
-CONFIGFLAGS=gtk-config --cflags
+CONFIGFLAGS=gtk-config --cflags gthread
endif
endif
endif
.cxx.o:
- $(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<
+ $(CC) -DPIC -fpic `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<
LEXOBJS=LexCPP.o LexCSS.o LexEScript.o LexHTML.o LexPerl.o LexSQL.o LexVB.o

View File

@ -1,99 +1,73 @@
--- src/tab.c.orig Sat Dec 18 14:32:38 2004
+++ src/tab.c Sat Dec 18 14:46:22 2004
@@ -407,46 +407,81 @@
GString *tab_help_find_helpfile(gchar *command)
{
--- src/tab.c.orig Thu Dec 22 21:13:51 2005
+++ src/tab.c Thu Dec 22 22:08:18 2005
@@ -521,55 +521,55 @@
GString *long_filename = NULL;
-
- // For Redhat/Fedora Core and sensible distrubutions...
// For Redhat/Fedora Core and other sensible distrubutions...
- long_filename = tab_help_try_filename("/usr/share/doc/phpmanual/function.", command, ".html");
+
+ /* br (Brazillian) */
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-br/function.", command, ".html");
+ if (long_filename)
+ return long_filename;
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-br/ref.", command, ".html");
+ if (long_filename)
+ return long_filename;
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-br/", command, NULL);
+ if (long_filename)
+ return long_filename;
+
+ /* de (German) */
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-de/function.", command, ".html");
+ if (long_filename)
+ return long_filename;
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-de/ref.", command, ".html");
+ if (long_filename)
+ return long_filename;
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-de/", command, NULL);
+ if (long_filename)
+ return long_filename;
+
+ /* en (English) */
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-en/function.", command, ".html");
+ if (long_filename)
+ return long_filename;
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-en/ref.", command, ".html");
+ if (long_filename)
+ return long_filename;
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-en/", command, NULL);
+ if (long_filename)
+ return long_filename;
+
+ /* es (Spanish) */
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-es/function.", command, ".html");
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/phpmanual/function.", command, ".html");
if (long_filename)
return long_filename;
- long_filename = tab_help_try_filename("/usr/share/doc/phpmanual/ref.", command, ".html");
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-es/ref.", command, ".html");
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/phpmanual/ref.", command, ".html");
if (long_filename)
return long_filename;
- long_filename = tab_help_try_filename("/usr/share/doc/phpmanual/", command, NULL);
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-es/", command, NULL);
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/phpmanual/", command, NULL);
if (long_filename)
return long_filename;
- // For Gentoo, as much as I love it - it's twatty to put docs in a version specific folder like this!
// For Debian, Ubuntu and sensible distrubutions...
- long_filename = tab_help_try_filename("/usr/share/doc/phpdoc/html/function.", command, ".html");
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/phpdoc/html/function.", command, ".html");
if (long_filename)
return long_filename;
- long_filename = tab_help_try_filename("/usr/share/doc/phpdoc/html/ref.", command, ".html");
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/phpdoc/html/ref.", command, ".html");
if (long_filename)
return long_filename;
- long_filename = tab_help_try_filename("/usr/share/doc/phpdoc/html/", command, NULL);
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/phpdoc/html/", command, NULL);
if (long_filename)
return long_filename;
// For Gentoo, as much as I love it - it's twatty to put docs in a version specific folder like this!
- long_filename = tab_help_try_filename("/usr/doc/php-docs-200403/html/function.", command, ".html");
+ /* fr (French) */
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-fr/function.", command, ".html");
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/doc/php-docs-200403/html/function.", command, ".html");
if (long_filename)
return long_filename;
- long_filename = tab_help_try_filename("/usr/doc/php-docs-200403/html/ref.", command, ".html");
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-fr/ref.", command, ".html");
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/doc/php-docs-200403/html/ref.", command, ".html");
if (long_filename)
return long_filename;
- long_filename = tab_help_try_filename("/usr/doc/php-docs-200403/html/", command, NULL);
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-fr/", command, NULL);
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/doc/php-docs-200403/html/", command, NULL);
if (long_filename)
return long_filename;
- long_filename = tab_help_try_filename("/usr/share/doc/php-docs-200403/html/function.", command, ".html");
+ /* ja (Japanese) */
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-ja/function.", command, ".html");
- long_filename = tab_help_try_filename("/usr/share/doc/php-docs-20050822/html/function.", command, ".html");
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-docs-20050822/html/function.", command, ".html");
if (long_filename)
return long_filename;
- long_filename = tab_help_try_filename("/usr/share/doc/php-docs-200403/html/ref.", command, ".html");
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-ja/ref.", command, ".html");
- long_filename = tab_help_try_filename("/usr/share/doc/php-docs-20050822/html/ref.", command, ".html");
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-docs-20050822/html/ref.", command, ".html");
if (long_filename)
return long_filename;
- long_filename = tab_help_try_filename("/usr/share/doc/php-docs-200403/html/", command, NULL);
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-ja/", command, NULL);
- long_filename = tab_help_try_filename("/usr/share/doc/php-docs-20050822/html/", command, NULL);
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-docs-20050822/html/", command, NULL);
if (long_filename)
return long_filename;
- long_filename = tab_help_try_filename("/usr/doc/php-docs-4.2.3/html/function.", command, ".html");
+ /* pl (Polish) */
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-pl/function.", command, ".html");
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/doc/php-docs-4.2.3/html/function.", command, ".html");
if (long_filename)
return long_filename;
- long_filename = tab_help_try_filename("/usr/doc/php-docs-4.2.3/html/ref.", command, ".html");
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-pl/ref.", command, ".html");
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/doc/php-docs-4.2.3/html/ref.", command, ".html");
if (long_filename)
return long_filename;
- long_filename = tab_help_try_filename("/usr/doc/php-docs-4.2.3/html/", command, NULL);
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/share/doc/php-pl/", command, NULL);
+ long_filename = tab_help_try_filename("%%LOCALBASE%%/doc/php-docs-4.2.3/html/", command, NULL);
if (long_filename)
return long_filename;