diff --git a/astro/xphoon/Makefile b/astro/xphoon/Makefile index f4b692347dc..3f847b59d77 100644 --- a/astro/xphoon/Makefile +++ b/astro/xphoon/Makefile @@ -1,14 +1,11 @@ -# $OpenBSD: Makefile,v 1.6 2000/03/19 02:20:31 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2000/03/31 21:48:47 brad Exp $ DISTNAME= xphoon PKGNAME= xphoon-91.9.18 CATEGORIES= astro x11 -MASTER_SITES= ftp://ftp.cdrom.com/pub/X11/R5contrib/ +MASTER_SITES= ftp://ftp.freesoftware.com/pub/X11/R5contrib/ EXTRACT_SUFX= .tar.Z -NO_CDROM= "NOFEE: Cannot sell" - -LICENSE_TYPE= NOFEE PERMIT_PACKAGE_CDROM= "Cannot sell." PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= "Cannot sell." @@ -16,7 +13,8 @@ PERMIT_DISTFILES_FTP= Yes MAINTAINER= angelos@openbsd.org +FAKE= Yes + USE_IMAKE= Yes -FAKE= Yes .include diff --git a/audio/xcdplayer/Makefile b/audio/xcdplayer/Makefile index c058720a7ff..28ca17624f0 100644 --- a/audio/xcdplayer/Makefile +++ b/audio/xcdplayer/Makefile @@ -1,24 +1,22 @@ -# $OpenBSD: Makefile,v 1.6 2000/02/15 05:04:01 turan Exp $ +# $OpenBSD: Makefile,v 1.7 2000/03/31 21:48:47 brad Exp $ DISTNAME= xcdplayer-2.2 CATEGORIES= audio MASTER_SITES= ftp://ftp.x.org/R5contrib/ \ - ftp://ftp.cdrom.com/pub/X11/R5contrib/ + ftp://ftp.freesoftware.com/pub/X11/R5contrib/ EXTRACT_SUFX= .tar.Z MAINTAINER= angelos@openbsd.org -LICENSE_TYPE= BSD -PERMIT_PACKAGE_CDROM= YES -PERMIT_PACKAGE_FTP= YES -PERMIT_DISTFILES_CDROM= YES -PERMIT_DISTFILES_FTP= YES +PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_FTP= Yes +PERMIT_DISTFILES_CDROM= Yes +PERMIT_DISTFILES_FTP= Yes -USE_IMAKE= yes +USE_IMAKE= Yes pre-patch: - @cp ${FILESDIR}/cdrom_freebsd.c ${WRKSRC} - @cp ${FILESDIR}/cdrom_freebsd.h ${WRKSRC} + @cp ${FILESDIR}/cdrom_freebsd.{c,h} ${WRKSRC} @mv ${WRKSRC}/xcdplayer.1 ${WRKSRC}/xcdplayer.man .include diff --git a/games/xasteroids/Makefile b/games/xasteroids/Makefile index 89acf37d8e5..44a8dd52874 100644 --- a/games/xasteroids/Makefile +++ b/games/xasteroids/Makefile @@ -1,27 +1,26 @@ -# $OpenBSD: Makefile,v 1.11 2000/03/24 22:11:42 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2000/03/31 21:48:47 brad Exp $ -DISTNAME= xasteroids -PKGNAME= xasteroids-5.0 -CATEGORIES= games -NEED_VERSION= 1.191 -MASTER_SITES= ftp://ftp.cdrom.com/pub/X11/R5contrib/ -EXTRACT_SUFX= .sh.Z +DISTNAME= xasteroids +PKGNAME= xasteroids-5.0 +CATEGORIES= games +NEED_VERSION= 1.191 +MASTER_SITES= ftp://ftp.freesoftware.com/pub/X11/R5contrib/ +EXTRACT_SUFX= .sh.Z - -EXTRACT_CMD= gzcat +EXTRACT_CMD= gzcat EXTRACT_BEFORE_ARGS= # empty -EXTRACT_AFTER_ARGS= | sh -s +EXTRACT_AFTER_ARGS= | sh -s -MAINTAINER= angelos@openbsd.org +MAINTAINER= angelos@openbsd.org PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -USE_IMAKE= yes +USE_IMAKE= Yes -WRKDIST= ${WRKDIR} +WRKDIST= ${WRKDIR} post-extract: @cp ${FILESDIR}/Imakefile ${WRKSRC} diff --git a/games/xlife/Makefile b/games/xlife/Makefile index a727d8f9735..599c1ebfc40 100644 --- a/games/xlife/Makefile +++ b/games/xlife/Makefile @@ -1,22 +1,22 @@ -# $OpenBSD: Makefile,v 1.7 2000/03/19 03:50:19 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2000/03/31 21:48:47 brad Exp $ -DISTNAME= xlife +DISTNAME= xlife PKGNAME= xlife-3.0 CATEGORIES= games -MASTER_SITES= ftp://ftp.cdrom.com/pub/X11/R5contrib/ \ +MASTER_SITES= ftp://ftp.freesoftware.com/pub/X11/R5contrib/ \ ftp://ftp.kddlabs.co.jp/pub/X11/R5contrib/ EXTRACT_SUFX= .tar.Z MAINTAINER= angelos@openbsd.org -LICENSE_TYPE= BSD PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -USE_IMAKE= Yes -FAKE= Yes +FAKE= Yes + +USE_IMAKE= Yes pre-install: @cd ${WRKSRC}; ${MAKE} install.patterns diff --git a/misc/mc/Makefile b/misc/mc/Makefile index d656b233ca6..9f948b9b20b 100644 --- a/misc/mc/Makefile +++ b/misc/mc/Makefile @@ -1,26 +1,24 @@ -# $OpenBSD: Makefile,v 1.3 2000/03/22 19:58:12 turan Exp $ +# $OpenBSD: Makefile,v 1.4 2000/03/31 21:48:47 brad Exp $ -BROKEN= "patches are way wrong; auditing requiered." +BROKEN= "patches are way wrong; auditing requiered." -DISTNAME= mc-4.1.35 -CATEGORIES= misc +DISTNAME= mc-4.1.35 +CATEGORIES= misc +MASTER_SITES= ftp://ftp.nodomainname.net/pub/mirrors/gnu/mc/ \ + ftp://ftp.freesoftware.com/pub/gnu/mc/ \ + ftp://labrea.stanford.edu/pub/gnu/mc/ \ + ftp://aeneas.mit.edu/pub/gnu/mc/ \ + ftp://ftp.cs.ubc.ca/mirror2/gnu/mc/ \ + ftp://core.ring.gr.jp/pub/GNU/mc/ \ + ftp://ftp.gnu.org/pub/gnu/mc/ -MAINTAINER= ryan@erwin.org +MAINTAINER= ryan@erwin.org PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ftp://ftp.nodomainname.net/pub/mirrors/gnu/mc/ \ - ftp://ftp.cdrom.com/.1/gnu/mc/ \ - ftp://labrea.stanford.edu/pub/gnu/mc/ \ - ftp://aeneas.mit.edu/pub/gnu/mc/ \ - ftp://ftp.cs.ubc.ca/mirror2/gnu/mc/ \ - ftp://core.ring.gr.jp/pub/GNU/mc/ \ - ftp://ftp.gnu.org/pub/gnu/mc/ - -DISTFILES= ${DISTNAME}.tar.gz -GNU_CONFIGURE= yes +GNU_CONFIGURE= Yes .include diff --git a/news/aub/Makefile b/news/aub/Makefile index ec0b971adce..531c38acb75 100644 --- a/news/aub/Makefile +++ b/news/aub/Makefile @@ -1,19 +1,14 @@ -# OpenBSD makefile for: aub -# Version required: v2.0.5 -# Date created: December 1, 1997 -# Whom: Angelos D. Keromytis -# -# $OpenBSD: Makefile,v 1.8 2000/03/24 22:11:55 espie Exp $ -# +# $OpenBSD: Makefile,v 1.9 2000/03/31 21:48:48 brad Exp $ DISTNAME= aub PKGNAME= aub-2.0.5 CATEGORIES= news NEED_VERSION= 1.191 -MASTER_SITES= ftp://ftp.cdrom.com/pub/perl/CPAN/scripts/news/nntpstuff/aub/ \ +MASTER_SITES= ftp://ftp.freesoftware.com/pub/perl/CPAN/scripts/news/nntpstuff/aub/ \ ftp://ftp.digital.com/pub/plan/perl/CPAN/scripts/news/nntpstuff/aub/ \ ftp://ftp.perl.org/pub/CPAN/scripts/news/nntpstuff/aub/ DISTFILES= aub aub.1 BUG_FIXES +DIST_SUBDIR= aub MAINTAINER= angelos@openbsd.org @@ -22,11 +17,12 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -DIST_SUBDIR= aub -WRKDIST= ${WRKDIR} -NO_BUILD= yes +NO_BUILD= Yes + MAN1= aub.1 +WRKDIST= ${WRKDIR} + do-extract: @mkdir -p ${WRKDIR} @@ -37,7 +33,7 @@ pre-configure: ${FULLDISTDIR}/aub > ${WRKDIR}/aub do-install: - cd ${WRKDIR}; ${PATCH} < ../files/aub-perl5.diff + cd ${WRKDIR}; patch < ../files/aub-perl5.diff ${INSTALL_SCRIPT} ${WRKDIR}/aub ${PREFIX}/bin ${INSTALL_MAN} ${FULLDISTDIR}/aub.1 ${PREFIX}/man/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/aub diff --git a/x11/olvwm/Makefile b/x11/olvwm/Makefile index 60d722b9f4e..9d57d59bbb0 100644 --- a/x11/olvwm/Makefile +++ b/x11/olvwm/Makefile @@ -1,15 +1,15 @@ -# $OpenBSD: Makefile,v 1.12 2000/03/24 23:28:40 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2000/03/31 21:48:48 brad Exp $ BROKEN= depend xview is broken DISTNAME= olvwm4 PKGNAME= olvwm-4.2 -CATEGORIES= x11-wm -NEED_VERSION= 1.230 +CATEGORIES= x11 +NEED_VERSION= 1.230 MASTER_SITES= ftp://ftp.x.org/R5contrib/ DISTFILES= olvwm4.tar.Z -MAINTAINER= ian@openbsd.org +MAINTAINER= ian@openbsd.org PERMIT_PACKAGE_CDROM= "missing license" PERMIT_PACKAGE_FTP= Yes @@ -18,15 +18,16 @@ PERMIT_DISTFILES_FTP= Yes # The Patch01 and Patch02 patches are included in the patches directory. # -# MASTER_SITES0 = ftp://ftp.cdrom.com/X11/contrib/window_managers +# MASTER_SITES0 = ftp://ftp.freesoftware.com/pub/X11/contrib/window_managers # PATCHFILES= olvwm4.Patch01.Z:0 olvwm4.Patch02.Z:0 # PATCH_DIST_STRIP= -p1 LIB_DEPENDS= xview.3.::x11/xview-lib -WRKDIST= ${WRKDIR} USE_IMAKE= Yes +WRKDIST= ${WRKDIR} + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/olvwm ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/olvwm.info ${PREFIX}/lib/help/olvwm.info