Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 7 Apr 2001 11:19:29 -0500 (CDT)
From:      ishmael27@home.com
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/26404: Fix port net/gtk+licq
Message-ID:  <200104071619.f37GJTq70000@babylon.merseine.nu>

next in thread | raw e-mail | index | archive | help

>Number:         26404
>Category:       ports
>Synopsis:       Fix port net/gtk+licq
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 07 09:20:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Jeremy Norris
>Release:        FreeBSD 4.3-BETA i386
>Organization:
none
>Environment:
System: FreeBSD babylon.merseine.nu 4.3-BETA FreeBSD 4.3-BETA #0: Tue Mar 6 20:09:07 CST 2001 ishmael@babylon.merseine.nu:/usr/obj/usr/src/sys/BABYLON i386

>Description:
Fixup port net/licq:
Build with pspell support.
Remove unnecessary USE_AUTOMAKE.
Properly defined optional GNOME support.
Only install GNOME helppages if building with GNOME support.
Fix build so that licq_*_gui is shared module, not static archive.
Fix pkg-plist.
Fix patch-src::options_dialog.cpp and patch-src::plugin_dialog.cpp to include
unistd.h instead of sys/unistd.h.
Bump PORTREVISION for all the fixes.

>How-To-Repeat:

>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/gtk+licq/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile	2001/04/07 02:58:04	1.1
+++ Makefile	2001/04/07 16:03:29
@@ -7,33 +7,38 @@
 
 PORTNAME=	gtk+licq
 PORTVERSION=	0.50.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://gtk.licq.org/download/
 
 MAINTAINER=	ishmael27@home.com
 
 BUILD_DEPENDS=	${LOCALBASE}/include/licq/licq_icqd.h:${PORTSDIR}/net/licq
+LIB_DEPENDS=	pspell.4:${PORTSDIR}/textproc/pspell
 RUN_DEPENDS=	licq:${PORTSDIR}/net/licq
 
 USE_GMAKE=	yes
 USE_GTK=	yes
 WANT_GNOME=	yes
 USE_LIBTOOL=	yes
-USE_AUTOMAKE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
-.if defined(WITHOUT_GNOME)
-CONFIGURE_ARGS=	--disable-gnome
-GUITYPE=	gtk
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
+CONFIGURE_ARGS=	--enable-gnome
 .else
-GUITYPE=	gnome
+CONFIGURE_ARGS=	--disable-gnome
+post-patch:
+	@${PERL5} -pi -e \
+		's|^SUBDIRS\ =.*|SUBDIRS\ =\ |' ${WRKSRC}/doc/Makefile.in
 .endif
-
-PLIST_SUB=	GUITYPE=${GUITYPE}
-
-CONFIGURE_ENV=	CPPFLAGS=-"I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
 
-post-install:
-	strip ${PREFIX}/lib/licq/licq_${GUITYPE}_gui.a
+post-configure:
+	@${PERL5} -pi -e \
+		's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \
+		${WRKSRC}/libtool
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/gtk+licq/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	2001/04/07 02:58:04	1.1
+++ pkg-plist	2001/04/07 16:06:15
@@ -1,4 +1,24 @@
-lib/licq/licq_%%GUITYPE%%_gui.a
+%%GNOME:%%lib/licq/licq_gnome_gui.so
+%%GNOME:%%share/gnome/help/gtk+licq/C/arvancedusage.html
+%%GNOME:%%share/gnome/help/gtk+licq/C/authors.html
+%%GNOME:%%share/gnome/help/gtk+licq/C/bugs.html
+%%GNOME:%%share/gnome/help/gtk+licq/C/docbook.css
+%%GNOME:%%share/gnome/help/gtk+licq/C/goodstuff.html
+%%GNOME:%%share/gnome/help/gtk+licq/C/images/gtk_licq_applet.png
+%%GNOME:%%share/gnome/help/gtk+licq/C/images/gtk_licq_chatwindow.png
+%%GNOME:%%share/gnome/help/gtk+licq/C/images/gtk_licq_infowindow.png
+%%GNOME:%%share/gnome/help/gtk+licq/C/images/gtk_licq_mainwindow.png
+%%GNOME:%%share/gnome/help/gtk+licq/C/images/gtk_licq_optionwindow.png
+%%GNOME:%%share/gnome/help/gtk+licq/C/images/gtk_licq_regwindow.png
+%%GNOME:%%share/gnome/help/gtk+licq/C/images/gtk_licq_searchwindow.png
+%%GNOME:%%share/gnome/help/gtk+licq/C/images/gtk_licq_sendwindow.png
+%%GNOME:%%share/gnome/help/gtk+licq/C/images/gtk_licq_viewwindow.png
+%%GNOME:%%share/gnome/help/gtk+licq/C/index.html
+%%GNOME:%%share/gnome/help/gtk+licq/C/license.html
+%%GNOME:%%share/gnome/help/gtk+licq/C/prefs.html
+%%GNOME:%%share/gnome/help/gtk+licq/C/topic.dat
+%%GNOME:%%share/gnome/help/gtk+licq/C/usage.html
+%%NOGNOME:%%lib/licq/licq_gtk_gui.so
 share/licq/gtk-gui/pixmaps/arrow.xpm
 share/licq/gtk-gui/pixmaps/chatBeep.xpm
 share/licq/gtk-gui/pixmaps/chatBold.xpm
@@ -21,6 +41,10 @@
 share/locale/de/LC_MESSAGES/gtk+licq.mo
 share/locale/es/LC_MESSAGES/gtk+licq.mo
 share/locale/pt/LC_MESSAGES/gtk+licq.mo
+share/locale/pt_BR/LC_MESSAGES/gtk+licq.mo
 share/locale/ru/LC_MESSAGES/gtk+licq.mo
+%%GNOME:%%@dirrm share/gnome/help/gtk+licq/C/images
+%%GNOME:%%@dirrm share/gnome/help/gtk+licq/C
+%%GNOME:%%@dirrm share/gnome/help/gtk+licq
 @dirrm share/licq/gtk-gui/pixmaps
 @dirrm share/licq/gtk-gui
Index: files/patch-src::options_dialog.cpp
===================================================================
RCS file: /home/ncvs/ports/net/gtk+licq/files/patch-src::options_dialog.cpp,v
retrieving revision 1.1
diff -u -r1.1 patch-src::options_dialog.cpp
--- files/patch-src::options_dialog.cpp	2001/04/07 02:58:04	1.1
+++ files/patch-src::options_dialog.cpp	2001/04/07 14:54:20
@@ -3,7 +3,7 @@
 @@ -1,5 +1,6 @@
  #include "gtk-gui.h"
  
-+#include <sys/unistd.h>
++#include <unistd.h>
  #include <sys/time.h>
  #include <stdio.h>
  #include <sys/types.h>
Index: files/patch-src::plugin_dialog.cpp
===================================================================
RCS file: /home/ncvs/ports/net/gtk+licq/files/patch-src::plugin_dialog.cpp,v
retrieving revision 1.1
diff -u -r1.1 patch-src::plugin_dialog.cpp
--- files/patch-src::plugin_dialog.cpp	2001/04/07 02:58:04	1.1
+++ files/patch-src::plugin_dialog.cpp	2001/04/07 14:54:40
@@ -3,7 +3,7 @@
 @@ -1,5 +1,6 @@
  #include "gtk-gui.h"
  
-+#include <sys/unistd.h>
++#include <unistd.h>
  #include <sys/time.h>
  #include <stdio.h>
  #include <sys/types.h>
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200104071619.f37GJTq70000>