From 89b7d2a4465628b128b8f5f7fde5f2a3e2b2a8df Mon Sep 17 00:00:00 2001
From: Steve Price <steve@FreeBSD.org>
Date: Fri, 7 Jul 2000 19:59:26 +0000
Subject: - Use GTK_CONFIG/GLIB_CONFIG instead of hardcoded
gtk12-config/glib12-config - Support
CC/CFLAGS/PREIFX/LOCALBASE/X11BASE/MAKE/etc. properly
PR: 19623
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
---
ftp/IglooFTP/Makefile | 21 ++++++++++-----------
ftp/IglooFTP/files/patch-aa | 2 +-
ftp/IglooFTP/files/patch-ab | 24 ++++++++++++------------
ftp/IglooFTP/files/patch-ac | 2 +-
4 files changed, 24 insertions(+), 25 deletions(-)
(limited to 'ftp/IglooFTP')
diff --git a/ftp/IglooFTP/Makefile b/ftp/IglooFTP/Makefile
index 5bfe7740fb94..8fd1e7c8fa53 100644
--- a/ftp/IglooFTP/Makefile
+++ b/ftp/IglooFTP/Makefile
@@ -15,25 +15,24 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}.src
MAINTAINER= will@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
- intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-USE_X_PREFIX= yes
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-WRKSRC= ${WRKDIR}/IglooFTP-0.6.1
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
-do-build:
- @ cd ${WRKSRC}/src; ${MAKE}
+USE_X_PREFIX= yes
+MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
+ALL_TARGET= IglooFTP
-do-install:
- @ cd ${WRKSRC}/src; ${MAKE} install
- @ ${RM} ${PREFIX}/share/IglooFTP/docs/LICENSE~
+post-extract:
+ @${RM} ${WRKSRC}/../share/docs/LICENSE~
post-install:
.if !defined(NOPORTDOCS)
- @ ${MKDIR} ${PREFIX}/share/doc/IglooFTP
+ @${MKDIR} ${PREFIX}/share/doc/IglooFTP
.for file in AUTHORS BUGS COPYRIGHT THANKS TODO
- @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/IglooFTP
+ ${INSTALL_DATA} ${WRKSRC}/../${file} ${PREFIX}/share/doc/IglooFTP
.endfor
.endif
diff --git a/ftp/IglooFTP/files/patch-aa b/ftp/IglooFTP/files/patch-aa
index 48779d2d5a34..662e5bc3babe 100644
--- a/ftp/IglooFTP/files/patch-aa
+++ b/ftp/IglooFTP/files/patch-aa
@@ -1,4 +1,4 @@
---- src/FTP.c Thu Apr 15 20:05:13 1999
+--- FTP.c Thu Apr 15 20:05:13 1999
+++ /home/andy/tmp/wrk/src/FTP.c Mon May 3 12:59:56 1999
@@ -15,12 +15,12 @@
*/
diff --git a/ftp/IglooFTP/files/patch-ab b/ftp/IglooFTP/files/patch-ab
index 918fad7482b1..4f00433a8c8f 100644
--- a/ftp/IglooFTP/files/patch-ab
+++ b/ftp/IglooFTP/files/patch-ab
@@ -1,5 +1,5 @@
---- src/Makefile.orig Thu Apr 15 11:05:15 1999
-+++ src/Makefile Fri May 28 18:43:37 1999
+--- Makefile.orig Thu Apr 15 11:05:15 1999
++++ Makefile Fri May 28 18:43:37 1999
@@ -1,14 +1,15 @@
SHELL=/bin/sh
-CC = gcc
@@ -10,8 +10,8 @@
+CC?= gcc
+C_FLAGS = $(CFLAGS)
+# -Wall -g -O2 -m486 -fno-strength-reduce
-+GTK_CFLAGS = `gtk12-config --cflags`
-+GTK_LIBS = `gtk12-config --libs`
++GTK_CFLAGS = `$(GTK_CONFIG) --cflags`
++GTK_LIBS = `$(GTK_CONFIG) --libs`
+LFLAGS = $(GTK_LIBS) -lXmu -lXt -lSM -lICE
PROGNAME = IglooFTP
PROGNAME-STATIC = IglooFTP-static
@@ -34,14 +34,14 @@
- /usr/bin/install -m 644 ../share/bookmarks/* $(SHARE_PATH)/bookmarks/
- /usr/bin/install -m 644 ../share/app_ass/* $(SHARE_PATH)/app_ass/
- /usr/bin/install -m 644 ../share/gtkrc $(SHARE_PATH)/gtkrc
-+ /usr/bin/install -c -s -m 755 $(PROGNAME) $(BIN_PATH)
-+ /usr/bin/install -c -m 644 ../share/docs/* $(SHARE_PATH)/docs/
-+ /usr/bin/install -c -m 644 ../share/html/*.* $(SHARE_PATH)/html/
-+ /usr/bin/install -c -m 644 ../share/html/images/*.* $(SHARE_PATH)/html/images/
-+ /usr/bin/install -c -m 644 ../share/xpm/* $(SHARE_PATH)/xpm/
-+ /usr/bin/install -c -m 644 ../share/bookmarks/* $(SHARE_PATH)/bookmarks/
-+ /usr/bin/install -c -m 644 ../share/app_ass/* $(SHARE_PATH)/app_ass/
-+ /usr/bin/install -c -m 644 ../share/gtkrc $(SHARE_PATH)/gtkrc
++ ${BSD_INSTALL_PROGRAM} $(PROGNAME) $(BIN_PATH)
++ ${BSD_INSTALL_DATA} ../share/docs/* $(SHARE_PATH)/docs/
++ ${BSD_INSTALL_DATA} ../share/html/*.* $(SHARE_PATH)/html/
++ ${BSD_INSTALL_DATA} ../share/html/images/*.* $(SHARE_PATH)/html/images/
++ ${BSD_INSTALL_DATA} ../share/xpm/* $(SHARE_PATH)/xpm/
++ ${BSD_INSTALL_DATA} ../share/bookmarks/* $(SHARE_PATH)/bookmarks/
++ ${BSD_INSTALL_DATA} ../share/app_ass/* $(SHARE_PATH)/app_ass/
++ ${BSD_INSTALL_DATA} ../share/gtkrc $(SHARE_PATH)/gtkrc
diff --git a/ftp/IglooFTP/files/patch-ac b/ftp/IglooFTP/files/patch-ac
index 9175e4a06f14..2d45efc8ac97 100644
--- a/ftp/IglooFTP/files/patch-ac
+++ b/ftp/IglooFTP/files/patch-ac
@@ -1,4 +1,4 @@
---- src/main.c Thu Apr 15 20:05:15 1999
+--- main.c Thu Apr 15 20:05:15 1999
+++ /home/andy/tmp/wrk/src/main.c Mon May 3 13:42:28 1999
@@ -20,6 +20,9 @@
#include <stdlib.h>
--
cgit v1.2.3