Date: Fri, 14 Apr 2000 10:37:19 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/18009: Update port: patchkit for using NO_WRKSUBDIR Message-ID: <200004141737.KAA54468@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 18009
>Category: ports
>Synopsis: Update port: patchkit for using NO_WRKSUBDIR
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Apr 14 10:40:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.0-RELEASE i386
>Organization:
>Environment:
>Description:
I've found there are not a few ports Makefile defining WRKSRC=WRKDIR
instead of using NO_WRKSUBDIR. Interestingly, some of these have
both lines.
Following patches are for avoiding these waste.
>How-To-Repeat:
>Fix:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# audio_mpg123.el.patch
# comms_mlan.patch
# devel_mprof.patch
# devel_py-kjbuckets.patch
# devel_yacl.patch
# editors_uzap.patch
# games_antipolix.patch
# games_merlin.patch
# games_xbloody.patch
# graphics_jgraph.patch
# graphics_vcdgear.patch
# graphics_xmrm.patch
# japanese_Wnn6.patch
# japanese_tgif.patch
# japanese_vfxdvi300.patch
# japanese_xklock.patch
# japanese_yc.el.patch
# java_cos.patch
# java_infobus.patch
# java_jdk-tutorial.patch
# mail_majorcool.patch
# misc_man.el.patch
# net_archie.el.patch
# news_pgpmoose.patch
# palm_pilrc.patch
# www_hotjava.patch
#
echo x - audio_mpg123.el.patch
sed 's/^X//' >audio_mpg123.el.patch << 'END-of-audio_mpg123.el.patch'
Xdiff -urN /usr/ports/audio/mpg123.el/Makefile audio/mpg123.el/Makefile
X--- /usr/ports/audio/mpg123.el/Makefile Sun Apr 9 15:42:39 2000
X+++ audio/mpg123.el/Makefile Fri Apr 14 19:50:11 2000
X@@ -19,7 +19,6 @@
X EXTRACT_ONLY= # empty
X NO_WRKSUBDIR= yes
X NO_BUILD= yes
X-WRKSRC= ${WRKDIR}
X
X ELISPDIR= ${PREFIX}/share/emacs/site-lisp
X XELISPDIR= ${PREFIX}/lib/xemacs/site-lisp
END-of-audio_mpg123.el.patch
echo x - comms_mlan.patch
sed 's/^X//' >comms_mlan.patch << 'END-of-comms_mlan.patch'
Xdiff -urN /usr/ports/comms/mlan/Makefile comms/mlan/Makefile
X--- /usr/ports/comms/mlan/Makefile Sun Apr 9 15:43:26 2000
X+++ comms/mlan/Makefile Fri Apr 14 19:53:25 2000
X@@ -13,7 +13,7 @@
X
X MAINTAINER= phk@FreeBSD.org
X
X+NO_WRKSUBDIR= yes
X USE_ZIP= yes
X-WRKSRC= ${WRKDIR}
X
X .include <bsd.port.mk>
END-of-comms_mlan.patch
echo x - devel_mprof.patch
sed 's/^X//' >devel_mprof.patch << 'END-of-devel_mprof.patch'
Xdiff -urN /usr/ports/devel/mprof/Makefile devel/mprof/Makefile
X--- /usr/ports/devel/mprof/Makefile Wed Apr 12 21:20:13 2000
X+++ devel/mprof/Makefile Fri Apr 14 19:51:33 2000
X@@ -14,7 +14,7 @@
X
X MAINTAINER= obrien@FreeBSD.org
X
X-WRKSRC= ${WRKDIR}
X+NO_WRKSUBDIR= yes
X MAKEFILE= Makefile.i386
X MAN1= mprof.1
X
END-of-devel_mprof.patch
echo x - devel_py-kjbuckets.patch
sed 's/^X//' >devel_py-kjbuckets.patch << 'END-of-devel_py-kjbuckets.patch'
Xdiff -urN /usr/ports/devel/py-kjbuckets/Makefile devel/py-kjbuckets/Makefile
X--- /usr/ports/devel/py-kjbuckets/Makefile Wed Apr 12 21:20:29 2000
X+++ devel/py-kjbuckets/Makefile Fri Apr 14 19:52:40 2000
X@@ -18,8 +18,8 @@
X BUILD_DEPENDS= python:${PORTSDIR}/lang/python
X RUN_DEPENDS= python:${PORTSDIR}/lang/python
X
X+NO_WRKSUBDIR= yes
X MAKEFILE= makefile
X-WRKSRC= ${WRKDIR}
X
X do-install:
X ${MKDIR} ${PREFIX}/lib/python1.5/site-packages
END-of-devel_py-kjbuckets.patch
echo x - devel_yacl.patch
sed 's/^X//' >devel_yacl.patch << 'END-of-devel_yacl.patch'
Xdiff -urN /usr/ports/devel/yacl/Makefile devel/yacl/Makefile
X--- /usr/ports/devel/yacl/Makefile Fri Apr 14 18:47:46 2000
X+++ devel/yacl/Makefile Fri Apr 14 19:53:01 2000
X@@ -13,8 +13,8 @@
X
X MAINTAINER= albast@xs4all.nl
X
X+NO_WRKSUBDIR= yes
X USE_ZIP= yes
X-WRKSRC= ${WRKDIR}
X MAKE_ENV= YACLPATH=${WRKDIR}
X
X MAKEFILE= gnuc.mak
END-of-devel_yacl.patch
echo x - editors_uzap.patch
sed 's/^X//' >editors_uzap.patch << 'END-of-editors_uzap.patch'
Xdiff -urN /usr/ports/editors/uzap/Makefile editors/uzap/Makefile
X--- /usr/ports/editors/uzap/Makefile Fri Apr 14 18:48:20 2000
X+++ editors/uzap/Makefile Fri Apr 14 19:54:18 2000
X@@ -15,7 +15,7 @@
X
X # restrictive Copyright; the author is no longer reachable, however :-(
X RESTRICTED= "Restrictive copyright"
X-WRKSRC= ${WRKDIR}
X+NO_WRKSUBDIR= yes
X MAN1= uzap.1
X
X .include <bsd.port.mk>
END-of-editors_uzap.patch
echo x - games_antipolix.patch
sed 's/^X//' >games_antipolix.patch << 'END-of-games_antipolix.patch'
Xdiff -urN /usr/ports/games/antipolix/Makefile games/antipolix/Makefile
X--- /usr/ports/games/antipolix/Makefile Fri Apr 14 18:48:46 2000
X+++ games/antipolix/Makefile Fri Apr 14 20:12:12 2000
X@@ -14,7 +14,7 @@
X
X MAINTAINER= ports@FreeBSD.org
X
X-WRKSRC= ${WRKDIR}
X+NO_WRKSUBDIR= yes
X USE_IMAKE= yes
X
X do-install:
END-of-games_antipolix.patch
echo x - games_merlin.patch
sed 's/^X//' >games_merlin.patch << 'END-of-games_merlin.patch'
Xdiff -urN /usr/ports/games/merlin/Makefile games/merlin/Makefile
X--- /usr/ports/games/merlin/Makefile Wed Mar 29 20:01:01 2000
X+++ games/merlin/Makefile Fri Apr 14 20:12:27 2000
X@@ -15,9 +15,9 @@
X
X RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
X
X+NO_WRKSUBDIR= yes
X NO_BUILD= yes
X USE_X_PREFIX= yes
X-WRKSRC= ${WRKDIR}
X
X post-extract:
X @ ${MV} ${WRKSRC}/merlin.tcl ${WRKSRC}/merlin
END-of-games_merlin.patch
echo x - games_xbloody.patch
sed 's/^X//' >games_xbloody.patch << 'END-of-games_xbloody.patch'
Xdiff -urN /usr/ports/games/xbloody/Makefile games/xbloody/Makefile
X--- /usr/ports/games/xbloody/Makefile Wed Aug 25 15:04:49 1999
X+++ games/xbloody/Makefile Fri Apr 14 20:12:55 2000
X@@ -13,7 +13,7 @@
X
X MAINTAINER= kazu@jp.freebsd.org
X
X-WRKSRC= ${WRKDIR}
X+NO_WRKSUBDIR= yes
X USE_IMAKE= yes
X NO_INSTALL_MANPAGES= yes
X
END-of-games_xbloody.patch
echo x - graphics_jgraph.patch
sed 's/^X//' >graphics_jgraph.patch << 'END-of-graphics_jgraph.patch'
Xdiff -urN /usr/ports/graphics/jgraph/Makefile graphics/jgraph/Makefile
X--- /usr/ports/graphics/jgraph/Makefile Tue Sep 7 08:32:59 1999
X+++ graphics/jgraph/Makefile Fri Apr 14 19:54:41 2000
X@@ -19,7 +19,7 @@
X EXTRACT_BEFORE_ARGS= -c
X EXTRACT_AFTER_ARGS= | sh
X
X-WRKSRC= ${WRKDIR}
X+NO_WRKSUBDIR= yes
X MAN1= jgraph.1
X MAKEFILE= makefile
X
END-of-graphics_jgraph.patch
echo x - graphics_vcdgear.patch
sed 's/^X//' >graphics_vcdgear.patch << 'END-of-graphics_vcdgear.patch'
Xdiff -urN /usr/ports/graphics/vcdgear/Makefile graphics/vcdgear/Makefile
X--- /usr/ports/graphics/vcdgear/Makefile Sun Feb 27 04:41:11 2000
X+++ graphics/vcdgear/Makefile Fri Apr 14 19:55:18 2000
X@@ -21,7 +21,7 @@
X
X ONLY_FOR_ARCHS= i386
X NO_BUILD= true
X-WRKSRC= ${WRKDIR}
X+NO_WRKSUNDIR= yes
X EXTRACT_AFTER_ARGS= > ${WRKSRC}/vcdgear
X
X do-install:
END-of-graphics_vcdgear.patch
echo x - graphics_xmrm.patch
sed 's/^X//' >graphics_xmrm.patch << 'END-of-graphics_xmrm.patch'
Xdiff -urN /usr/ports/graphics/xmrm/Makefile graphics/xmrm/Makefile
X--- /usr/ports/graphics/xmrm/Makefile Wed Mar 29 07:44:09 2000
X+++ graphics/xmrm/Makefile Fri Apr 14 19:55:45 2000
X@@ -20,7 +20,7 @@
X Xpm.4:${PORTSDIR}/graphics/xpm \
X tiff.4:${PORTSDIR}/graphics/tiff
X
X-WRKSRC= ${WRKDIR}
X+NO_WRKSUNDIR= yes
X
X do-install:
X ${INSTALL_PROGRAM} ${WRKSRC}/xmrm ${PREFIX}/bin
END-of-graphics_xmrm.patch
echo x - japanese_Wnn6.patch
sed 's/^X//' >japanese_Wnn6.patch << 'END-of-japanese_Wnn6.patch'
Xdiff -urN /usr/ports/japanese/Wnn6/Makefile japanese/Wnn6/Makefile
X--- /usr/ports/japanese/Wnn6/Makefile Wed Apr 12 05:36:30 2000
X+++ japanese/Wnn6/Makefile Fri Apr 14 19:56:23 2000
X@@ -14,7 +14,7 @@
X MAINTAINER= taoka@FreeBSD.org
X
X IGNOREFILES= ${DISTFILES}
X-WRKSRC= ${WRKDIR}
X+NO_WRKSUBDIR= yes
X LIBDIR= ${PREFIX}/OMRONWnn6
X DISTDIR= ${MOUNT_PT}/fbsd
X MOUNT_PT?= /cdrom
END-of-japanese_Wnn6.patch
echo x - japanese_tgif.patch
sed 's/^X//' >japanese_tgif.patch << 'END-of-japanese_tgif.patch'
Xdiff -urN /usr/ports/japanese/tgif/Makefile japanese/tgif/Makefile
X--- /usr/ports/japanese/tgif/Makefile Thu Apr 13 19:18:28 2000
X+++ japanese/tgif/Makefile Fri Apr 14 19:56:46 2000
X@@ -16,7 +16,7 @@
X RUN_DEPENDS= tgif:${PORTSDIR}/graphics/tgif
X
X NO_BUILD= yes
X-WRKSRC= ${WRKDIR}
X+NO_WRKSUBDIR= yes
X USE_X_PREFIX= yes
X
X do-install:
END-of-japanese_tgif.patch
echo x - japanese_vfxdvi300.patch
sed 's/^X//' >japanese_vfxdvi300.patch << 'END-of-japanese_vfxdvi300.patch'
Xdiff -urN /usr/ports/japanese/vfxdvi300/Makefile japanese/vfxdvi300/Makefile
X--- /usr/ports/japanese/vfxdvi300/Makefile Thu Apr 13 19:18:39 2000
X+++ japanese/vfxdvi300/Makefile Fri Apr 14 19:57:33 2000
X@@ -20,14 +20,14 @@
X 950923.02.Z \
X 951007.02.Z \
X 951109.04.Z
X+DIST_SUBDIR= xdvi
X
X MAINTAINER= mita@jp.FreeBSD.org
X
X LIB_DEPENDS= VFlib2.24:${PORTSDIR}/japanese/vflib
X RUN_DEPENDS= ${LOCALBASE}/lib/fonts/pk${RESOLUTION}:${PORTSDIR}/print/pkfonts${RESOLUTION}
X
X-WRKSRC= ${WRKDIR}
X-DIST_SUBDIR= xdvi
X+NO_WRKSUBDIR= yes
X USE_IMAKE= yes
X XMKMF= xmkmf
X EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
END-of-japanese_vfxdvi300.patch
echo x - japanese_xklock.patch
sed 's/^X//' >japanese_xklock.patch << 'END-of-japanese_xklock.patch'
Xdiff -urN /usr/ports/japanese/xklock/Makefile japanese/xklock/Makefile
X--- /usr/ports/japanese/xklock/Makefile Thu Apr 13 19:18:57 2000
X+++ japanese/xklock/Makefile Fri Apr 14 19:57:57 2000
X@@ -20,7 +20,7 @@
X
X LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
X
X-WRKSRC= ${WRKDIR}
X+NO_WRKSUBDIR= yes
X USE_X_PREFIX= yes
X
X pre-configure:
END-of-japanese_xklock.patch
echo x - japanese_yc.el.patch
sed 's/^X//' >japanese_yc.el.patch << 'END-of-japanese_yc.el.patch'
Xdiff -urN /usr/ports/japanese/yc.el/Makefile japanese/yc.el/Makefile
X--- /usr/ports/japanese/yc.el/Makefile Thu Apr 13 19:19:00 2000
X+++ japanese/yc.el/Makefile Fri Apr 14 19:58:25 2000
X@@ -16,7 +16,6 @@
X
X NO_BUILD= yes
X NO_WRKSUBDIR= yes
X-WRKSRC= ${WRKDIR}
X
X ELISPDIR= ${PREFIX}/share/emacs/site-lisp
X XELISPDIR= ${PREFIX}/lib/xemacs/site-lisp
END-of-japanese_yc.el.patch
echo x - java_cos.patch
sed 's/^X//' >java_cos.patch << 'END-of-java_cos.patch'
Xdiff -urN /usr/ports/java/cos/Makefile java/cos/Makefile
X--- /usr/ports/java/cos/Makefile Wed Apr 12 21:23:57 2000
X+++ java/cos/Makefile Fri Apr 14 19:58:49 2000
X@@ -17,7 +17,7 @@
X ${PREFIX}/bin/servletrunner:${PORTSDIR}/java/jsdk
X
X USE_ZIP= yes
X-WRKSRC= ${WRKDIR}
X+NO_WRKSUBDIR= yes
X JDK_VERSION= 1.1.8
X NO_BUILD= yes
X RESTRICTED= "Special conditions apply for commercial use, see licence"
END-of-java_cos.patch
echo x - java_infobus.patch
sed 's/^X//' >java_infobus.patch << 'END-of-java_infobus.patch'
Xdiff -urN /usr/ports/java/infobus/Makefile java/infobus/Makefile
X--- /usr/ports/java/infobus/Makefile Wed Apr 12 21:23:57 2000
X+++ java/infobus/Makefile Fri Apr 14 19:59:09 2000
X@@ -18,7 +18,7 @@
X
X USE_ZIP= YES
X
X-WRKSRC= ${WRKDIR}
X+NO_WRKSUBDIR= yes
X JDK_VERSION= 1.1.8
X NO_BUILD= yes
X NO_CDROM= "See the license"
END-of-java_infobus.patch
echo x - java_jdk-tutorial.patch
sed 's/^X//' >java_jdk-tutorial.patch << 'END-of-java_jdk-tutorial.patch'
Xdiff -urN /usr/ports/java/jdk-tutorial/Makefile java/jdk-tutorial/Makefile
X--- /usr/ports/java/jdk-tutorial/Makefile Wed Apr 12 21:24:01 2000
X+++ java/jdk-tutorial/Makefile Fri Apr 14 20:00:08 2000
X@@ -13,11 +13,10 @@
X
X MAINTAINER= martti.kuparinen@ericsson.com
X
X-WRKSRC= ${WRKDIR}
X+NO_WRKSUNDIR= yes
X RESTRICTED= "This software is under license and export control."
X NO_BUILD= yes
X PLIST_SUB+= VERSION=${PORTVERSION}
X-PKGMESSAGE= ${WRKDIR}/MESSAGE
X
X .include <bsd.port.pre.mk>
X
END-of-java_jdk-tutorial.patch
echo x - mail_majorcool.patch
sed 's/^X//' >mail_majorcool.patch << 'END-of-mail_majorcool.patch'
Xdiff -urN /usr/ports/mail/majorcool/Makefile mail/majorcool/Makefile
X--- /usr/ports/mail/majorcool/Makefile Fri Apr 14 18:52:26 2000
X+++ mail/majorcool/Makefile Fri Apr 14 20:00:44 2000
X@@ -12,11 +12,11 @@
X
X MAINTAINER= ports@FreeBSD.org
X
X+NO_WRKSUBDIR= yes
X NO_BUILD= yes
X NO_PACKAGE= "Too many questions"
X IS_INTERACTIVE= yes
X USE_PERL5= yes
X-WRKSRC= ${WRKDIR}
X
X do-install:
X ( cd ${WRKSRC}; ${SH} Configure )
END-of-mail_majorcool.patch
echo x - misc_man.el.patch
sed 's/^X//' >misc_man.el.patch << 'END-of-misc_man.el.patch'
Xdiff -urN /usr/ports/misc/man.el/Makefile misc/man.el/Makefile
X--- /usr/ports/misc/man.el/Makefile Tue Sep 7 04:40:53 1999
X+++ misc/man.el/Makefile Fri Apr 14 20:01:02 2000
X@@ -15,8 +15,8 @@
X
X # If you use Japanese manuals, install japanese/man as well.
X
X+NO_WRKSUBDIR= yes
X NO_BUILD= yes
X-WRKSRC= ${WRKDIR}
X
X ELISPDIR= ${PREFIX}/share/emacs/site-lisp
X SITEPKGDIR= ${PREFIX}/lib/xemacs/site-packages
END-of-misc_man.el.patch
echo x - net_archie.el.patch
sed 's/^X//' >net_archie.el.patch << 'END-of-net_archie.el.patch'
Xdiff -urN /usr/ports/net/archie.el/Makefile net/arche.el/Makefile
X--- /usr/ports/net/archie.el/Makefile Mon Apr 10 20:56:00 2000
X+++ net/arche.el/Makefile Fri Apr 14 20:01:33 2000
X@@ -20,7 +20,6 @@
X
X NO_WRKSUBDIR= yes
X NO_BUILD= yes
X-WRKSRC= ${WRKDIR}
X
X ELISPDIR= ${PREFIX}/share/emacs/site-lisp
X XELISPDIR= ${PREFIX}/lib/xemacs/site-lisp
END-of-net_archie.el.patch
echo x - news_pgpmoose.patch
sed 's/^X//' >news_pgpmoose.patch << 'END-of-news_pgpmoose.patch'
Xdiff -urN /usr/ports/news/pgpmoose/Makefile news/pgpmoose/Makefile
X--- /usr/ports/news/pgpmoose/Makefile Mon Apr 10 20:59:31 2000
X+++ news/pgpmoose/Makefile Fri Apr 14 20:01:58 2000
X@@ -20,7 +20,7 @@
X BIN1= pmapp pmcanon pmcheck pmnewsgroups \
X pmdaemon pmcancel
X
X-WRKSRC= ${WRKDIR}
X+NO_WRKSUBDIR= yes
X
X do-install:
X .for i in ${BIN1}
END-of-news_pgpmoose.patch
echo x - palm_pilrc.patch
sed 's/^X//' >palm_pilrc.patch << 'END-of-palm_pilrc.patch'
Xdiff -urN /usr/ports/palm/pilrc/Makefile palm/pilrc/Makefile
X--- /usr/ports/palm/pilrc/Makefile Fri Apr 14 18:55:03 2000
X+++ palm/pilrc/Makefile Fri Apr 14 20:02:31 2000
X@@ -17,7 +17,7 @@
X glib12.3:${PORTSDIR}/devel/glib12
X
X USE_ZIP= YES
X-WRKSRC= ${WRKDIR}
X+NO_WRKSUBDIR= YES
X
X do-install:
X ${INSTALL_PROGRAM} ${WRKSRC}/pilrc ${WRKSRC}/pilrcui ${PREFIX}/bin
END-of-palm_pilrc.patch
echo x - www_hotjava.patch
sed 's/^X//' >www_hotjava.patch << 'END-of-www_hotjava.patch'
Xdiff -urN /usr/ports/www/hotjava/Makefile www/hotjava/Makefile
X--- /usr/ports/www/hotjava/Makefile Mon Apr 10 21:05:05 2000
X+++ www/hotjava/Makefile Fri Apr 14 20:02:51 2000
X@@ -18,7 +18,7 @@
X
X EXTRACT_ONLY=
X
X-WRKSRC= ${WRKDIR}
X+NO_WRKSUBDIR= yes
X JDK_VERSION= 1.1.8
X NO_BUILD= yes
X NO_CDROM= "See the licence"
END-of-www_hotjava.patch
exit
>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?200004141737.KAA54468>