Date: Sat, 21 Oct 2000 21:40:20 -0400 (EDT) From: patseal@hyperhost.net To: FreeBSD-gnats-submit@freebsd.org Subject: ports/22202: Update: misc/biblereader Message-ID: <20001022014020.0114A137F75@foobar.foobar.eyep.net>
next in thread | raw e-mail | index | archive | help
>Number: 22202 >Category: ports >Synopsis: Update: misc/biblereader >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Oct 21 18:50:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Patrick Seal >Release: FreeBSD 4.1.1-STABLE i386 >Organization: >Environment: >Description: -PORTVERSION= 0.3.2 +PORTVERSION= 0.3.3 Also update checksum for datafiles so it compiles on bento and fixed plist bug probably introduced during the structure change. Bye -g flag! Removed files: pkg-plist.supplements New files: pkg-plist.dictionaries pkg-plist.notes >How-To-Repeat: >Fix: diff -ruN biblereader.orig/Makefile biblereader/Makefile --- biblereader.orig/Makefile Sun Oct 8 02:53:21 2000 +++ biblereader/Makefile Sat Oct 21 21:24:28 2000 @@ -6,15 +6,18 @@ # PORTNAME= biblereader -PORTVERSION= 0.3.2 +PORTVERSION= 0.3.3 CATEGORIES= misc MASTER_SITES= ftp://ftp.whitevine.com/biblereader/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} kjv.tar.gz .if defined(WITH_TRANSLATIONS) DISTFILES+= asv.tar.gz darby.tar.gz .endif -.if defined(WITH_SUPPLEMENTS) -DISTFILES+= easton.tar.gz mhc.tar.gz +.if defined(WITH_NOTES) +DISTFILES+= mhc.tar.gz +.endif +.if defined(WITH_DICTIONARIES) +DISTFILES+= easton.tar.gz strongs.tar.gz torrey.tar.gz .endif MAINTAINER= patseal@hyperhost.net @@ -24,34 +27,45 @@ PLIST= ${WRKDIR}/PLIST DATAFILES= ${WRKDIR}/kjv/kjv -PLISTS= ${PKGDIR}/pkg-plist .if defined(WITH_TRANSLATIONS) -DATAFILES+= ${WRKDIR}/asv/asv ${WRKDIR}/darby/darby -PLISTS+= ${PKGDIR}/pkg-plist.translations +PLISTS+= ${PKGDIR}/pkg-plist.translations +DATAFILES+= ${WRKDIR}/asv/asv ${WRKDIR}/darby/darby .endif -.if defined(WITH_SUPPLEMENTS) -DATAFILES+= ${WRKDIR}/easton/easton.dict ${WRKDIR}/mhc/mhc -PLISTS+= ${PKGDIR}/pkg-plist.supplements +.if defined(WITH_NOTES) +PLISTS+= ${PKGDIR}/pkg-plist.notes +DATAFILES+= ${WRKDIR}/mhc/mhc +.endif +.if defined(WITH_DICTIONARIES) +PLISTS+= ${PKGDIR}/pkg-plist.dictionaries +DATAFILES+= ${WRKDIR}/easton/eastons.dict ${WRKDIR}/torrey/torrey.dict +DATAFILES+= ${WRKDIR}/strongs/kjv-strongs ${WRKDIR}/strongs/strongs-greek.dict ${WRKDIR}/strongs/strongs-hebrew.dict .endif +PLISTS+= ${PKGDIR}/pkg-plist -.if !defined(WITH_TRANSLATIONS) pre-fetch: +.if !defined(WITH_TRANSLATIONS) + @${ECHO_MSG} + @${ECHO_MSG} "To download/install additional translations use" + @${ECHO_MSG} "\"make install -DWITH_TRANSLATIONS\"" + @${ECHO_MSG} +.endif +.if !defined(WITH_NOTES) @${ECHO_MSG} - @${ECHO_MSG} "If you want to download/install additional tranlations use" - @${ECHO_MSG} "\"make -DWITH_TRANSLATIONS\"" + @${ECHO_MSG} "To download/install commentary and notes use" + @${ECHO_MSG} "\"make install -DWITH_NOTES\"" @${ECHO_MSG} .endif -.if !defined(WITH_SUPPLEMENTS) +.if !defined(WITH_DICTIONARIES) @${ECHO_MSG} - @${ECHO_MSG} "If you want download/install commentary and dictionary files please use" - @${ECHO_MSG} "\"make -DWITH_SUPPLEMENTS\"" + @${ECHO_MSG} "To download/install dictionaries and notes use" + @${ECHO_MSG} "\"make install -DWITH_DICTONARIES\"" @${ECHO_MSG} .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/biblereader ${PREFIX}/bin/biblereader ${MKDIR} ${PREFIX}/share/biblereader - @for file in ${DATAFILES}; do \ + for file in ${DATAFILES}; do \ ${INSTALL_DATA} $${file} ${PREFIX}/share/biblereader; \ done @${CAT} ${PLISTS} > ${PLIST} diff -ruN biblereader.orig/distinfo biblereader/distinfo --- biblereader.orig/distinfo Tue Aug 29 11:47:00 2000 +++ biblereader/distinfo Sat Oct 21 17:52:27 2000 @@ -1,6 +1,8 @@ -MD5 (biblereader-0.3.2.tar.gz) = 76e8e0fdea5d2dedd069e1709fdf4243 -MD5 (kjv.tar.gz) = 2f0c9c5902e10e8640b30b2f220a44ca -MD5 (asv.tar.gz) = a61c435c5b1605d170f602d85587a473 -MD5 (darby.tar.gz) = ebe0b6690ea01a202a1ed79348e9a174 -MD5 (easton.tar.gz) = 3da6786ba207b50f92b7ce9dfe17f644 -MD5 (mhc.tar.gz) = a228c3c8e82adbec2ddc3e4f923adbc0 +MD5 (biblereader-0.3.3.tar.gz) = 15839986838feeadbf63bbc0fa2aac7e +MD5 (kjv.tar.gz) = bf77f7da9cf2edeb5053f134260f320c +MD5 (asv.tar.gz) = 0cd9f0f27d8ee31e181663246dfba070 +MD5 (darby.tar.gz) = a3afb633dcc0148dbac763a2095b48a4 +MD5 (easton.tar.gz) = 59fc9087df6347a614d1c87d0b4e882f +MD5 (mhc.tar.gz) = 894776c0ac7c12d1ca0b63c3ba489e0b +MD5 (strongs.tar.gz) = 26dbd85bfe83f168e4a08a29dfd973e9 +MD5 (torrey.tar.gz) = 03409b3d3f88b5d5025d81b338429428 diff -ruN biblereader.orig/files/patch-aa biblereader/files/patch-aa --- biblereader.orig/files/patch-aa Sun Aug 6 11:29:03 2000 +++ biblereader/files/patch-aa Sat Oct 21 20:56:21 2000 @@ -1,17 +1,34 @@ -*** Makefile.orig Thu Jul 27 05:07:53 2000 ---- Makefile Mon Jul 31 10:54:11 2000 +*** Makefile.orig Thu Sep 28 16:40:49 2000 +--- Makefile Sat Oct 21 20:55:47 2000 *************** *** 1,6 **** - CFLAGS=-Wall -g +! CFLAGS=-Wall -g ! CFLAGS+=`gtk-config --cflags` ! LIBS=`gtk-config --libs gtk` - OBJS=biblereader.o books.o dictionary.o font.o history.o notes.o gui/dict_dialog.o gui/gtktextbible.o gui/gladesig.o gui/gladesrc.o gui/prefs_dialog.o prefs.o format.o + OBJS=biblereader.o books.o dictionary.o font.o history.o notes.o markup.o gui/dict_dialog.o gui/gtktextbible.o gui/gladesig.o gui/gladesrc.o gui/prefs_dialog.o prefs.o format.o PREFIX?=/usr/local TRANSLATION?=kjv --- 1,6 ---- - CFLAGS=-Wall -g +! CFLAGS=-Wall ! CFLAGS+=`${GTK_CONFIG} --cflags` ! LIBS=`${GTK_CONFIG} --libs gtk` - OBJS=biblereader.o books.o dictionary.o font.o history.o notes.o gui/dict_dialog.o gui/gtktextbible.o gui/gladesig.o gui/gladesrc.o gui/prefs_dialog.o prefs.o format.o + OBJS=biblereader.o books.o dictionary.o font.o history.o notes.o markup.o gui/dict_dialog.o gui/gtktextbible.o gui/gladesig.o gui/gladesrc.o gui/prefs_dialog.o prefs.o format.o PREFIX?=/usr/local TRANSLATION?=kjv +*************** +*** 12,18 **** + mkdir -p ${PREFIX}/share/biblereader + + biblereader: $(OBJS) +! ${CC} ${CFLAGS} -g -o $@ ${OBJS} ${LIBS} + + .c.o: + ${CC} ${CFLAGS} -DBIBLEPATH=\"${PREFIX}/share/biblereader/\" -DBIBLEVERSION=\"${TRANSLATION}\" -c $< -o $*.o +--- 12,18 ---- + mkdir -p ${PREFIX}/share/biblereader + + biblereader: $(OBJS) +! ${CC} ${CFLAGS} -o $@ ${OBJS} ${LIBS} + + .c.o: + ${CC} ${CFLAGS} -DBIBLEPATH=\"${PREFIX}/share/biblereader/\" -DBIBLEVERSION=\"${TRANSLATION}\" -c $< -o $*.o diff -ruN biblereader.orig/pkg-plist.dictionaries biblereader/pkg-plist.dictionaries --- biblereader.orig/pkg-plist.dictionaries Wed Dec 31 19:00:00 1969 +++ biblereader/pkg-plist.dictionaries Sat Oct 21 21:13:58 2000 @@ -0,0 +1,5 @@ +share/biblereader/eastons.dict +share/biblereader/kjv-strongs +share/biblereader/strongs-greek.dict +share/biblereader/strongs-hebrew.dict +share/biblereader/torrey.dict diff -ruN biblereader.orig/pkg-plist.notes biblereader/pkg-plist.notes --- biblereader.orig/pkg-plist.notes Wed Dec 31 19:00:00 1969 +++ biblereader/pkg-plist.notes Sat Oct 21 21:07:52 2000 @@ -0,0 +1 @@ +share/biblereader/mhc diff -ruN biblereader.orig/pkg-plist.supplements biblereader/pkg-plist.supplements --- biblereader.orig/pkg-plist.supplements Sun Aug 6 11:29:04 2000 +++ biblereader/pkg-plist.supplements Wed Dec 31 19:00:00 1969 @@ -1,2 +0,0 @@ -share/biblereader/mhc -share/biblereader/easton.dict >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001022014020.0114A137F75>