diff options
| -rw-r--r-- | archivers/lbrate/Makefile | 10 | ||||
| -rw-r--r-- | archivers/lbrate/files/patch-Makefile | 20 | ||||
| -rw-r--r-- | emulators/qcl/Makefile | 5 | ||||
| -rw-r--r-- | emulators/qcl/files/patch-aa | 2 | ||||
| -rw-r--r-- | graphics/metapixel/Makefile | 7 | ||||
| -rw-r--r-- | graphics/metapixel/files/patch-Makefile | 14 | ||||
| -rw-r--r-- | science/qcl/Makefile | 5 | ||||
| -rw-r--r-- | science/qcl/files/patch-aa | 2 | ||||
| -rw-r--r-- | x11/bbrun/Makefile | 6 | ||||
| -rw-r--r-- | x11/bbrun/files/patch-Makefile | 6 |
10 files changed, 44 insertions, 33 deletions
diff --git a/archivers/lbrate/Makefile b/archivers/lbrate/Makefile index 680186657455..3d7ddcddf01f 100644 --- a/archivers/lbrate/Makefile +++ b/archivers/lbrate/Makefile @@ -7,22 +7,20 @@ 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} diff --git a/archivers/lbrate/files/patch-Makefile b/archivers/lbrate/files/patch-Makefile index 8ed29bafdf4c..ce621f678462 100644 --- a/archivers/lbrate/files/patch-Makefile +++ b/archivers/lbrate/files/patch-Makefile @@ -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) diff --git a/emulators/qcl/Makefile b/emulators/qcl/Makefile index 235d9f8faf2f..017a8af46877 100644 --- a/emulators/qcl/Makefile +++ b/emulators/qcl/Makefile @@ -7,6 +7,7 @@ PORTNAME= qcl PORTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= emulators math MASTER_SITES= http://tph.tuwien.ac.at/~oemer/tgz/ EXTRACT_SUFX= .tgz @@ -14,12 +15,12 @@ EXTRACT_SUFX= .tgz MAINTAINER= huntting@glarp.com COMMENT= A quantum computer simulator -LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt +USE_GETOPT_LONG=yes .include <bsd.port.pre.mk> .if ${OSVERSION} >= 500113 -BROKEN= "Does not compile (bad C++ code)" +BROKEN= "Does not compile (bad C++ code)" .endif post-install: diff --git a/emulators/qcl/files/patch-aa b/emulators/qcl/files/patch-aa index 1910760c87cb..9b3bc17cd883 100644 --- a/emulators/qcl/files/patch-aa +++ b/emulators/qcl/files/patch-aa @@ -16,7 +16,7 @@ -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 diff --git a/graphics/metapixel/Makefile b/graphics/metapixel/Makefile index f9c14df17e63..30c3f730853c 100644 --- a/graphics/metapixel/Makefile +++ b/graphics/metapixel/Makefile @@ -6,6 +6,7 @@ PORTNAME= metapixel PORTVERSION= 0.7 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.complang.tuwien.ac.at/~schani/metapixel/ @@ -13,11 +14,13 @@ 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 diff --git a/graphics/metapixel/files/patch-Makefile b/graphics/metapixel/files/patch-Makefile index 0fb1d77c5150..0da82060c998 100644 --- a/graphics/metapixel/files/patch-Makefile +++ b/graphics/metapixel/files/patch-Makefile @@ -1,22 +1,20 @@ ---- 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 diff --git a/science/qcl/Makefile b/science/qcl/Makefile index 235d9f8faf2f..017a8af46877 100644 --- a/science/qcl/Makefile +++ b/science/qcl/Makefile @@ -7,6 +7,7 @@ PORTNAME= qcl PORTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= emulators math MASTER_SITES= http://tph.tuwien.ac.at/~oemer/tgz/ EXTRACT_SUFX= .tgz @@ -14,12 +15,12 @@ EXTRACT_SUFX= .tgz MAINTAINER= huntting@glarp.com COMMENT= A quantum computer simulator -LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt +USE_GETOPT_LONG=yes .include <bsd.port.pre.mk> .if ${OSVERSION} >= 500113 -BROKEN= "Does not compile (bad C++ code)" +BROKEN= "Does not compile (bad C++ code)" .endif post-install: diff --git a/science/qcl/files/patch-aa b/science/qcl/files/patch-aa index 1910760c87cb..9b3bc17cd883 100644 --- a/science/qcl/files/patch-aa +++ b/science/qcl/files/patch-aa @@ -16,7 +16,7 @@ -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 diff --git a/x11/bbrun/Makefile b/x11/bbrun/Makefile index 670e17c32422..380323c7be76 100644 --- a/x11/bbrun/Makefile +++ b/x11/bbrun/Makefile @@ -7,19 +7,21 @@ 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 diff --git a/x11/bbrun/files/patch-Makefile b/x11/bbrun/files/patch-Makefile index bffa640c44f0..2b0fd3d7c82e 100644 --- a/x11/bbrun/files/patch-Makefile +++ b/x11/bbrun/files/patch-Makefile @@ -4,8 +4,8 @@ -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 \ @@ -17,7 +17,7 @@ bbrun: $(OBJS) - $(CC) -Wall -g -o bbrun $^ $(LIBS) -+ $(CC) -o bbrun $^ $(LIBS) ++ $(CC) -o bbrun $^ $(LDFLAGS) $(LIBS) install: cp bbrun /usr/local/bin/ |