ports/71825: [PATCH] net/xicq: unbreak and minor fixes

Yen-Ming Lee leeym at FreeBSD.org
Fri Sep 17 18:10:38 UTC 2004


>Number:         71825
>Category:       ports
>Synopsis:       [PATCH] net/xicq: unbreak and minor fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 17 18:10:37 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Yen-Ming Lee
>Release:        FreeBSD 5.3-BETA4 i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD utopia.leeym.com 5.3-BETA4 FreeBSD 5.3-BETA4 #7: Mon Sep 13 05:12:30 CST 2004
>Description:

- add USE_GCC=2.95, update related patch, and unbreak this port
- replace pkg-plist with PLIST_FILES and PLIST_DIRS
- cosmetic fix which makes portlint happier

Removed file(s):
- pkg-plist

Port maintainer (scrappy at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- xicq-19980712_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/xicq/Makefile,v
retrieving revision 1.14
diff -u -u -r1.14 Makefile
--- Makefile	4 Feb 2004 05:08:24 -0000	1.14
+++ Makefile	17 Sep 2004 18:07:38 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xicq
-PORTVERSION=	19980712	
+PORTVERSION=	19980712
 PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://projekt.pinknet.cz/ftp/ICQ/linux/Xicq/
@@ -16,21 +16,18 @@
 COMMENT=	Xtropy's ICQ Client
 
 WRKSRC=		${WRKDIR}/xicq-071298
-
+USE_GCC=	2.95
 USE_GMAKE=	yes
 MAKE_ENV=	OPT="${CFLAGS}"
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
+PLIST_FILES=	bin/xicq ${EXAMPLESDIR:S,^${PREFIX}/,,g}/contact ${EXAMPLESDIR:S,^${PREFIX}/,,g}/config
+PLIST_DIRS=	${EXAMPLESDIR:S,^${PREFIX}/,,g}
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/src/xicq/main ${PREFIX}/bin/xicq
-		${MKDIR} ${PREFIX}/share/examples/xicq
+		${MKDIR} ${EXAMPLESDIR}
 .for file in contact config
-		${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/examples/xicq
+		${INSTALL_DATA} ${WRKSRC}/${file} ${EXAMPLESDIR}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: pkg-plist
diff -N pkg-plist
--- pkg-plist	10 Jan 1999 18:36:10 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-bin/xicq
-share/examples/xicq/contact
-share/examples/xicq/config
- at dirrm share/examples/xicq
Index: files/patch-aa
===================================================================
RCS file: /home/pcvs/ports/net/xicq/files/patch-aa,v
retrieving revision 1.1
diff -u -u -r1.1 patch-aa
--- files/patch-aa	10 Jan 1999 18:36:10 -0000	1.1
+++ files/patch-aa	17 Sep 2004 18:07:38 -0000
@@ -1,22 +1,8 @@
-diff -urN src.orig/libXicq/Makefile src/libXicq/Makefile
---- src.orig/libXicq/Makefile	Tue Dec 15 19:13:57 1998
-+++ src/libXicq/Makefile	Tue Dec 15 19:14:51 1998
+--- src/xicq/Makefile.orig	Tue Jul  7 00:58:53 1998
++++ src/xicq/Makefile	Sat Sep 18 02:00:14 2004
 @@ -1,8 +1,8 @@
- CC	= g++
- SHELL	= /bin/sh
- INCLUDE	= -I.
--CFLAGS	= -g -Wall $(INCLUDE)
--CXXFLAGS= -g -Wall $(INCLUDE)
-+CFLAGS	= $(OPT) -g -Wall $(INCLUDE)
-+CXXFLAGS= $(OPT) -g -Wall $(INCLUDE)
- 
- OBJECTS = libXicq.o net.o misc.o parse.o packets.o ui2lib.o contact.o
- 
-diff -urN src.orig/xicq/Makefile src/xicq/Makefile
---- src.orig/xicq/Makefile	Tue Dec 15 19:13:59 1998
-+++ src/xicq/Makefile	Tue Dec 15 19:15:08 1998
-@@ -1,8 +1,8 @@
- CC      = g++
+-CC      = g++
++CC      = $(CXX)
  SHELL   = /bin/sh
  INCLUDE = -I. -I../libXicq
 -CXXFLAGS= -g -Wall $(INCLUDE)
--- xicq-19980712_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list