cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Style cleanup, and get rid of expensive SUBST_CMD in pre-configure.

Browse Source 
OK, landry@
This commit is contained in:
sebastia 2010-07-29 11:42:56 +00:00
parent e2808626aa
commit ae7fa59953
4 changed files with 32 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
graphics/tkpng/Makefile
View File

@ -1,47 +1,41 @@
# $OpenBSD: Makefile,v 1.1.1.1 2010/07/09 16:46:50 sebastia Exp $ # $OpenBSD: Makefile,v 1.2 2010/07/29 11:42:56 sebastia Exp $
SHARED_ONLY= Yes SHARED_ONLY = Yes
COMMENT= PNG photo image extension for Tcl/Tk COMMENT = PNG photo image extension for Tcl/Tk
V= 0.9 V = 0.9
DISTNAME= tkpng$V REVISION = 0
PKGNAME= tkpng-$V DISTNAME = tkpng$V
SHLIB_VERSION= 0.0 PKGNAME = tkpng-$V
SHARED_LIBS= tkpng09 ${SHLIB_VERSION} SHARED_LIBS = tkpng09 0.0
CATEGORIES= graphics CATEGORIES = graphics
HOMEPAGE= http://www.muonics.com/FreeStuff/TkPNG/ HOMEPAGE = http://www.muonics.com/FreeStuff/TkPNG/
MAINTAINER= Sebastian Reitenbach <sebastia@openbsd.org> MAINTAINER = Sebastian Reitenbach <sebastia@openbsd.org>
# BSD # BSD
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP = Yes
WANTLIB= z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tkpng/} MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tkpng/}
EXTRACT_SUFX= .tgz EXTRACT_SUFX = .tgz
MODULES= x11/tk MODULES = x11/tk
BUILD_DEPENDS= ${MODTK_BUILD_DEPENDS} BUILD_DEPENDS = ${MODTK_BUILD_DEPENDS}
RUN_DEPENDS= ${MODTK_RUN_DEPENDS} RUN_DEPENDS = ${MODTK_RUN_DEPENDS}
SEPARATE_BUILD= simple SEPARATE_BUILD = simple
CONFIGURE_STYLE= gnu CONFIGURE_STYLE = gnu
CONFIGURE_ARGS= --with-tcl=${MODTCL_LIBDIR} \ CONFIGURE_ARGS = --with-tcl=${MODTCL_LIBDIR} \
--with-tk=${MODTK_LIBDIR} \ --with-tk=${MODTK_LIBDIR} \
--with-tkinclude=${MODTK_INCDIR} \ --with-tkinclude=${MODTK_INCDIR}
--enable-64bit \ NO_REGRESS = Yes
--enable-64bit-vis \ SUBST_VARS = SHLIB_VERSION
--enable-threads CONFIGURE_ENV = LIBtkpng09_VERSION=${LIBtkpng09_VERSION}
NO_REGRESS= Yes
SUBST_VARS= SHLIB_VERSION
pre-configure:
${SUBST_CMD} ${WRKSRC}/configure
post-install: post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tkpng ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tkpng

4
graphics/tkpng/patches/patch-configure
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure,v 1.1.1.1 2010/07/09 16:46:50 sebastia Exp $ $OpenBSD: patch-configure,v 1.2 2010/07/29 11:42:56 sebastia Exp $
--- configure.orig Mon Dec 7 15:26:35 2009 --- configure.orig Mon Dec 7 15:26:35 2009
+++ configure Mon Dec 7 15:25:27 2009 +++ configure Mon Dec 7 15:25:27 2009
@@ -8671,7 +8671,7 @@ fi @@ -8671,7 +8671,7 @@ fi
@ -6,7 +6,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2010/07/09 16:46:50 sebastia Exp $
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${LIBtkpng09_VERSION}'
echo "$as_me:$LINENO: checking for ELF" >&5 echo "$as_me:$LINENO: checking for ELF" >&5
echo $ECHO_N "checking for ELF... $ECHO_C" >&6 echo $ECHO_N "checking for ELF... $ECHO_C" >&6
if test "${tcl_cv_ld_elf+set}" = set; then if test "${tcl_cv_ld_elf+set}" = set; then

2
graphics/tkpng/pkg/PFRAG.shared
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2010/07/09 16:46:50 sebastia Exp $
@lib lib/tkpng0.9/libtkpng09.so.${LIBtkpng09_VERSION}

4
graphics/tkpng/pkg/PLIST
View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2010/07/09 16:46:50 sebastia Exp $ @comment $OpenBSD: PLIST,v 1.2 2010/07/29 11:42:56 sebastia Exp $
%%SHARED%%
lib/tkpng0.9/ lib/tkpng0.9/
@lib lib/tkpng0.9/libtkpng09.so.${LIBtkpng09_VERSION}
lib/tkpng0.9/pkgIndex.tcl lib/tkpng0.9/pkgIndex.tcl
share/doc/tkpng/ share/doc/tkpng/
share/doc/tkpng/README share/doc/tkpng/README