diff options
| author | kevlo <kevlo@FreeBSD.org> | 2001-01-10 23:57:38 +0800 |
|---|---|---|
| committer | kevlo <kevlo@FreeBSD.org> | 2001-01-10 23:57:38 +0800 |
| commit | d5fb7f586408e6f3aa0fc306e292c6574051b20b (patch) | |
| tree | 71478dce75e4d49b5821210068dfc27fc5ae4e69 /ftp | |
| parent | 9262341534cabbe07fe35252f78b50b38b713f2a (diff) | |
| download | freebsd-ports-graphics-d5fb7f586408e6f3aa0fc306e292c6574051b20b.tar.gz freebsd-ports-graphics-d5fb7f586408e6f3aa0fc306e292c6574051b20b.tar.zst freebsd-ports-graphics-d5fb7f586408e6f3aa0fc306e292c6574051b20b.zip | |
- Support CXX/CXXFLAGS/PREFIX/GTK_CONFIG properly
- Fix pkg-plist
PR: 24200
Submitted by: MAINTAINER
Diffstat (limited to 'ftp')
| -rw-r--r-- | ftp/downloader/Makefile | 14 | ||||
| -rw-r--r-- | ftp/downloader/files/patch-aa | 39 | ||||
| -rw-r--r-- | ftp/downloader/pkg-plist | 2 |
3 files changed, 24 insertions, 31 deletions
diff --git a/ftp/downloader/Makefile b/ftp/downloader/Makefile index 35fc6e43629..312523a30f0 100644 --- a/ftp/downloader/Makefile +++ b/ftp/downloader/Makefile @@ -7,23 +7,25 @@ PORTNAME= downloader PORTVERSION= 1.20 +PORTREVISION= 1 CATEGORIES= ftp MASTER_SITES= http://www.krasu.ru/soft/chuchelo/files/ \ ftp://ftp.server51.freshmeat.net/pub/d4x/ \ ftp://ftp.chg.ru/pub/X11/applications/Xdownloader/ -DISTNAME= nt-1.20 +DISTNAME= nt-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +WRKSRC= ${WRKDIR}/${DISTNAME}/main USE_GTK= yes USE_GMAKE= yes -WRKSRC= ${WRKDIR}/${DISTNAME}/main -MAKE_ENV= MSGFMT_CMD="${LOCALBASE}/bin/msgfmt" +MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" DEST="${PREFIX}" \ + GTKCONFIG="${GTK_CONFIG}" MAKE="${GMAKE}" \ + MSGFMT_CMD="${LOCALBASE}/bin/msgfmt" MAN1= nt.1 -D4X_DOC= ChangeLog FAQ FAQ.de FAQ.es FAQ.fr FAQ.gr LICENSE \ +PORTDOCS= ChangeLog FAQ FAQ.de FAQ.es FAQ.fr FAQ.gr LICENSE \ NAMES PLANS README README.de README.es README.gr \ README.pl README.pt_BR README.ru THANKS TODO TROUBLES @@ -31,7 +33,7 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/../nt.1 ${PREFIX}/man/man1 .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/downloader -.for file in ${D4X_DOC} +.for file in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/../${file} ${PREFIX}/share/doc/downloader .endfor .endif diff --git a/ftp/downloader/files/patch-aa b/ftp/downloader/files/patch-aa index 3da9b93b8f7..5272bc8bbf8 100644 --- a/ftp/downloader/files/patch-aa +++ b/ftp/downloader/files/patch-aa @@ -1,11 +1,7 @@ ---- Makefile.orig Sat Dec 16 07:44:10 2000 -+++ Makefile Fri Jan 5 21:24:27 2001 -@@ -5,10 +5,10 @@ - SOLARIS_TYPECASTED_X11_HEADERS=-I/var/tmp/src - endif - ifndef CXXFLAGS --CXXFLAGS=-Wall -O2 $(SOLARIS_TYPECASTED_X11_HEADERS) -+#CXXFLAGS=-Wall -O2 $(SOLARIS_TYPECASTED_X11_HEADERS) +--- Makefile.orig Sun Dec 17 00:44:10 2000 ++++ Makefile Wed Jan 10 03:45:22 2001 +@@ -8,7 +8,7 @@ + CXXFLAGS=-Wall -O2 $(SOLARIS_TYPECASTED_X11_HEADERS) endif -CXXFLAGS+=-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $(SOLARIS_TYPECASTED_X11_HEADERS) -DDEBUG_ALL @@ -13,30 +9,23 @@ # -ggdb export CXXFLAGS LOCALEDIR -@@ -33,11 +33,13 @@ +@@ -39,8 +39,8 @@ MAKE=gmake endif --ifeq ($(OSTYPE),FreeBSD) -+# fsck'ing gmake won't recongize us as FreeBSD... -+#ifeq ($(OSTYPE),FreeBSD) - PTHREAD=-pthread - GTKCONFIG=gtk12-config -+GLIBCONFIG=glib12-config - MAKE=gmake --endif -+#endif +-GTKLIBS=$(shell $(GTKCONFIG) --libs) $(shell $(GLIBCONFIG) --libs) +-GTKFLAGS=$(shell $(GTKCONFIG) --cflags) $(shell $(GLIBCONFIG) --cflags) ++GTKLIBS=$(shell $(GTKCONFIG) --libs) #$(shell $(GLIBCONFIG) --libs) ++GTKFLAGS=$(shell $(GTKCONFIG) --cflags) #$(shell $(GLIBCONFIG) --cflags) - GTKLIBS=$(shell $(GTKCONFIG) --libs) $(shell $(GLIBCONFIG) --libs) - GTKFLAGS=$(shell $(GTKCONFIG) --cflags) $(shell $(GLIBCONFIG) --cflags) -@@ -81,8 +83,8 @@ + ifeq ($(OSTYPE),Irix) + CTKFLIBS += lintl +@@ -81,7 +81,7 @@ install: all - install -c -m755 nt $(DEST)/bin -- [ -z "$(NLS)" ] || $(MAKE) install -C po -+ $(BSD_INSTALL_PROGRAM) nt $(DEST)/bin -+ [ -z "$(NLS)" ] || cd po && LOCALEDIR=$(LOCALEDIR) $(MAKE) install ++ ${BSD_INSTALL_PROGRAM} nt $(DEST)/bin + [ -z "$(NLS)" ] || $(MAKE) install -C po clean: - -rm -f *.o nt TAGS *~ diff --git a/ftp/downloader/pkg-plist b/ftp/downloader/pkg-plist index c50bc04d1b3..a3eac54b6f2 100644 --- a/ftp/downloader/pkg-plist +++ b/ftp/downloader/pkg-plist @@ -30,9 +30,11 @@ share/locale/id/LC_MESSAGES/nt.mo share/locale/it/LC_MESSAGES/nt.mo share/locale/iw/LC_MESSAGES/nt.mo share/locale/ja/LC_MESSAGES/nt.mo +share/locale/ko/LC_MESSAGES/nt.mo share/locale/nl/LC_MESSAGES/nt.mo share/locale/pl/LC_MESSAGES/nt.mo share/locale/pt_BR/LC_MESSAGES/nt.mo share/locale/ru/LC_MESSAGES/nt.mo +share/locale/sk/LC_MESSAGES/nt.mo share/locale/zh_CN.GBK/LC_MESSAGES/nt.mo @dirrm share/doc/downloader |