Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Apr 2006 12:21:01 +0800 (CST)
From:      Yen-Ming Lee <leeym@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        maho@FreeBSD.org
Subject:   ports/96246: [PATCH] java/gjdoc: break
Message-ID:  <20060424042101.2AC01B29CED@utopia.leeym.com>
Resent-Message-ID: <200604240430.k3O4UEA8008495@freefall.freebsd.org>

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

>Number:         96246
>Category:       ports
>Synopsis:       [PATCH] java/gjdoc: break
>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:   Mon Apr 24 04:30:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Yen-Ming Lee
>Release:        FreeBSD 6.1-RC i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD utopia.leeym.com 6.1-RC FreeBSD 6.1-RC #0: Tue Apr 11 08:54:13 CST 2006
>Description:
- fix plist and unbreak under FreeBSD 5+
- fix pthread problem and unbreak under FreeBSD 4
- utilize INFO
- replace spaces with tabs and make portlint happier

Port maintainer (maho@FreeBSD.org) is cc'd.

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

http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.4.2005092302/gjdoc-0.7.7.log
http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.5.2006022418/gjdoc-0.7.7.log
http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.6.2006031421/gjdoc-0.7.7.log
http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.7.2006042122/gjdoc-0.7.7.log

>Fix:

--- gjdoc-0.7.7.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/java/gjdoc/Makefile,v
retrieving revision 1.1
diff -u -u -r1.1 Makefile
--- Makefile	17 Apr 2006 05:11:44 -0000	1.1
+++ Makefile	24 Apr 2006 04:18:20 -0000
@@ -10,29 +10,30 @@
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		http://www.antlr.org/download/:antlr
-MASTER_SITE_SUBDIR=     classpath
+MASTER_SITE_SUBDIR=	classpath
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 		${ANTLR}.jar:antlr
-EXTRACT_ONLY=   ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	A documentation generation framework; javadoc alternative
 
-BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41
-BUILD_DEPENDS+=	gcp:${PORTSDIR}/sysutils/coreutils
+BUILD_DEPENDS=	gcj41:${PORTSDIR}/lang/gcc41 \
+		gcp:${PORTSDIR}/sysutils/coreutils
 
-ANTLRVER=2.7.5
-ANTLR=antlr-${ANTLRVER}
+ANTLRVER=	2.7.5
+ANTLR=		antlr-${ANTLRVER}
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-antlr-jar=${ANTLR}.jar
-CONFIGURE_ENV+=	PATH="${WRKDIR}/bin:${PATH}"
-MAKE_ENV+=      PATH="${WRKDIR}/bin:${PATH}"
-SCRIPT_ENV+=    PATH="${WRKDIR}/bin:${PATH}"
+INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--with-antlr-jar=${ANTLR}.jar
+CONFIGURE_ENV=	PATH="${WRKDIR}/bin:${PATH}" LDFLAGS="${PTHREAD_LIBS}"
+MAKE_ENV=	PATH="${WRKDIR}/bin:${PATH}"
+SCRIPT_ENV=	PATH="${WRKDIR}/bin:${PATH}"
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-.include <bsd.port.pre.mk>
-
-MAN1=                    gjdoc.1
+MAN1=		gjdoc.1
+INFO=		gjdoc
 
 post-extract:
 	@${CP} ${DISTDIR}/${ANTLR}.jar ${WRKSRC}
@@ -41,4 +42,4 @@
 	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/bin/gij
 	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/bin/fastjar
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/java/gjdoc/pkg-plist,v
retrieving revision 1.1
diff -u -u -r1.1 pkg-plist
--- pkg-plist	17 Apr 2006 05:11:44 -0000	1.1
+++ pkg-plist	24 Apr 2006 04:18:20 -0000
@@ -1,9 +1,11 @@
 bin/gjdoc
-info/gjdoc.info
+lib/lib-com-sun-javadoc.so
 lib/lib-com-sun-javadoc.so.0
 lib/lib-com-sun-javadoc.la
+lib/lib-com-sun-tools-doclets-Taglet.so
 lib/lib-com-sun-tools-doclets-Taglet.so.0
 lib/lib-com-sun-tools-doclets-Taglet.la
+lib/lib-gnu-classpath-tools-gjdoc.so
 lib/lib-gnu-classpath-tools-gjdoc.so.0
 lib/lib-gnu-classpath-tools-gjdoc.la
 share/java/com-sun-javadoc-0.7.7.jar
--- gjdoc-0.7.7.patch ends here ---

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



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