aboutsummaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorAdam Weinberger <adamw@FreeBSD.org>2003-04-13 20:31:38 +0000
committerAdam Weinberger <adamw@FreeBSD.org>2003-04-13 20:31:38 +0000
commit846e0d4c3c1a1ca622c224205266466eeb25d52e (patch)
tree24a80394e6bc8eaff3857d0e19eda7702cd48b7e /sysutils
parentd875dcd2210562cbc0af84e50e6074d0b75c1cf1 (diff)
downloadports-846e0d4c3c1a1ca622c224205266466eeb25d52e.tar.gz
ports-846e0d4c3c1a1ca622c224205266466eeb25d52e.zip
Notes
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/thefish/Makefile5
-rw-r--r--sysutils/thefish/distinfo2
-rw-r--r--sysutils/thefish/files/patch-gui_ui.c138
3 files changed, 3 insertions, 142 deletions
diff --git a/sysutils/thefish/Makefile b/sysutils/thefish/Makefile
index 5fc3dee07d41..4e80c18fa9ea 100644
--- a/sysutils/thefish/Makefile
+++ b/sysutils/thefish/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= thefish
-PORTVERSION= 0.3
-PORTREVISION= 1
+PORTVERSION= 0.3.1
CATEGORIES= sysutils
MASTER_SITES= http://energyhq.homeip.net/files/
@@ -18,7 +17,7 @@ COMMENT= Gtk+/ncurses rc.conf editor/management tool
NO_GUI= yes
MAKE_ENV+= NO_GUI=yes
.else
-LIB_DEPENDS= gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20
+USE_GNOME= gtk20
USE_X_PREFIX= yes
.endif
diff --git a/sysutils/thefish/distinfo b/sysutils/thefish/distinfo
index 797c251c34d0..995d39676739 100644
--- a/sysutils/thefish/distinfo
+++ b/sysutils/thefish/distinfo
@@ -1 +1 @@
-MD5 (thefish-0.3.tar.gz) = f51b20b4a3c4714f0902138e23765adf
+MD5 (thefish-0.3.1.tar.gz) = 40ec4c7a47929032eca9d633c8ace891
diff --git a/sysutils/thefish/files/patch-gui_ui.c b/sysutils/thefish/files/patch-gui_ui.c
deleted file mode 100644
index b696e535cf97..000000000000
--- a/sysutils/thefish/files/patch-gui_ui.c
+++ /dev/null
@@ -1,138 +0,0 @@
---- gtk_ui.c.orig Tue Feb 4 17:51:19 2003
-+++ gtk_ui.c Tue Feb 4 17:51:37 2003
-@@ -24,7 +24,7 @@
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--$Id: //depot/fish/gtk_ui.c#28 $
-+$Id: //depot/fish/gtk_ui.c#29 $
-
- */
-
-@@ -33,6 +33,10 @@
- #include <string.h>
- #include <fcntl.h>
-
-+#include <sys/types.h>
-+#include <sys/uio.h>
-+#include <unistd.h>
-+
- #include <time.h>
- extern char *tzname[2];
-
-@@ -66,6 +70,8 @@
- void add_yes_pressed(GtkWidget *, gpointer);
- void add_no_pressed(GtkWidget *, gpointer);
-
-+void save_geometry(void);
-+
- /* Some defines here */
- #define IS_DIRTY 1
- #define NOT_DIRTY 0
-@@ -139,7 +145,10 @@
- GtkWidget *window;
- GtkWidget *myviewport1;
- GtkWidget *myviewport2;
--
-+
-+ /* Window geometry */
-+ int oldsize[2];
-+
- /* I know this code looks chaotic at first sight, but it seems to work :-) */
- int
- create_gtk_ui(RC_NODE *rc_knobs,int num_knobs,RC_NODE *rc_strings,int num_str)
-@@ -202,6 +211,10 @@
-
- int i;
-
-+ char *homedir;
-+ char temp[255];
-+ int fd;
-+
- commit_win_up=FALSE;
- add_win_up=FALSE;
- about_win_up=FALSE;
-@@ -218,6 +231,27 @@
- gtk_window_set_title(GTK_WINDOW(window),"The Fish");
-
-
-+ /* Set the size */
-+
-+ homedir=getenv("HOME");
-+ if(homedir!=NULL) {
-+
-+ snprintf(temp,255,"%s/%s",homedir,".thefishrc");
-+ fd=open(temp,O_RDONLY,0);
-+ if(fd!=-1) {
-+ read(fd,&oldsize[0],sizeof(oldsize));
-+ close(fd);
-+ } else {
-+
-+ oldsize[0]=400;
-+ oldsize[1]=480;
-+
-+ }
-+
-+ }
-+
-+ gtk_window_set_default_size(GTK_WINDOW(window),oldsize[0],oldsize[1]);
-+
- /* Set the icon */
- icon16_pixbuf=gdk_pixbuf_new_from_xpm_data((const char **)icon16);
- icon32_pixbuf=gdk_pixbuf_new_from_xpm_data((const char **)icon32);
-@@ -561,6 +595,7 @@
- void
- destroy( GtkWidget *widget, gpointer data)
- {
-+ save_geometry();
- gtk_main_quit();
- }
-
-@@ -583,10 +618,15 @@
- result=gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
-
-- if(result==GTK_RESPONSE_YES) gtk_main_quit();
-+ if(result==GTK_RESPONSE_YES) {
-+
-+ save_geometry();
-+ gtk_main_quit();
-+ }
-
-- } else {
-+ } else {
-
-+ save_geometry();
- gtk_main_quit();
-
- }
-@@ -1167,4 +1207,29 @@
- gtk_widget_destroy(add_window);
-
- add_win_up=FALSE;
-+}
-+
-+void
-+save_geometry(void)
-+{
-+
-+ int newsize[2];
-+ char *homedir;
-+ char temp[255];
-+ int fd;
-+
-+ gtk_window_get_size(GTK_WINDOW(window),&newsize[0],&newsize[1]);
-+
-+ if(oldsize[0]!=newsize[0] || oldsize[1]!=newsize[1]) {
-+
-+ homedir=getenv("HOME");
-+ if(homedir==NULL) return;
-+ snprintf(temp,255,"%s/%s",homedir,".thefishrc");
-+ fd=open(temp,O_WRONLY|O_CREAT|O_TRUNC,0666);
-+ if(fd==-1) return;
-+ write(fd,&newsize[0],sizeof(newsize));
-+ close(fd);
-+ return;
-+
-+ }
- }