diff options
-rw-r--r-- | audio/wavplay/Makefile | 3 | ||||
-rw-r--r-- | audio/wavplay/files/patch-aa | 25 | ||||
-rw-r--r-- | benchmarks/ubench/Makefile | 4 | ||||
-rw-r--r-- | comms/sredird/Makefile | 5 | ||||
-rw-r--r-- | lang/objc/Makefile | 9 | ||||
-rw-r--r-- | misc/alevt/Makefile | 5 | ||||
-rw-r--r-- | misc/alevt/pkg-descr | 3 | ||||
-rw-r--r-- | misc/whichman/Makefile | 7 | ||||
-rw-r--r-- | www/linbot/Makefile | 3 | ||||
-rw-r--r-- | www/webcheck/Makefile | 3 | ||||
-rw-r--r-- | x11-fm/xnc/Makefile | 6 |
11 files changed, 34 insertions, 39 deletions
diff --git a/audio/wavplay/Makefile b/audio/wavplay/Makefile index b84f738623d..13e338ef198 100644 --- a/audio/wavplay/Makefile +++ b/audio/wavplay/Makefile @@ -8,7 +8,8 @@ PORTNAME= wavplay PORTVERSION= 1.4 CATEGORIES= audio -MASTER_SITES= http://metalab.unc.edu/pub/Linux/apps/sound/players/ +MASTER_SITES= ${MASTER_SITE_SUNSITE} +MASTER_SITE_SUBDIR= apps/sound/players MAINTAINER= greg@rosevale.com.au diff --git a/audio/wavplay/files/patch-aa b/audio/wavplay/files/patch-aa index 118efe508e4..51322326cee 100644 --- a/audio/wavplay/files/patch-aa +++ b/audio/wavplay/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.orig Sat Dec 4 02:06:42 1999 -+++ Makefile Fri May 19 17:52:28 2000 +--- Makefile.orig Sat Dec 4 09:06:42 1999 ++++ Makefile Thu Jun 22 01:50:48 2000 @@ -38,7 +38,7 @@ #---------------------------------------------------------------------- # If you are running a 386 you should comment this line out. @@ -23,7 +23,7 @@ # placed (wavplay, wavrec, and xltwavplay) # -INSTDIR=/usr/local/bin -+PREFIX=/usr/local ++PREFIX?=/usr/local +INSTDIR=$(PREFIX)/bin +MANDIR=$(PREFIX)/man/man1 @@ -70,21 +70,12 @@ #---------------------------------------------------------------------- # Semaphore IPC Key for the Play & Record locks (Default is 0x33333333) -@@ -155,7 +163,7 @@ - # Only for unusual sites would you change this: the name of the - # install program. (has no impact if you choose to manually install) - # --INSTALL=install -+INSTALL=install -c - - #---------------------------------------------------------------------- - # If you have any custom include directories, like for X or @@ -163,19 +171,19 @@ # this should be unecessary if the appropriate symlinks are # installed). # -#CUSTINCL= -I/usr/X11R6/include/X11 -I/usr/local/lesstif/include/Xm -+#CUSTINCL= -I/usr/X11R6/include/X11 -I/usr/local/lesstif/include/Xm -I/usr/X11R6/include ++#CUSTINCL= -I${X11BASE}/include/X11 -I${X11BASE}/include/Xm -I/${X11BASE}/include #---------------------------------------------------------------------- # Normally, you shouldn't need to change anything beyond this point: @@ -130,7 +121,7 @@ - @[ ! -d "$(INSTDIR)" ] && echo "You do not have a directory $(INSTDIR); Check INSTDIR in make file." && exit 13 || : - $(INSTALL) -o root -g root -m 555 wavplay $(INSTDIR) + mkdir -p $(INSTDIR) -+ $(INSTALL) -s -o root -g wheel -m 555 wavplay $(INSTDIR) ++ ${BSD_INSTALL_PROGRAM} wavplay $(INSTDIR) rm -f $(INSTDIR)/wavrec ln $(INSTDIR)/wavplay $(INSTDIR)/wavrec - @[ ! -z "$(SCHED_PRIORITY)" ] && echo "*** DO 'make setuid_root' IF YOU WANT REAL TIME SCHEDULING ***" || : @@ -138,7 +129,7 @@ +install_man: wavplay.1 + mkdir -p $(MANDIR) -+ $(INSTALL) -o root -g wheel -m 444 wavplay.1 $(MANDIR) ++ ${BSD_INSTALL_MAN} wavplay.1 $(MANDIR) + xltwavplay_test: wavplay xltwavplay WAVPLAYPATH=./wavplay ./xltwavplay @@ -148,10 +139,10 @@ install_xltwavplay: xltwavplay - $(INSTALL) -o root -g root -m 555 xltwavplay $(INSTDIR) -+ $(INSTALL) -o root -g wheel -m 555 xltwavplay $(INSTDIR) ++ ${BSD_INSTALL_PROGRAM} xltwavplay $(INSTDIR) @[ ! -z "$(USERES)" ] \ - && $(INSTALL) -o root -g root -m 555 xltwavplay.res $(RESDIR)/xltwavplay \ -+ && $(INSTALL) -o root -g wheel -m 555 xltwavplay.res $(RESDIR)/xltwavplay \ ++ && ${BSD_INSTALL_DATA} xltwavplay.res $(RESDIR)/xltwavplay \ && ls -dlL $(RESDIR)/xltwavplay/xltwavplay.res \ || rm -f $(RESDIR)/xltwavplay diff --git a/benchmarks/ubench/Makefile b/benchmarks/ubench/Makefile index 5f6e23db4c0..330f405fb09 100644 --- a/benchmarks/ubench/Makefile +++ b/benchmarks/ubench/Makefile @@ -8,8 +8,8 @@ PORTNAME= ubench PORTVERSION= 0.31 CATEGORIES= benchmarks -MASTER_SITES= ftp://metalab.unc.edu/pub/Linux/system/benchmark/ \ - http://linuxberg.concepts.nl/files/console/system/ +MASTER_SITES= ${MASTER_SITE_SUNSITE} +MASTER_SITE_SUBDIR= system/benchmark MAINTAINER= leeym@cae.ce.ntu.edu.tw diff --git a/comms/sredird/Makefile b/comms/sredird/Makefile index 2265795298d..727969802e1 100644 --- a/comms/sredird/Makefile +++ b/comms/sredird/Makefile @@ -8,12 +8,13 @@ PORTNAME= sredird PORTVERSION= 1.1.7 CATEGORIES= comms -MASTER_SITES= http://metalab.unc.edu/pub/Linux/system/serial/ +MASTER_SITES= ${MASTER_SITE_SUNSITE} +MASTER_SITE_SUBDIR= system/serial MAINTAINER= sobomax@FreeBSD.org do-build: - ${CC} ${CFLAGS} -g -Wall -o ${WRKSRC}/sredird ${WRKSRC}/sredird.c + ${CC} ${CFLAGS} -Wall -o ${WRKSRC}/sredird ${WRKSRC}/sredird.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sredird ${PREFIX}/libexec diff --git a/lang/objc/Makefile b/lang/objc/Makefile index 658d77dc710..ed1c24f9ad3 100644 --- a/lang/objc/Makefile +++ b/lang/objc/Makefile @@ -8,8 +8,9 @@ PORTNAME= objc PORTVERSION= 3.1.5 CATEGORIES= lang -MASTER_SITES= http://metalab.unc.edu/pub/Linux/devel/lang/objc/ \ +MASTER_SITES= ${MASTER_SITE_SUNSITE} \ http://people.FreeBSD.org/~chuckr/ +MASTER_SITE_SUBDIR= devel/lang/objc DISTFILES= objc-3.1.5-bootstrap.tar.gz objc-3.1.5.tar.gz MAINTAINER= chuckr@freebsd.org @@ -34,7 +35,7 @@ CONFIGURE_ARGS= --prefix=$(PREFIX) .include <bsd.port.pre.mk> pre-configure: - (cd $(WRKDIR)/$(DISTNAME)-bootstrap;./configure --prefix=$(WRKDIR);make;make install) + (cd $(WRKDIR)/$(DISTNAME)-bootstrap;./configure --prefix=$(WRKDIR);${MAKE};${MAKE} install) post-build: $(ECHO) "Building additional libraries (boehm-gc compatibility)" @@ -44,7 +45,7 @@ pre-install: $(MKDIR) $(PREFIX)/share/doc/objc $(MKDIR) $(PREFIX)/share/doc/objc/examples $(MKDIR) $(PREFIX)/share/doc/objc/html - tar -cf - -C $(WRKSRC)/examples . | tar xpf - -C $(PREFIX)/share/doc/objc/examples - tar -cf - -C $(WRKSRC)/html . | tar xpf - -C $(PREFIX)/share/doc/objc/html + ${TAR} -cf - -C $(WRKSRC)/examples . | ${TAR} xpf - -C $(PREFIX)/share/doc/objc/examples + ${TAR} -cf - -C $(WRKSRC)/html . | ${TAR} xpf - -C $(PREFIX)/share/doc/objc/html .include <bsd.port.post.mk> diff --git a/misc/alevt/Makefile b/misc/alevt/Makefile index 8a3624b3d0b..9536522c809 100644 --- a/misc/alevt/Makefile +++ b/misc/alevt/Makefile @@ -8,8 +8,9 @@ PORTNAME= alevt PORTVERSION= 1.5.1 CATEGORIES= misc -MASTER_SITES= http://user.exit.de/froese/alevt/ \ - ftp://metalab.unc.edu/pub/Linux/apps/video/ +MASTER_SITES= ${MASTER_SITE_SUNSITE} \ + http://user.exit.de/froese/alevt/ +MASTER_SITE_SUBDIR= apps/video MAINTAINER= roger@freebsd.org diff --git a/misc/alevt/pkg-descr b/misc/alevt/pkg-descr index a256956dbd1..452156d7066 100644 --- a/misc/alevt/pkg-descr +++ b/misc/alevt/pkg-descr @@ -8,5 +8,4 @@ AleVT - By Edgar Toernig manual, and more. There's also a program to get the time from teletext. - The primary site of AleVT is http://user.exit.de/froese - Also uploaded to ftp://metalab.unc.edu/pub/Linux/apps/video +WWW: http://user.exit.de/froese diff --git a/misc/whichman/Makefile b/misc/whichman/Makefile index 868d9ccb582..0b85c4683c0 100644 --- a/misc/whichman/Makefile +++ b/misc/whichman/Makefile @@ -8,10 +8,9 @@ PORTNAME= whichman PORTVERSION= 1.9 CATEGORIES= misc -MASTER_SITES= ftp://sunsite.unc.edu/pub/Linux/apps/doctools/ \ - http://www.metalab.unc.edu/pub/Linux/apps/doctools/ \ - http://www.linuxfocus.org/~guido.socher/ \ - http://linuxberg.concepts.nl/files/console/system/ +MASTER_SITES= ${MASTER_SITE_SUNSITE} \ + http://www.linuxfocus.org/~guido.socher/ +MASTER_SITE_SUBDIR= apps/doctools MAINTAINER= leeym@cae.ce.ntu.edu.tw diff --git a/www/linbot/Makefile b/www/linbot/Makefile index d0bc85c375a..03bf2c9e128 100644 --- a/www/linbot/Makefile +++ b/www/linbot/Makefile @@ -8,7 +8,8 @@ PORTNAME= linbot PORTVERSION= 1.0 CATEGORIES= www python -MASTER_SITES= http://metalab.unc.edu/pub/Linux/apps/www/misc/ +MASTER_SITES= ${MASTER_SITE_SUNSITE} +MASTER_SITE_SUBDIR= apps/www/misc EXTRACT_SUFX= .tgz MAINTAINER= billf@FreeBSD.org diff --git a/www/webcheck/Makefile b/www/webcheck/Makefile index d0bc85c375a..03bf2c9e128 100644 --- a/www/webcheck/Makefile +++ b/www/webcheck/Makefile @@ -8,7 +8,8 @@ PORTNAME= linbot PORTVERSION= 1.0 CATEGORIES= www python -MASTER_SITES= http://metalab.unc.edu/pub/Linux/apps/www/misc/ +MASTER_SITES= ${MASTER_SITE_SUNSITE} +MASTER_SITE_SUBDIR= apps/www/misc EXTRACT_SUFX= .tgz MAINTAINER= billf@FreeBSD.org diff --git a/x11-fm/xnc/Makefile b/x11-fm/xnc/Makefile index ecb5a12459f..070f2a60048 100644 --- a/x11-fm/xnc/Makefile +++ b/x11-fm/xnc/Makefile @@ -8,9 +8,9 @@ PORTNAME= xnc PORTVERSION= 4.2.1 CATEGORIES= x11-fm -MASTER_SITES= http://www.xnc.dubna.su/src/ \ - ftp://ftp.chg.ru/pub/Linux/sunsite/X11/desktop/ \ - ftp://sunsite.unx.edu/pub/Linux/X11/desktop/ +MASTER_SITES= ${MASTER_SITE_SUNSITE} \ + http://www.xnc.dubna.su/src/ +MASTER_SITE_SUBDIR= X11/desktop DISTNAME= ${PKGNAME}.src MAINTAINER= dima@Chg.RU |