diff options
| author | leeym <leeym@FreeBSD.org> | 2004-10-13 02:10:27 +0800 |
|---|---|---|
| committer | leeym <leeym@FreeBSD.org> | 2004-10-13 02:10:27 +0800 |
| commit | 179b5c55b9ddae55b706e8a19b6bd951eb7fc460 (patch) | |
| tree | 0bcc489d78599d3e5918e85c29a811d2b0e385d0 /net-im | |
| parent | 08177cd7d153b81cdbc90638819a72d1e81437cf (diff) | |
| download | freebsd-ports-gnome-179b5c55b9ddae55b706e8a19b6bd951eb7fc460.tar.gz freebsd-ports-gnome-179b5c55b9ddae55b706e8a19b6bd951eb7fc460.tar.zst freebsd-ports-gnome-179b5c55b9ddae55b706e8a19b6bd951eb7fc460.zip | |
- 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
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/xicq/Makefile | 17 | ||||
| -rw-r--r-- | net-im/xicq/files/patch-aa | 22 | ||||
| -rw-r--r-- | net-im/xicq/pkg-plist | 4 |
3 files changed, 11 insertions, 32 deletions
diff --git a/net-im/xicq/Makefile b/net-im/xicq/Makefile index 618aa3cc9e91..032253669b8c 100644 --- a/net-im/xicq/Makefile +++ b/net-im/xicq/Makefile @@ -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> diff --git a/net-im/xicq/files/patch-aa b/net-im/xicq/files/patch-aa index 8c410b175c5d..d74cae9a550b 100644 --- a/net-im/xicq/files/patch-aa +++ b/net-im/xicq/files/patch-aa @@ -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) diff --git a/net-im/xicq/pkg-plist b/net-im/xicq/pkg-plist deleted file mode 100644 index 31de076da4af..000000000000 --- a/net-im/xicq/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -bin/xicq -share/examples/xicq/contact -share/examples/xicq/config -@dirrm share/examples/xicq |