Index: head/archivers/lbrate/Makefile =================================================================== --- head/archivers/lbrate/Makefile (revision 84836) +++ head/archivers/lbrate/Makefile (revision 84837) @@ -1,34 +1,32 @@ # New ports collection makefile for: lbrate # Date created: 26 August 2001 # Whom: Gea-Suan Lin (gslin@ccca.nctu.edu.tw) # # $FreeBSD$ # PORTNAME= lbrate PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= archivers MASTER_SITES= ftp://ftp.ibiblio.org/pub/Linux/utils/compress/ MAINTAINER= gslin@ccca.nctu.edu.tw COMMENT= Extract/decompress CP/M LBR archives -LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt - +USE_GETOPT_LONG=yes USE_REINPLACE= yes +MAKE_ENV= CPPFLAGS="${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" MAN1= lbrate.1 - -post-patch: - @${REINPLACE_CMD} -e "s,^CC|^PREFIX,#,g" ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Makefile post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in COPYING ChangeLog README TODO @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} .endfor .endif .include Property changes on: head/archivers/lbrate/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/archivers/lbrate/files/patch-Makefile =================================================================== --- head/archivers/lbrate/files/patch-Makefile (revision 84836) +++ head/archivers/lbrate/files/patch-Makefile (revision 84837) @@ -1,20 +1,28 @@ ---- Makefile.orig Wed Aug 29 19:07:24 2001 -+++ Makefile Wed Aug 29 19:08:13 2001 -@@ -1,7 +1,7 @@ +--- Makefile.orig Fri Aug 31 01:03:17 2001 ++++ Makefile Sun Jul 6 05:09:19 2003 +@@ -1,13 +1,13 @@ # Makefile - makefile for lbrate - CC=gcc +-CC=gcc -CFLAGS=-O2 -Wall -+CFLAGS+=-I%%LOCALBASE%%/include ++CC?= gcc ++CFLAGS+=$(CPPFLAGS) # Set BINDIR to directory for binary, # MANDIR to directory for man page. + # Usually it will be simpler to just set PREFIX. + # +-PREFIX=/usr/local ++PREFIX?=/usr/local + BINDIR=$(PREFIX)/bin + MANDIR=$(PREFIX)/man/man1 + @@ -19,7 +19,7 @@ all: lbrate lbrate: $(OBJ) - $(CC) $(CFLAGS) -o lbrate $(OBJ) -+ $(CC) $(CFLAGS) -o lbrate $(OBJ) -L%%LOCALBASE%%/lib -lgnugetopt ++ $(CC) $(CFLAGS) -o lbrate $(OBJ) $(LDFLAGS) installdirs: /bin/sh ./mkinstalldirs $(BINDIR) $(MANDIR) Property changes on: head/archivers/lbrate/files/patch-Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/emulators/qcl/Makefile =================================================================== --- head/emulators/qcl/Makefile (revision 84836) +++ head/emulators/qcl/Makefile (revision 84837) @@ -1,28 +1,29 @@ # ports collection makefile for: qcl # Date created: 23 May 2001 # Whom: Brad Huntting # # $FreeBSD$ # PORTNAME= qcl PORTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= emulators math MASTER_SITES= http://tph.tuwien.ac.at/~oemer/tgz/ EXTRACT_SUFX= .tgz MAINTAINER= huntting@glarp.com COMMENT= A quantum computer simulator -LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt +USE_GETOPT_LONG=yes .include .if ${OSVERSION} >= 500113 -BROKEN= "Does not compile (bad C++ code)" +BROKEN= "Does not compile (bad C++ code)" .endif post-install: strip ${PREFIX}/bin/qcl .include Property changes on: head/emulators/qcl/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/emulators/qcl/files/patch-aa =================================================================== --- head/emulators/qcl/files/patch-aa (revision 84836) +++ head/emulators/qcl/files/patch-aa (revision 84837) @@ -1,124 +1,124 @@ --- Makefile.orig Wed Jan 17 13:17:06 2001 +++ Makefile Thu May 24 15:51:01 2001 @@ -14,29 +14,25 @@ # Directory for Standard .qcl files -QCLDIR = /usr/local/lib/qcl +QCLDIR = ${PREFIX}/share/qcl # Path for qcl binaries -QCLBIN = /usr/local/bin +QCLBIN = ${PREFIX}/bin # Debugging options -DEBUG = -g -DQCL_DEBUG -DQC_DEBUG -#DEBUG = -O2 -+DEBUG = -O2 ++DEBUG = # Comment out if you don't have GNU readline on your system # explicit linking against libtermcap or libncurses may be required RLOPT = -DQCL_USE_READLINE -#RLLIB = -lreadline -RLLIB = -lreadline -lncurses +RLLIB = -lreadline # Replace with lex and yacc on non-GNU systems (untested) -LEX = flex -YACC = bison -INSTALL = install +INSTALL = install -c ##### You shouldn't have to edit the stuff below ##### @@ -44,13 +40,15 @@ QCLIB = $(QCDIR)/libqc.a QCLINC = lib -CC = g++ -CPP = $(CC) -E -CFLAGS = -c -Wall $(DEBUG) $(RLOPT) -I$(QCDIR) -DDEF_INCLUDE_PATH="\"$(QCLDIR)\"" -LFLAGS = -L$(QCDIR) $(DEBUG) -lm -lfl -lqc $(RLLIB) +CXXFLAGS += -Wall $(DEBUG) $(RLOPT) -I$(QCDIR) -I${PREFIX}/include -DDEF_INCLUDE_PATH="\"$(QCLDIR)\"" +LDFLAGS += -L$(QCDIR) $(DEBUG) -L${PREFIX}/lib -lgnugetopt -lm -lfl -lqc $(RLLIB) + +FILESCC = debug.cc error.cc eval.cc exec.cc extern.cc lex.cc \ + options.cc parse.cc print.cc qcl.cc quheap.cc symbols.cc \ + syntax.cc typcheck.cc types.cc yacc.cc +FILESH = debug.h error.h extern.h options.h parse.h quheap.h \ + symbols.h syntax.h types.h yacc.h -FILESCC = $(wildcard *.cc) -FILESH = $(wildcard *.h) SOURCE = $(FILESCC) $(FILESH) qcl.lex qcl.y Makefile @@ -58,23 +56,11 @@ lex.o yacc.o print.o quheap.o extern.o eval.o exec.o \ parse.o options.o debug.o -all: do-it-all +all: build + -ifeq (.depend,$(wildcard .depend)) -include .depend -do-it-all: build -else -do-it-all: dep - make -endif - -#### Rules for depend - -dep: lex.cc yacc.cc yacc.h $(QCLIB) - for i in *.cc; do \ - $(CPP) -I$(QCDIR) -MM $$i; \ - echo -e '\t$(CC) $(CFLAGS)' $$i '\n'; \ - done > .depend +dep: $(FILESCC) $(FILESH) + $(CXX) -M $(CXXFLAGS) $(FILESCC) >.depend lex.cc: qcl.lex $(LEX) -olex.cc qcl.lex @@ -86,24 +72,24 @@ mv yacc.cc.h yacc.h $(QCLIB): - cd $(QCDIR) && make libqc.a + cd $(QCDIR) && $(MAKE) $(MAKEFLAGS) libqc.a #### Rules for build build: qcl $(QCLINC)/default.qcl qcl: $(OBJECTS) qcl.o $(QCLIB) - $(CC) $(OBJECTS) qcl.o $(LFLAGS) -o qcl + $(CXX) $(OBJECTS) qcl.o $(LDFLAGS) -o qcl qcl-static: $(OBJECTS) qcl.o $(QCLIB) - $(CC) -static $(OBJECTS) qcl.o $(LFLAGS) -o qcl-static + $(CXX) -static $(OBJECTS) qcl.o $(LDFLAGS) -o qcl-static strip qcl-static $(QCLINC)/default.qcl: extern.cc grep "^//!" extern.cc | cut -c5- > $(QCLINC)/default.qcl install: build - $(INSTALL) -m 0755 -d $(QCLBIN) $(QCLDIR) + umask 022; mkdir -p $(QCLDIR); chmod 0755 $(QCLDIR) $(INSTALL) -m 0755 ./qcl $(QCLBIN) $(INSTALL) -m 0644 ./lib/default.qcl $(QCLDIR) $(INSTALL) -m 0644 ./lib/dft.qcl $(QCLDIR) @@ -115,6 +101,7 @@ $(INSTALL) -m 0644 ./lib/roulette.qcl $(QCLDIR) $(INSTALL) -m 0644 ./lib/shor.qcl $(QCLDIR) $(INSTALL) -m 0644 ./lib/swap.qcl $(QCLDIR) + $(INSTALL) -m 0644 ./lib/grover.qcl $(QCLDIR) #### Other Functions Property changes on: head/emulators/qcl/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/graphics/metapixel/Makefile =================================================================== --- head/graphics/metapixel/Makefile (revision 84836) +++ head/graphics/metapixel/Makefile (revision 84837) @@ -1,32 +1,35 @@ # Ports collection makefile for: metapixel # Date created: 2002-05-23 # Whom: Tilman Linneweh # # $FreeBSD$ PORTNAME= metapixel PORTVERSION= 0.7 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.complang.tuwien.ac.at/~schani/metapixel/ MAINTAINER= arved@FreeBSD.org COMMENT= "Metapixel is a program for generating photomosaics" LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ - gnugetopt.1:${PORTSDIR}/devel/libgnugetopt + jpeg.9:${PORTSDIR}/graphics/jpeg +USE_GETOPT_LONG=yes USE_GMAKE= yes USE_REINPLACE= yes +MAKE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" post-patch: @${RM} ${WRKSRC}/getopt.h @${REINPLACE_CMD} -e 's,values.h,limits.h,' ${WRKSRC}/libzoom/simple.h @${REINPLACE_CMD} -e 's,MINSHORT,SHRT_MAX,; \ s,MAXSHORT,SHRT_MAX,' ${WRKSRC}/libzoom/zoom.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/metapixel ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/metapixel-prepare ${PREFIX}/bin .include Property changes on: head/graphics/metapixel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/graphics/metapixel/files/patch-Makefile =================================================================== --- head/graphics/metapixel/files/patch-Makefile (revision 84836) +++ head/graphics/metapixel/files/patch-Makefile (revision 84837) @@ -1,27 +1,25 @@ ---- Makefile.orig Fri Jan 21 23:32:17 2000 -+++ Makefile Tue Sep 24 03:40:26 2002 -@@ -1,18 +1,18 @@ +--- Makefile.orig Sat Jan 22 07:32:17 2000 ++++ Makefile Sun Jul 6 19:40:11 2003 +@@ -1,5 +1,3 @@ -PREFIX = /usr/local -INSTALL = install BINDIR = $(PREFIX)/bin - VERSION = 0.7 +@@ -7,12 +5,12 @@ #PROFILE = -pg -+CFLAGS+= -I/usr/local/include -+LDFLAGS+= -L/usr/local/lib -lgnugetopt -LDOPTS = -L/usr/X11R6/lib $(PROFILE) -CCOPTS = -I/usr/X11R6/include -I/usr/X11R6/include/X11 -Wall -O9 $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\" -CC = gcc -+LDOPTS = ${LDFLAGS} -L/usr/X11R6/lib $(PROFILE) -+CCOPTS = ${CFLAGS} -I/usr/X11R6/include -I/usr/X11R6/include/X11 -Wall $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\" ++LDOPTS = ${LDFLAGS} $(PROFILE) ++CCOPTS = ${CFLAGS} ${CPPFLAGS} -Wall $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\" +#CC = gcc #LIBFFM = -lffm -OBJS = metapixel.o vector.o rwpng.o rwjpeg.o readimage.o writeimage.o getopt.o getopt1.o +OBJS = metapixel.o vector.o rwpng.o rwjpeg.o readimage.o writeimage.o all : metapixel Property changes on: head/graphics/metapixel/files/patch-Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/science/qcl/Makefile =================================================================== --- head/science/qcl/Makefile (revision 84836) +++ head/science/qcl/Makefile (revision 84837) @@ -1,28 +1,29 @@ # ports collection makefile for: qcl # Date created: 23 May 2001 # Whom: Brad Huntting # # $FreeBSD$ # PORTNAME= qcl PORTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= emulators math MASTER_SITES= http://tph.tuwien.ac.at/~oemer/tgz/ EXTRACT_SUFX= .tgz MAINTAINER= huntting@glarp.com COMMENT= A quantum computer simulator -LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt +USE_GETOPT_LONG=yes .include .if ${OSVERSION} >= 500113 -BROKEN= "Does not compile (bad C++ code)" +BROKEN= "Does not compile (bad C++ code)" .endif post-install: strip ${PREFIX}/bin/qcl .include Property changes on: head/science/qcl/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/science/qcl/files/patch-aa =================================================================== --- head/science/qcl/files/patch-aa (revision 84836) +++ head/science/qcl/files/patch-aa (revision 84837) @@ -1,124 +1,124 @@ --- Makefile.orig Wed Jan 17 13:17:06 2001 +++ Makefile Thu May 24 15:51:01 2001 @@ -14,29 +14,25 @@ # Directory for Standard .qcl files -QCLDIR = /usr/local/lib/qcl +QCLDIR = ${PREFIX}/share/qcl # Path for qcl binaries -QCLBIN = /usr/local/bin +QCLBIN = ${PREFIX}/bin # Debugging options -DEBUG = -g -DQCL_DEBUG -DQC_DEBUG -#DEBUG = -O2 -+DEBUG = -O2 ++DEBUG = # Comment out if you don't have GNU readline on your system # explicit linking against libtermcap or libncurses may be required RLOPT = -DQCL_USE_READLINE -#RLLIB = -lreadline -RLLIB = -lreadline -lncurses +RLLIB = -lreadline # Replace with lex and yacc on non-GNU systems (untested) -LEX = flex -YACC = bison -INSTALL = install +INSTALL = install -c ##### You shouldn't have to edit the stuff below ##### @@ -44,13 +40,15 @@ QCLIB = $(QCDIR)/libqc.a QCLINC = lib -CC = g++ -CPP = $(CC) -E -CFLAGS = -c -Wall $(DEBUG) $(RLOPT) -I$(QCDIR) -DDEF_INCLUDE_PATH="\"$(QCLDIR)\"" -LFLAGS = -L$(QCDIR) $(DEBUG) -lm -lfl -lqc $(RLLIB) +CXXFLAGS += -Wall $(DEBUG) $(RLOPT) -I$(QCDIR) -I${PREFIX}/include -DDEF_INCLUDE_PATH="\"$(QCLDIR)\"" +LDFLAGS += -L$(QCDIR) $(DEBUG) -L${PREFIX}/lib -lgnugetopt -lm -lfl -lqc $(RLLIB) + +FILESCC = debug.cc error.cc eval.cc exec.cc extern.cc lex.cc \ + options.cc parse.cc print.cc qcl.cc quheap.cc symbols.cc \ + syntax.cc typcheck.cc types.cc yacc.cc +FILESH = debug.h error.h extern.h options.h parse.h quheap.h \ + symbols.h syntax.h types.h yacc.h -FILESCC = $(wildcard *.cc) -FILESH = $(wildcard *.h) SOURCE = $(FILESCC) $(FILESH) qcl.lex qcl.y Makefile @@ -58,23 +56,11 @@ lex.o yacc.o print.o quheap.o extern.o eval.o exec.o \ parse.o options.o debug.o -all: do-it-all +all: build + -ifeq (.depend,$(wildcard .depend)) -include .depend -do-it-all: build -else -do-it-all: dep - make -endif - -#### Rules for depend - -dep: lex.cc yacc.cc yacc.h $(QCLIB) - for i in *.cc; do \ - $(CPP) -I$(QCDIR) -MM $$i; \ - echo -e '\t$(CC) $(CFLAGS)' $$i '\n'; \ - done > .depend +dep: $(FILESCC) $(FILESH) + $(CXX) -M $(CXXFLAGS) $(FILESCC) >.depend lex.cc: qcl.lex $(LEX) -olex.cc qcl.lex @@ -86,24 +72,24 @@ mv yacc.cc.h yacc.h $(QCLIB): - cd $(QCDIR) && make libqc.a + cd $(QCDIR) && $(MAKE) $(MAKEFLAGS) libqc.a #### Rules for build build: qcl $(QCLINC)/default.qcl qcl: $(OBJECTS) qcl.o $(QCLIB) - $(CC) $(OBJECTS) qcl.o $(LFLAGS) -o qcl + $(CXX) $(OBJECTS) qcl.o $(LDFLAGS) -o qcl qcl-static: $(OBJECTS) qcl.o $(QCLIB) - $(CC) -static $(OBJECTS) qcl.o $(LFLAGS) -o qcl-static + $(CXX) -static $(OBJECTS) qcl.o $(LDFLAGS) -o qcl-static strip qcl-static $(QCLINC)/default.qcl: extern.cc grep "^//!" extern.cc | cut -c5- > $(QCLINC)/default.qcl install: build - $(INSTALL) -m 0755 -d $(QCLBIN) $(QCLDIR) + umask 022; mkdir -p $(QCLDIR); chmod 0755 $(QCLDIR) $(INSTALL) -m 0755 ./qcl $(QCLBIN) $(INSTALL) -m 0644 ./lib/default.qcl $(QCLDIR) $(INSTALL) -m 0644 ./lib/dft.qcl $(QCLDIR) @@ -115,6 +101,7 @@ $(INSTALL) -m 0644 ./lib/roulette.qcl $(QCLDIR) $(INSTALL) -m 0644 ./lib/shor.qcl $(QCLDIR) $(INSTALL) -m 0644 ./lib/swap.qcl $(QCLDIR) + $(INSTALL) -m 0644 ./lib/grover.qcl $(QCLDIR) #### Other Functions Property changes on: head/science/qcl/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/x11/bbrun/Makefile =================================================================== --- head/x11/bbrun/Makefile (revision 84836) +++ head/x11/bbrun/Makefile (revision 84837) @@ -1,33 +1,35 @@ # New ports collection makefile for: bbrun # Date created: 3 August 2001 # Whom: Adam Weinberger # # $FreeBSD$ # PORTNAME= bbrun PORTVERSION= 1.4 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://www.dwave.net/~jking/bbrun/ MAINTAINER= adamw@FreeBSD.org COMMENT= A Run box for Blackbox -LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt - +USE_GETOPT_LONG=yes USE_X_PREFIX= yes USE_GNOME= gtk12 USE_GMAKE= yes USE_XPM= yes WRKSRC= ${WRKDIR}/${DISTNAME}/bbrun +MAKE_ENV= CPPFLAGS="${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" do-install: @${INSTALL_PROGRAM} ${WRKSRC}/bbrun ${PREFIX}/bin post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/../README ${DOCSDIR} .endif .include Property changes on: head/x11/bbrun/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.16 \ No newline at end of property +1.17 \ No newline at end of property Index: head/x11/bbrun/files/patch-Makefile =================================================================== --- head/x11/bbrun/files/patch-Makefile (revision 84836) +++ head/x11/bbrun/files/patch-Makefile (revision 84837) @@ -1,29 +1,29 @@ --- Makefile.orig Sat Jul 20 12:47:49 2002 +++ Makefile Sat Jul 20 20:24:41 2002 @@ -1,16 +1,15 @@ -CC = gcc -LIBS = -lXpm `gtk-config --libs` -CFLAGS = `gtk-config --cflags` -+LIBS = -lXpm `${GTK_CONFIG} --libs` -L${LOCALBASE}/lib -lgnugetopt -+CFLAGS = `${GTK_CONFIG} --cflags` -Wall ++LIBS = -lXpm `${GTK_CONFIG} --libs` ++CFLAGS += `${GTK_CONFIG} --cflags` -Wall OBJS = bbrun.o \ ../wmgeneral/wmgeneral.o \ ../wmgeneral/misc.o \ ../wmgeneral/list.o .c.o: - $(CC) -g -c -O2 -Wall $< -o $*.o $(CFLAGS) + $(CC) -c $< -o $*.o $(CFLAGS) bbrun: $(OBJS) - $(CC) -Wall -g -o bbrun $^ $(LIBS) -+ $(CC) -o bbrun $^ $(LIBS) ++ $(CC) -o bbrun $^ $(LDFLAGS) $(LIBS) install: cp bbrun /usr/local/bin/ @@ -18,3 +17,5 @@ clean: rm -f bbrun $(OBJS) rm -f core + +all: bbrun Property changes on: head/x11/bbrun/files/patch-Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property