- 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

PR:		71825
Submitted by:	leeym
Approved by:	maintainer timeout
This commit is contained in:
Yen-Ming Lee 2004-10-12 18:10:27 +00:00
parent 9166619908
commit cbd73f121a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=119076
6 changed files with 22 additions and 64 deletions

View file

@ -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 @@ MAINTAINER= scrappy@FreeBSD.org
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>

View file

@ -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)

View file

@ -1,4 +0,0 @@
bin/xicq
share/examples/xicq/contact
share/examples/xicq/config
@dirrm share/examples/xicq

View file

@ -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 @@ MAINTAINER= scrappy@FreeBSD.org
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>

View file

@ -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)

View file

@ -1,4 +0,0 @@
bin/xicq
share/examples/xicq/contact
share/examples/xicq/config
@dirrm share/examples/xicq