diff options
| author | jylefort <jylefort@FreeBSD.org> | 2005-10-17 19:44:02 +0800 |
|---|---|---|
| committer | jylefort <jylefort@FreeBSD.org> | 2005-10-17 19:44:02 +0800 |
| commit | 0707b7ab5487fb3dcc02d62db38884348a8ba3a6 (patch) | |
| tree | 49ca990d4dc9c26b479975343ced261dd02fc51e /graphics/png2ico | |
| parent | 99b08a09df5a8086ab563b2bfc535af9817284c7 (diff) | |
| download | freebsd-ports-gnome-0707b7ab5487fb3dcc02d62db38884348a8ba3a6.tar.gz freebsd-ports-gnome-0707b7ab5487fb3dcc02d62db38884348a8ba3a6.tar.zst freebsd-ports-gnome-0707b7ab5487fb3dcc02d62db38884348a8ba3a6.zip | |
- Respect ${LOCALBASE} [1]
- Respect ${CXX} and ${CXXFLAGS}
- Discard vendor optimization flags
- Remove useless USE_GMAKE
[1]:
PR: ports/87563
Submitted by: maintainer
Diffstat (limited to 'graphics/png2ico')
| -rw-r--r-- | graphics/png2ico/Makefile | 7 | ||||
| -rw-r--r-- | graphics/png2ico/files/patch-Makefile | 14 |
2 files changed, 5 insertions, 16 deletions
diff --git a/graphics/png2ico/Makefile b/graphics/png2ico/Makefile index 576d8a4234a2..8dcedd9e085f 100644 --- a/graphics/png2ico/Makefile +++ b/graphics/png2ico/Makefile @@ -7,7 +7,7 @@ PORTNAME= png2ico PORTVERSION= 2002.12.08 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.winterdrache.de/freeware/png2ico/data/ DISTNAME= ${PORTNAME}-src-${PORTVERSION:S/./-/g} @@ -21,11 +21,6 @@ MAN1= png2ico.1 PLIST_FILES= bin/png2ico WRKSRC= ${WRKDIR}/${PORTNAME} -USE_GMAKE= yes -USE_REINPLACE= yes - -post-patch: - ${REINPLACE_CMD} -e 's|-O2|${CFLAGS}|' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin diff --git a/graphics/png2ico/files/patch-Makefile b/graphics/png2ico/files/patch-Makefile index 48fe12c3998e..aa187111bd1f 100644 --- a/graphics/png2ico/files/patch-Makefile +++ b/graphics/png2ico/files/patch-Makefile @@ -1,17 +1,11 @@ ---- Makefile.orig Sat Dec 7 23:49:52 2002 -+++ Makefile Mon Mar 1 13:24:57 2004 -@@ -1,11 +1,11 @@ --CPPFLAGS=-W -Wall -O2 -finline-functions -+CPPFLAGS=-W -Wall -g -O -pipe -finline-functions -I/usr/local/include -L/usr/local/lib - #CPPFLAGS=-O0 -W -Wall --DEBUG=-g -+#DEBUG=-g - +--- Makefile.orig Mon Oct 17 13:19:41 2005 ++++ Makefile Mon Oct 17 13:21:09 2005 +@@ -5,7 +5,7 @@ all: png2ico png2ico: png2ico.cpp - g++ $(CPPFLAGS) $(DEBUG) -o $@ $< -lpng -lz -lm -+ ${CXX} $(CPPFLAGS) $(DEBUG) -o $@ $< -lpng -lz -lm ++ $(CXX) $(CXXFLAGS) -I$(LOCALBASE)/include -L$(LOCALBASE)/lib -o $@ $< -lpng -lz -lm doc/png2ico.txt: doc/png2ico.1 man $< |sed -e $$'s/.\b\\(.\\)/\\1/g' -e 's/\(.*\)/\1'$$'\r/' >$@ |